> > cvs update -j BASE -j label1 testfile.txt
> cvs server: file testfile.txt exists, but has been added in revision
> label1
I think this means you are attempting to merge a new file onto a branch where
you created a file with the same name. e.g.
cvs rtag -b NEWBRANCH proj1
cvs co proj1
cd proj1
touch testfile
cvs add testfile
cvs ci
cvs update -dr NEWBRANCH
touch testfile
cvs add testfile
cvs ci
cvs update -A
cvs update -j NEWBRANCH
should generate this error for testfile.
Derek
Derek R. Price
CVS Solutions Architect
303.554.8291
[EMAIL PROTECTED]
http://alumni.engin.umich.edu/~oberon/resume.html
--
We have enough youth. How about a fountain of smart?
