I have two branches (A and B) off the HEAD. Both branches have a file
"old.txt". What I have done is:
1) On branch B, rename the file from <old.txt> to <new.txt> by
removing,adding and then committing
2) merge branch B into HEAD
Next I am planning to merge branch A into HEAD. But the filename in A is
still "old.txt" , and the file content is modified. I hope to merge the
change into HEAD and keep the "new.txt" filename on the HEAD as well.
Is CVS smart enough to deal with it?
Thank you
-Susie
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
