At 2/10/2006 02:13 PM, Matt England wrote:
>In an attempt to answer my own question here:
>
>At 2/10/2006 01:27 PM, Matt England wrote:
>> I hear that that there is no merge tracking...but that there is a lot
>> of special things that merge does from diff. I'm finding myself
>> thoroughly confused, in part because I don't yet understand why some
>> merge intelligence would be put in without "all" the intelligence, but I
>> suspect I will learn more about this if I choose to continue to study it
>> (which might be hard to find time to do at this point).
>
>I'm guessing this has to do with the fact that subversion tracks
>directory/path changes, but doesn't yet handle these dir changes in merges
>well...yet.
...and if I could somehow tell the 'svn merge' command to ignore
directory/path changes/versioning, I could possibly get things to
work. Does svn provide any means to do this? Maybe the "ignore ancestory"
will help? Maybe I can undo some of the trunk-directory-re-org commits
that were inapproporiately done in my repo?
Maybe I just export my branch and my trunk to a plain (ie,
non-svn-working-copy), put all the files in the same dir organization
(probably prior to the export), and just run a non-svn-aware merge tool,
merge all the stuff together, and make one bit commit back to the merged trunk.
ugh.
Any other suggestions?
-Matt
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 10 21:52:08 2006