[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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:
> 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.
> * 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().


> * ambiguity: reintegrate or not (merge_symmetric_tests-18)
>   Email thread "Symmetric merge and subtrees".


> * 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
Received on 2012-08-11 00:02:20 CEST

This is an archived mail posted to the Subversion Dev mailing list.