[cvsnt] Re: Build 1966 does not preserve sticky tag on update...

[Bo Berglund]

On Fri, 13 May 2005 15:09:54 -0700, Glen Starrett <grstarrett at cox.net>
wrote:

>Bo Berglund wrote:
>> Whilst checking the binary file issue I did the following:
>> 
>> - Added a file as binary and committed
>> - Cvs removed the file and committed
>> - Cvs added the file again and committed
>> - Updated the file to sticky tag rev 1.1
>> 
>> I updated the file with sticky tag 1.1 to retrieve the first revision
>> in order to check it against the original file. Same length and no
>> differences.
>> Then I made a simple cvs update in the sandbox in order to get other
>> files in working order.
>> SURPRISE!
>> The bug that was there in some intermediate builds prior to 2.5.01
>> release is there again!
>> The update (*without* specifying reset of sticky tags) *does* in fact
>> reset the sticky tag and retrieves the HEAD revision, which is
>> definitely *not* what we want...
>
>I just checked against 1927 and it's a problem there too, but not 
>exactly how you are describing it.  Please confirm if this is the same 
>for you:
>
>cvs up -CAdP
>cvs up -r 1.2 test2.c
>cvs status test2.c
>
>File: test2.c           Status: Needs Patch
>
>    Working revision:    1.2
>    Repository revision: 1.19    /var/cvs/general/test/test2.c,v
>    Expansion option:    kv
>    Commit Identifier:   776642851ec7a876
>    Sticky Tag:          (none)
>    Sticky Date:         (none)
>    Sticky Options:      -kkv
>    Merge From:          (none)
>
>
>==> Note that "Sticky Tag" is NOT set, and Status is "Needs Patch".
>
>cvs up
>==> Now, cvsnt updates test2.c to HEAD again.

More testing done in WinCvs, activity copied from the WinCvs command
window:

cvs update -P -r 1.1 -- Lineendtestfile.txt (in directory
F:\Engineering\Projects\Bosse\Test\ImportTest251\)
U Lineendtestfile.txt
***** CVS exited normally with code 0 *****

Now the local file revision is shown as 1.1
Then status:

cvs status -v -- Lineendtestfile.txt (in directory
F:\Engineering\Projects\Bosse\Test\ImportTest251\)
===================================================================
File: Lineendtestfile.txt	Status: Needs Patch

   Working revision:	1.1
   Repository revision:	1.3
/Korvkiosk/ImportTest251/Lineendtestfile.txt,v
   Expansion option:	b
   Commit Identifier:	ff84284f94876a6
   Sticky Tag:		(none)
   Sticky Date:		(none)
   Sticky Options:	-kb
   Merge From:		(none)

   Existing Tags:
	No Tags Exist
***** CVS exited normally with code 0 *****

Sticky tag seems not to be set in this case and an update moves to
HEAD. Maybe only *symbolic* tags can be made sticky in this version of
CVSNT???
Back to set a tag label:

cvs tag -- TestingStickyTag Lineendtestfile.txt (in directory
F:\Engineering\Projects\Bosse\Test\ImportTest251\)
T Lineendtestfile.txt
***** CVS exited normally with code 0 *****

Now status again:

cvs update -P -r TestingStickyTag -- Lineendtestfile.txt (in directory
F:\Engineering\Projects\Bosse\Test\ImportTest251\)
***** CVS exited normally with code 0 *****

cvs status -v -- Lineendtestfile.txt (in directory
F:\Engineering\Projects\Bosse\Test\ImportTest251\)
===================================================================
File: Lineendtestfile.txt	Status: Up-to-date

   Working revision:	1.1
   Repository revision:	1.1
/Korvkiosk/ImportTest251/Lineendtestfile.txt,v
   Expansion option:	b
   Commit Identifier:	ec44284f71a6f88
   Sticky Tag:		TestingStickyTag (revision: 1.1)
   Sticky Date:		(none)
   Sticky Options:	-kb
   Merge From:		(none)

   Existing Tags:
	TestingStickyTag         	(revision: 1.1)
***** CVS exited normally with code 0 *****

The update now keeps the stickyness of the file and its revision does
not change.

So the real culprit here is that sticky tagging on revisions are no
longer possible. That is not what I tested back in February, at that
time label tags also were reset on updates, but Tony fixed that and I
did not test with pure revision sticky tags...



/Bo
(Bo Berglund, developer in Sweden)