What I'm wanting to do is merge between two different folders in the
repository and apply the changes to a working copy that is a checkout
from one of the folders. Here's my repo setup:
repo/branch/working
repo/tags/version12
repo/tags/version12-r1
repo/tags/version12-r2
repo/tags/version12-r3
repo/trunk
WC: checkout from repo/branch/working
All are historically related to trunk at some point in the way past, but
not directly. What I want is to compare the current versions of files in
repo/tags/version12-r3 with the current versions of files in
repo/branch/working and apply the differences to the working copy. To my
simple mind this should be the HEAD of each folder, but reading the
documentation, listening to the users list, and doing some testing leads
me to believe this won't work. However, I'm not sure which revision
numbers to use.
There really ought to be an easy way to do this, and I can't imagine why
merge tracking would even come into play.
Help?
Received on Thu Jun 16 18:41:59 2005