Re: [PATCH] Split up the reintegrate merge API: first find what to do, then do it - v2
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 12 Dec 2011 18:28:15 +0000 (GMT)
Paul Burba wrote:
>> If step 2 could repeat the same check as step 1, that would be useful
Yup, I found that too.
I also avoided the work duplication in the reimplementation of svn_client_merge_reintegrate(): I made the internal find_reintegrate_merge() function return the sessions and youngest common ancestor revision, so that merge_reintegrate_locked() can call merge_cousins_...() directly instead of calling the higher-level merge_locked().
Committed in this form in r1213349.
Thanks for looking.
This is an archived mail posted to the Subversion Dev mailing list.