I'll use it for the merges I run myself --- but I don't use 'svn merge'
very often.
Julian Foad wrote on Thu, Mar 22, 2012 at 09:36:44 +0000:
> If anyone wants to try the new symmetric merge code, it's basically in
> place. It's not finished. It's enabled with '--symmetric' command-line
> option. I've just tried running it in place of 'reintegrate, using the
> following patch to the test suite, and this much seems to work...
>
> Index: subversion/tests/cmdline/svntest/actions.py
> ===================================================================
> --- subversion/tests/cmdline/svntest/actions.py (revision 1303481)
> +++ subversion/tests/cmdline/svntest/actions.py (working copy)
> @@ -1029,6 +1029,9 @@ def run_and_verify_merge(dir, rev1, rev2
> the working copy, but still verify the entire working copy dir. """
>
> merge_command = [ "merge" ]
> + if '--reintegrate' in args:
> + args += ('--symmetric',)
> +
> if url2:
> merge_command.extend((url1 + "@" + str(rev1), url2 + "@" + str(rev2)))
> else:
>
>
> Now I'll try using it in place of 'sync' merges. But the more interesting
> thing is it should be able to do repeated 'reintegrate' merges, and indeed
> arbitrary sequences of to-and-fro merges between a pair of branches, without
> any 'keep-alive dance'.
>
> Please tell me what you think or what you find!
>
> - Julian
>
