Problems with tags and checking files in cvs (Sticky tags)

Question

I'm having trouble checking files using the release tag and hope someone here can help.

Basically my repository is structured as follows

module1
 - src
 - jsp
 - conf

module2
 - src
 - jsp
 - conf

A release may include changes to either module1 or module2, or both. There are several developers who can work with any files in any of the modules.

To work with the new version, we check the latest version (for example, LIVE-REL-2.4) using the following command

cvs checkout –r "LIVE-REL-2.4" moduleName

Please note that we do not check trunc. The reason for this is that if you order from trunc, you include files that have been registered by other developers, but you do not want to include them in the next version.

, , . , , .

cvs tag BUG434 <file1> 
cvs tag BUG435 <file2>

, .

cvs tag – r "LIVE-REL-2.4" "LIVE-REL-2.5"

release ,

cvs tag –r "BUG434" "LIVE-REL-2.5"
cvs tag –r "BIG435" "LIVE-REL-2.5"

, " " , . ,

cvs checkout –r "LIVE-REL-2.5" moduleName

. , . , , .

sticky tag `LIVE-REL-2.5' for file `DatabaseFacade.java' is not a branch

, . , googling, .

• "cvs update -A" , .

, , "". , , . "HEAD" , - 3 .

, , , . , , -, , .

• , .

, "HEAD" , .

:

• , , , " "?
• , ?
• . ?
• , , - , , , , ?

.

Answer 1

. , , HEAD .

, DatabaseFacade.java:

1.1: original version, which has the bug
1.2: version with new feature, which you do not want to release yet

1.1 , - - . , ( , ):

# backup file with fixes
mv DatabaseFacade.java DatabaseFacade.java-fixed

# revert to HEAD: remove the sticky-ness
cvs update -A DatabaseFacade.java

# get revision 1.1 (non sticky)
cvs update -p -r1.1 DatabaseFacade.java > DatabaseFacade.java

# commit it
cvs ci -m "reverted to revision 1.1." DatabaseFacade.java

# commit your file with fixes
mv DatabaseFacade.java-fixed DatabaseFacade.java
cvs ci -m "fixed BUG434" DatabaseFacade.java

# restore the latest development version to HEAD
cvs update -p -r1.2 DatabaseFacade.java > DatabaseFacade.java
cvs ci -m "reverted to revision 1.2." DatabaseFacade.java

# also fix the bug in the latest development version
cvs ci -m "fixed BUG434" DatabaseFacade.java

, DatabaseFacade.java :

1.1: original version, which has the bug
1.2: version with new feature, which you do not want to release yet
1.3: same as 1.1
1.4: your bugfix to 1.1
1.5: same as 1.2
1.6: version with new feature and bugfix

1.4 :

cvs tag -r 1.4 LIVE-REL-2.5 DatabaseFacade.java

, , cvs update, " ", 1.3 1.4 HEAD.

---

Subversion. . , Mercurial . , .

---

: - (, "BUG434" ), , .

Answer 2

- , , → `LIVE-REL-2.5 '< < , , , " " → // → LIVE-REL-2.5, .