Merging moves

I have a vendor branch which has diverged quite a lot from trunk. Now I have got a new vendor release which is essentially the same as the previous version, but completely restructured (we are talking about 2000+ files which have moved around. However, I managed to get it imported into my vendor branch using a modified svn_load_dirs.pl (for automatic renaming).

However, trying now to merge this delta with trunk gives:

ft_at_tr:/home2/Arthur_Korea/pmedarb/ft/merge/src>svn merge file:///home2/Arthur_Korea/pmedarb/ft/svn/cru110901_14_dp/vendor/ModC_Demo_R1B08/src file:///home2/Arthur_Korea/pmedarb/ft/svn/cru110901_14_dp/vendor/current/src .
--- Merging differences between repository URLs into '.':
   C all_korea.gpr
svn: The URL 'file:///home2/Arthur_Korea/pmedarb/ft/svn/cru110901_14_dp/vendor/current/src/RLIB' has a different repository root than its parent

I have also tried with --ignore-ancestry (not what I want) and --reintegrate with the same result.

The Red Book hints that merges with moves is non-trivial (http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.moves). Which options do I have?

I'm using version 1.6.9.

 -Frode
Received on 2010-04-30 09:51:11 CEST