Attachment 7484 Details for Bug 48467 – CVS Log file

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

CVS Log file

simpleConstraintError.txt (text/plain), 3.91 KB, created by Karthik K

on 2004-01-20 00:00:18 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Karthik K

Created: 2004-01-20 00:00:18 EST

Size: 3.91 KB

patch

obsolete

>RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
>Valid-responses ok error M E Checked-in Valid-requests Template Set-sticky 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 Repository Directory Max-dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Questionable Case Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set
>Kerberos-encrypt Gssapi-encrypt Gssapi-authenticate expand-modules ci co update diff log rlog add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors init annotate rannotate noop version
>ok
>Root /export/groups/cvs/repos/plds
>CMD> cvs -n update -d "/PLDS/src/com/nfs/app/pas/plds/bo/constraint"
>Global_option -n
>Argument -d
>Directory .
>/export/groups/cvs/repos/plds/PLDS/src/com/nfs/app/pas/plds/bo/constraint
>Entry /AllApplicableConstraint.java/1.4///
>Unchanged AllApplicableConstraint.java
>Entry /CompositeConstraint.java/1.3///
>Unchanged CompositeConstraint.java
>Entry /Constraint.java/1.12///
>Unchanged Constraint.java
>Entry /ConstraintFactory.java/1.62///
>Unchanged ConstraintFactory.java
>Entry /FirstApplicableConstraint.java/1.5///
>Unchanged FirstApplicableConstraint.java
>Entry /InclusionConstraint.java/1.2///
>Unchanged InclusionConstraint.java
>Entry /RejectionConstraint.java/1.1.1.1///
>Unchanged RejectionConstraint.java
>Entry /SimpleConstraint.java/1.1.1.1///
>Unchanged SimpleConstraint.java
>Argument .
>Directory .
>/export/groups/cvs/repos/plds/PLDS/src/com/nfs/app/pas/plds/bo/constraint
>update
>E cvs server: Updating .
>M U SimpleConstraint.java
>ok
>RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
>Valid-responses ok error M E Checked-in Valid-requests Template Set-sticky 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 Repository Directory Max-dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Questionable Case Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set
>Kerberos-encrypt Gssapi-encrypt Gssapi-authenticate expand-modules ci co update diff log rlog add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors init annotate rannotate noop version
>ok
>Root /export/groups/cvs/repos/plds
>CMD> cvs status "SimpleConstraint.java"
>Directory .
>/export/groups/cvs/repos/plds/PLDS/src/com/nfs/app/pas/plds/bo/constraint
>Entry /SimpleConstraint.java/0///
>Is-modified SimpleConstraint.java
>Argument SimpleConstraint.java
>Directory .
>/export/groups/cvs/repos/plds/PLDS/src/com/nfs/app/pas/plds/bo/constraint
>status
>E cvs server: conflict: SimpleConstraint.java created independently by second party
>M ===================================================================
>M File: SimpleConstraint.java   Status: Unresolved Conflict
>M
>M    Working revision:  New file!
>M    Repository revision:       1.2     /export/groups/cvs/repos/plds/PLDS/src/com/nfs/app/pas/plds/bo/constraint/SimpleConstraint.java,v
>M    Sticky Tag:                (none)
>M    Sticky Date:               (none)
>M    Sticky Options:    (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: SimpleConstraint.java created independently by second party null]

Actions: View

Attachments on bug 48467: 7259 | 7484 | 7486