Hello,
I have found a problem in CVS when merging files that have been added on a
branch. I did some testing and it seems that you need the combination of
* a tag on the branch
* two checkins after that
* freshly checking out the main trunk.
The following set of commands reproduces the problem with CVS 1.10.7 on a
Linux box. (I have set up a repository called MyProject).
# this is from the manual
cvs update -A
touch a b c
cvs add a b c ; cvs ci -m "added" a b c
cvs tag -b branchtag
cvs update -r branchtag
touch d ; cvs add d
rm a ; cvs rm a
cvs ci -m "added d, removed a"
cvs tag -r branchtag TagOne
echo "Some test" >d
cvs ci -m 'Some text entered.'
echo "Some text." >|d
cvs ci -m 'Typo fixed.'
cvs co -d tmpdir MyProject # problem does not occur with update -A
cd tmpdir
cvs update -j branchtag
cvs commit -m 'Merged from branch.'
Is that my fault or a bug in CVS?
Regards,
Alex
_______________________________________________
Bug-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-cvs
