[cvsnt] Re: Lost keyword expansion setting after multiple mergeswith added files

[Bo Berglund]

Batch file does not work ....
You cannot update to a non-existing tag. The tag must be cretaed first.
In your batch example there is no tagging included.

Output example (I removed @echo off so I could see what was going on):

C:\3RProj\Bosse\Test\CVStests>cvs update -rsomebranch -jHEAD mergesticky
cvs [server aborted]: no such tag somebranch

Best regards,

Bo Berglund


-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf
Of Oliver Koltermann
Sent: den 5 april 2006 09:15
To: cvsnt at cvsnt.org
Subject: [cvsnt] Re: Lost keyword expansion setting after multiple
mergeswith added files

Hello Glen,

Glen Starrett <glen.starrett at march-hare.com> writes:

> I can't repro the behavior with the steps provided.  Can you provide a
> script to repro the problem?

I'm not a batch-file expert, but the following "test.bat" - called in
an existing sandbox directory - reproduced the problem for me:

-----test.bat START-----
@echo off
md mergesticky
cvs add mergesticky
cvs update -A mergesticky
cd mergesticky
echo binary >BinaryMerge.txt
cvs add -kb BinaryMerge.txt
cvs commit -m "Baseline version" BinaryMerge.txt
cd ..
cvs update -rsomebranch -jHEAD mergesticky
cvs status mergesticky/BinaryMerge.txt
cvs update -rsomebranch -jHEAD mergesticky
cvs status mergesticky/BinaryMerge.txt
-----test.bat END-----

Please note the Sticky Options in the two "cvs status" outputs.


Best regards,
O. Koltermann
_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt