David Glasser wrote:
>>>> On the 'mo-betta-two-url-merges' branch, take a different approach to
>>>> the two-url merge problem. So, given a situation like this:
>>>> +-----------> (A)
>>>> -----+-------------> (B)
>>>> Say we wish to merge the diff between A and B to some target.
>>>> Rather than do two mergeinfo-recording merges (A:C, C:B) like code in
>>>> the branch on which is branch is based does, we instead do one
>>>> mergeinfo-not-recording merge A:B, and then two record-only merges
>>>> (A:C, C:B).
>>> Hey, Mike! Is it just me, or is our old svn_client_merge_peg-only
>>> mergeinfo calculation now just a special case of your mo-betta-merge,
>>> where C is equal to A or B?
> I might be suggesting that this logic belongs in do_merge somehow
> instead of in the wrappers...
> Maybe do_merge should take an argument that is your "C" here?
Perhaps, but it's not a change I'm motivated to make. As is, the public
APIs are pretty thin wrappers -- merge3() might look like many lines of
code, but most of them are just structure-stuffing, and near-duplicate
multiples even of that.
C. Michael Pilato <firstname.lastname@example.org>
CollabNet <> www.collab.net <> Distributed Development On Demand
Received on Fri Dec 7 08:28:10 2007