Hi Dave, Jim, and Larry, Here is the output:
cvs admin -b struts-references.xml ***** CVS exited normally with code 0 ***** RCS file: /cvsroot/espresso/web/WEB-INF/conf/struts-references.xml,v done cvs log -h struts-references.xml ***** CVS exited normally with code 1 ***** cvs server: warning: duplicate key `log' in version `1.23' of RCS file `/cvsroot/espresso/web/WEB-INF/conf/struts-references.xml,v' cvs server: warning: duplicate key `log' in version `1.23' of RCS file `/cvsroot/espresso/web/WEB-INF/conf/struts-references.xml,v' cvs [server aborted]: mismatch in rcs file /cvsroot/espresso/web/WEB-INF/conf/struts-references.xml,v between deltas and deltatexts -----Original Message----- From: Jim Hyslop [mailto:[EMAIL PROTECTED] Sent: Tuesday, September 13, 2005 11:28 PM To: Christopher Cheng Cc: 'Dave Korn'; [email protected] Subject: Re: Unable to increment revision number Christopher Cheng wrote: > I tried both, it still doesn't work.... any idea? It's possible that you have a default branch set, using the 'cvs admin -b' command. What does the output of 'cvs log -h' on the file show? In partiular, the field "branch:" should be empty. > =================================================================== > File: struts-references.xml Status: Up-to-date > > Working revision: 1.22 > Repository revision: 1.22 > /cvsroot/espresso/web/WEB-INF/conf/struts-references.xml,v > Expansion option: kv > Commit Identifier: cb84317283b5641 > Sticky Tag: (none) > Sticky Date: (none) > Sticky Options: -kkv > Merge From: (none) > > cvs update -A struts-references.xml > > ***** CVS exited normally with code 0 ***** This is a non-standard CVS message, which suggests you are using a GUI front-end such as Tortoise or WinCVS. You might try on a list that specializes in those clients. Can you try committing using the standard CVS command-line client? -- Jim _______________________________________________ Info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
