bug in branch switching behaviour

[Matthew Herrmann]

Hi All,

I'm having exactly the same problem as Jo in this post:

http://groups.google.com.au/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&safe=off&thre
adm=6vjf5k%24p5t%40magus.cs.utah.edu&rnum=1&prev=/groups%3Fq%3Ddummy%2Btimes
tamp%2Bfrom%2Bnew-entry%2Bconflict%26hl%3Den%26lr%3D%26ie%3DUTF-8%26oe%3DUTF
-8%26safe%3Doff%26selm%3D6vjf5k%2524p5t%2540magus.cs.utah.edu%26rnum%3D1

my sequence of steps was:

- current sandbox on branch BRANCH
- cvs update
- resolve conflicts -- don't commit! (need to put it on the branch)
- cvs rtag -rBRANCH -b NEW_BRANCH project
- cvs up -rNEW_BRANCH
- cvs commit

Fails with 'filename' had a conflict and has not been modified. These files
do not have any conflict markers any more, so it must be due to the "dummy
timestamp new-file" entry put in the entries file.

Are there any fixes yet for this in the newer versions?

I'm using CVSNT 1.11.1.3 client and server Linux CVS 1.11.2.1 with the 3-way
diffs patch.

TIA,

Matthew Herrmann
--------------------------------------
VB6/SQL/Java/CVS Consultancy
Far Edge Technology
http://www.faredge.com.au/