Attachment 7259 Details for Bug 48467 – Trace Log of failed CVS Sync

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Trace Log of failed CVS Sync

CVS Sync log.txt (text/plain), 3.58 KB, created by Thomas Whitmore

on 2003-12-21 19:41:39 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Whitmore

Created: 2003-12-21 19:41:39 EST

Size: 3.58 KB

patch

obsolete

>I LOVE YOU
>Valid-responses ok error M E Checked-in Valid-requests Template Set-sticky MT Clear-static-directory Module-expansion Set-static-directory Clear-sticky New-entry Merged Removed Updated Remove-entry Update-existing Copy-file Created Notified Mod-time
>valid-requests
>Valid-requests Root Valid-responses valid-requests Directory Max-dotdot Static-directory Sticky Entry EntryExtra Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify NotifyUser Questionable Case Utf8 Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand-modules ci co chown setowner setperm chacl setacl listperm lsacl setpass passwd update diff log rlog add remove update-patches status ls rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors init annotate rannotate noop version Rootless-stream-modification Kerberos-encrypt Gssapi-encrypt Protocol-encrypt Gssapi-authenticate Protocol-authenticate read-cvsrc read-cvsrc2 read-cvsignore read-cvswrappers Error-If-Reader      
>ok
>Root D:/cvs-rep
>CMD> cvs -n update -d "/JDOPersist/src/persist/ExecElementImpl.java"
>Global_option -n
>Argument -d
>Directory .
>D:/cvs-rep/JDOPersist/src/persist
>Entry /ExecElementImpl.java/1.1.1.1///
>Unchanged ExecElementImpl.java
>Argument ExecElementImpl.java
>Directory .
>D:/cvs-rep/JDOPersist/src/persist
>update
>MT +updated
>MT text U 
>MT fname ExecElementImpl.java
>MT newline
>MT -updated
>ok
>RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
>I LOVE YOU
>Valid-responses ok error M E Checked-in Valid-requests Template Set-sticky MT Clear-static-directory Module-expansion Set-static-directory Clear-sticky New-entry Merged Removed Updated Remove-entry Update-existing Copy-file Created Notified Mod-time
>valid-requests
>Valid-requests Root Valid-responses valid-requests Directory Max-dotdot Static-directory Sticky Entry EntryExtra Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify NotifyUser Questionable Case Utf8 Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand-modules ci co chown setowner setperm chacl setacl listperm lsacl setpass passwd update diff log rlog add remove update-patches status ls rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors init annotate rannotate noop version Rootless-stream-modification Kerberos-encrypt Gssapi-encrypt Protocol-encrypt Gssapi-authenticate Protocol-authenticate read-cvsrc read-cvsrc2 read-cvsignore read-cvswrappers Error-If-Reader      
>ok
>Root D:/cvs-rep
>CMD> cvs status "ExecElementImpl.java"
>Directory .
>D:/cvs-rep/JDOPersist/src/persist
>Entry /ExecElementImpl.java/0///
>Is-modified ExecElementImpl.java
>Argument ExecElementImpl.java
>Directory .
>D:/cvs-rep/JDOPersist/src/persist
>status
>E cvs server: conflict: ExecElementImpl.java created independently by second party
>M ===================================================================
>M File: ExecElementImpl.java	Status: Unresolved Conflict
>M 
>M    Working revision:	New file!
>M    Repository revision:	1.2	D:/cvs-rep/JDOPersist/src/persist/ExecElementImpl.java,v
>M    Expansion option:	kv
>M    Commit Identifier:	bf43fe537710000
>M    Sticky Tag:		(none)
>M    Sticky Date:		(none)
>M    Sticky Options:	(none)
>M    Merge From:		(none)
>M 
>ok
>RESULT> Status WARNINGorg.eclipse.team.cvs.core code=1 The following warnings were reported while performing the "cvs status" command. null children=[Status WARNINGorg.eclipse.team.cvs.core code=-12 cvs server: conflict: ExecElementImpl.java created independently by second party null]

Actions: View

Attachments on bug 48467: 7259 | 7484 | 7486