Re: Enabling symmetric merge, and UI details
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 10 Aug 2012 23:01:43 +0100 (BST)
I (Julian Foad) wrote on 6 August 2012:
I made an initial major update in r1370818. It needs more.
> * Checks for 'no local mods' and 'no switched subtrees'
Fixed in r1369923.
> * Check foreign-repos merges don't try to use the symmetric merge code path.
Checked; it's fine.
> * Add a JavaHL API version of svn_client_merge_symmetric().
> * ambiguity: reintegrate or not (merge_symmetric_tests-18)
> * Issue #4217 -- reported rev unexpected (merge_tests-78)
I'm happy with that, thanks to Paul explaining the details to me. I'll update the test expectation and close the issue.
This is an archived mail posted to the Subversion Dev mailing list.