info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: Unable to increment revision number


From: Christopher Cheng
Subject: RE: Unable to increment revision number
Date: Tue, 13 Sep 2005 23:18:09 +0800

I tried both, it still doesn't work.... any idea?


cvs status struts-references.xml

***** CVS exited normally with code 0 *****

===================================================================
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 *****

cvs commit -m "no message" -- struts-references.xml (in directory
C:\Java\espresso\web\WEB-INF\conf\)
Checking in struts-references.xml;
/cvsroot/espresso/web/WEB-INF/conf/struts-references.xml,v  <--
struts-references.xml
new revision: 1.22.3.1; previous revision: 1.22
done

-----Original Message-----
From: Dave Korn [mailto:address@hidden 
Sent: Tuesday, September 13, 2005 10:55 PM
To: 'Christopher Cheng'; address@hidden
Subject: RE: Unable to increment revision number

----Original Message----
>From: Christopher Cheng
>Sent: 13 September 2005 15:41

> Could somebody help me out?
> 
> 
> 
> I am not sure whether the cvs file is corrupt or I have done something
> terribly wrong. 
> 
> 
> 
> Whenever I commit a file to the CVS, it increments a number after the
> revision number only 
> 
> For example,
> 
> new revision: 1.22.2.1; previous revision: 1.22
> 
> 
> 
> When I inspect the file in the server, I have the following. The head is
> definitely 1.23, but I am keep committing to 1.22 branches. 
> 


  Then you probably have a sticky branch tag on the file - check with "cvs
status <filename>".  You can use "cvs update -A <filename>" to get rid of
it; this will return your working directory copy to the trunk, merging
across any local changes that you have made.  (But keep a copy of the file
just in case the merge goes awry; I don't think that -A makes a
.#filename.rev backup in the way that -C does).


    cheers,
      DaveK
-- 
Can't think of a witty .sigline today....







reply via email to

[Prev in Thread] Current Thread [Next in Thread]