Hey all, I would appreciate any input you might have on how best to
accomplish the following:
Our project is in a transitional state and a file has been copied from one
module to another with some concurrent development taking place on both
revisions of that file. Now, the changes that were made to one copy need to
be joined with those made in the other copy in a different module. So:
module1/fileX
needs to be merged with
module2/folder/fileX
The only way I can think of to attempt this is:
cp module1/fileX module2/folder/fileX
cvs ci fileX
and then merging the differences between the two revisions so created. Any
idea if this will work? Any suggestions for how else to accomplish this? I
would imagine that having a file editor that can diff and merge two files
would be the best way to do it, and we are going to try that approach, but I
am curious now as to whether this can be accomplished using CVS.
Ch.
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
