How to resolve tree conficts with incoming move and local change

I've been asking about this but nobody seemed to be able to suggest a solution that worked (sorry Stefan but making the trees match in the working copy and then merging into it didn't work).

Here's my solution:

1) Merge N:M from branch to trunk (lots of files have moved on branch).

2) Manually copy the tree conflicted trunk files over their new locations in your working copy.

3) Remerge in the branch changes file by file by doing svn merge -r N:M http://repository/../my_moved_file.cpp workingcopy/../my_moved_file.cpp --ignore-ancestry

Note the -ignore-ancestry switch is critical. It doesn't work properly without it.

Since I had 200 moved files to deal with I codged up a ruby script that used svn status to build me batch files to do these operations. I had to use a simple heuristic for the renames and disambiguate manually when it broke.

I am mid way through the merge and it appears to be working.

HTH someone.

Cheers,
James

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2374469

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-22 17:16:07 CEST