OK,
in retrospect what we did wasn';t that smart ..
we branched of some code.
In this branched of code, we added a file main.C
in the main branch (trunk) we added the same file (cvs add).
now we try to merge the branch with the trunk,
and we get an error message like
cvs update: file main.C exists, but has been added in revision XXX
How can we get things back in sync again ?
what we did (simplified)
cvs tag -b XXXX somecode
cd A
cvs checkout -r XXXX somecode
cd somecode
vi newfile.C
cvs add newfile.C
cvs commit
cd B
cvs checkout somecode
cd somecode
vi newfile.C
cvs add newfile.C
cvs commit
[edit away oin both subtrees]
now merge A into B
cvs update -j XXXX
and we get the message
update: file newfile.C exists, but has been added in revision XXX
So how do we get this back in sync again ?
Kind regards,
--
Gerhard den Hollander Phone +31-10.280.1515
Technical Support Jason Geosystems BV Fax +31-10.280.1511
Adres: POBox 1573
3000 BN Rotterdam
[EMAIL PROTECTED] The Netherlands
visit us at http://www.jasongeo.com
"TeamWare" for finding Oil & Gas...The Smart Way
