I (Julian Foad) wrote on 6 August 2012: > OK, enabled in 1369896. > > --reintegrate forces a 1.7 reintegrate, unconditionally, at the moment; I > haven't put a deprecation warning in there. > > Please let me know if anyone sees unexpected results from merge now. > > TODO: > > * Revise 'svn merge' help text.
I made an initial major update in r1370818. It needs more. > * Checks for 'no local mods' and 'no switched subtrees' > aren't currently being performed when they should; it needs to wait till > after working out which kind of merge is required, and then do the strict > checks > iff it's reintegrate-like. 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(). TODO. > * ambiguity: reintegrate or not (merge_symmetric_tests-18) > Email thread "Symmetric merge and subtrees". TODO. > * Issue #4217 -- reported rev unexpected (merge_tests-78) > Email thread "Symmetric merge and deleted subtrees". I'm happy with that, thanks to Paul explaining the details to me. I'll update the test expectation and close the issue. - Julian
