Cvs remove sticky tag without updating

26-Jul-2020 05:18

It's not that the tag itself is sticky, rather that your working file is stuck at that revision.

A This provides the critical piece of information -- the "A" indicates that this is a new file that has been *added* with a sticky tag.

Reset the sticky options % cvs admin -kkv abc RCS file: c:/cvs/repository/testing/abc,v done % cvs status abc ============================================================== File: abc Status: Up-to-date Working revision: 1.1 Fri Oct 27 2000 Repository revision: 1.1 c:/cvs/repository/testing/abc,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: -kb *** NOTICE THE -kb FLAG IS STILL SET *** % cvs update -A abc U abc % cvs status abc ============================================================== File: abc Status: Up-to-date Working revision: 1.1 Fri Oct 27 2000 Repository revision: 1.1 c:/cvs/repository/testing/abc,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) -----Original Message----- From: Mike Castle [mailto:[email protected] Sent: Friday, October 27, 2000 PM To: 'CVS Discussion Group' Subject: Re: How to get rid of sticky options On Fri, Oct 27, 2000 at PM -0700, Matthew Berney wrote: But, there is no way to "turn off" the sticky option. mrc -- Mike Castle Life is like a clock: You can work constantly [email protected] and be right all the time, or not work at all and be right at least twice a day.However, all new files from branch-2 (of which there are half a dozen or so) still fail.The following is what I'm seeing at the command line with those: 1017 [email protected]:fluid$ cvs status | grep Tag Sticky Tag: HEAD (revision: 1.1) 1018 [email protected]:fluid$ cvs commit -m "Merged from branch-2" cvs commit: Attempt to add reserved tag name HEAD cvs commit: could not stub branch HEAD for /u/ma/newren/cvs/fluid/Attic/steps.txt,v 1019 [email protected]:fluid$ cvs update -A A 1020 [email protected]:fluid$ cvs status | grep Tag Sticky Tag: HEAD (revision: 1.1) For comparison, with main.The conflict lies between the rows of greater than and less than signs.The thing to do now is decide what version is right, remove the conflict markers, and commit the file.

Reset the sticky options % cvs admin -kkv abc RCS file: c:/cvs/repository/testing/abc,v done % cvs status abc ============================================================== File: abc Status: Up-to-date Working revision: 1.1 Fri Oct 27 2000 Repository revision: 1.1 c:/cvs/repository/testing/abc,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: -kb *** NOTICE THE -kb FLAG IS STILL SET *** % cvs update -A abc U abc % cvs status abc ============================================================== File: abc Status: Up-to-date Working revision: 1.1 Fri Oct 27 2000 Repository revision: 1.1 c:/cvs/repository/testing/abc,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) -----Original Message----- From: Mike Castle [mailto:[email protected] Sent: Friday, October 27, 2000 PM To: 'CVS Discussion Group' Subject: Re: How to get rid of sticky options On Fri, Oct 27, 2000 at PM -0700, Matthew Berney wrote: But, there is no way to "turn off" the sticky option. mrc -- Mike Castle Life is like a clock: You can work constantly [email protected] and be right all the time, or not work at all and be right at least twice a day.

However, all new files from branch-2 (of which there are half a dozen or so) still fail.

The following is what I'm seeing at the command line with those: 1017 [email protected]:fluid$ cvs status | grep Tag Sticky Tag: HEAD (revision: 1.1) 1018 [email protected]:fluid$ cvs commit -m "Merged from branch-2" cvs commit: Attempt to add reserved tag name HEAD cvs commit: could not stub branch HEAD for /u/ma/newren/cvs/fluid/Attic/steps.txt,v 1019 [email protected]:fluid$ cvs update -A A 1020 [email protected]:fluid$ cvs status | grep Tag Sticky Tag: HEAD (revision: 1.1) For comparison, with main.

The conflict lies between the rows of greater than and less than signs.

The thing to do now is decide what version is right, remove the conflict markers, and commit the file.

At the risk of sounding really stupid (this has to have a simple solution), how do I remove the sticky tag of 'HEAD' from my files?