Login | Register
My pages Projects Community openCollabNet

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

subversion
Discussion topic

Back to topic list

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

Author David Glasser <glasser at davidglasser dot net>
Full name David Glasser <glasser at davidglasser dot net>
Date 2007-12-06 17:46:45 PST
Message On Dec 6, 2007 10:26 AM, <cmpilato at tigris dot 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 dot net | http://www.davidglasser.net/

« Previous message in topic | 2 of 6 | Next message in topic »

Messages

Show all messages in topic

svn commit: r28303 - in branches/mo-betta-two-url-merges/subversion: libsvn_client tests/cmdline cmpilato C. Michael Pilato 2007-12-06 10:26:12 PST
     Re: svn commit: r28303 - in branches/mo-betta-two-url-merges/subversion: libsvn_client tests/cmdline David Glasser <glasser at davidglasser dot net> David Glasser <glasser at davidglasser dot net> 2007-12-06 17:46:45 PST
         Re: svn commit: r28303 - in branches/mo-betta-two-url-merges/subversion: libsvn_client tests/cmdline cmpilato C. Michael Pilato 2007-12-06 21:02:30 PST
             Re: svn commit: r28303 - in branches/mo-betta-two-url-merges/subversion: libsvn_client tests/cmdline David Glasser <glasser at davidglasser dot net> David Glasser <glasser at davidglasser dot net> 2007-12-06 22:14:16 PST
                 Re: svn commit: r28303 - in branches/mo-betta-two-url-merges/subversion: libsvn_client tests/cmdline cmpilato C. Michael Pilato 2007-12-06 23:27:58 PST
                     Re: svn commit: r28303 - in branches/mo-betta-two-url-merges/subversion: libsvn_client tests/cmdline David Glasser <glasser at davidglasser dot net> David Glasser <glasser at davidglasser dot net> 2007-12-10 11:00:14 PST
Messages per page: