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

Re: svn commit: r28303 - in branches/mo-betta-two-url-merges/subversion: libsvn_client tests/cmdline

From: David Glasser <glasser_at_davidglasser.net>
Date: 2007-12-07 02:46:45 CET

On Dec 6, 2007 10:26 AM, <cmpilato@tigris.org> wrote:
> Author: cmpilato
> Date: Thu Dec 6 10:26:12 2007
> New Revision: 28303
>
> Log:
> 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)
> (C)
>
> 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?

(And if so, perhaps we can simplify the implementation based on that.)

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 7 02:46:54 2007

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