[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

rename question -- urgent!!

From: Chen, Susie
Subject: rename question -- urgent!!
Date: Thu, 12 Apr 2001 12:00:05 -0700

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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]