Cristian Amarie wrote:
>> [...] You are talking about any graph consisting of a sequence
>> of 'complete' merges[1] between the
>> two branches A and B. Is this a concrete example, where n=2 and m=3?
>>
>> / -- p q - A1 -- s - A2
>> O \ \ / \ /
>>
> Hi Cristian. First, let me see if I understand you. You are talking about
> any graph consisting of a sequence of 'complete' merges[1] between the
> two branches A and B. Is this a > concrete example, where n=2 and m=3?
>
> / -- p q - A1 -- s - A2
> O \ \ /
I (Julian Foad) wrote:
> Cristian Amarie wrote:
>
>>> 1. Find the latest rev of A synced to B and of B synced to A.
>>> 2. Choose a base.
>> For me 2 this is an important point regarding obtaining of the same
>> result.
>>
>> Having
>> / A1 ... Ax ... An-1 -> An (merge B into A pro
1 ... B2 B3
>
> maybe the new BASE candidates can be A3 and B3 and start the
> algorithm over from here?
> I mean, A3 is the latest revA synced to B and B3 latest revB synced
> to A, right ?
>
> - Cristian
>
> On Mon, Apr 16, 2012 at 7:25 PM, Julian Foad
> wrote:
>&
d too.
>
> I hope your mail viewers preserve indentation and line breaks, as I've
> used indentation (space characters only) for formatting.
>
>
> Symmetric Merge Algorithm
>
> 1. Find the latest rev of A synced to B and of B synced to A.
> 2. Choose a base.
> 3. I
Paul Burba wrote:
> Julian Foad wrote:
>> I have written out how I think a large part of the symmetric merge
>> algorithm should go, in more detail. Review and other feedback would
>> be welcome.
[...]
>> At this point I haven't included processing of subtre
My motive is not PR. My motive is very specifically, this: I would
like to have a subversion merge that supports a modern code review
workflow. You commit to a branch, someone else reviews the commit, and
merges it into a shared build. If I can add that to my app, it helps
all of my svn us
On 04/17/2012 02:29 PM, Branko Čibej wrote:
> On 17.04.2012 18:40, Andy Singleton wrote:
>> It sounds like there is a clear choice for the first release of
>> Julian's Symmetric Merge project:
>> 1) Add "symmerge" as a new command and leave the existing merge in place,
>> 2) or try to replace the
On 17.04.2012 18:40, Andy Singleton wrote:
> It sounds like there is a clear choice for the first release of
> Julian's Symmetric Merge project:
> 1) Add "symmerge" as a new command and leave the existing merge in place,
> 2) or try to replace the existing merge in one shot for all existing
> user
that if you are trying to cram everything into one merge command.
On 4/17/2012 12:19 PM, Paul Burba wrote:
On Tue, Apr 17, 2012 at 11:52 AM, Andy Singleton wrote:
On 4/17/2012 11:38 AM, Paul Burba wrote:
On Mon, Apr 16, 2012 at 12:25 PM, Julian Foad
wrote:
I have written out how I think a lar
On Tue, Apr 17, 2012 at 11:52 AM, Andy Singleton wrote:
> On 4/17/2012 11:38 AM, Paul Burba wrote:
>>
>> On Mon, Apr 16, 2012 at 12:25 PM, Julian Foad
>> wrote:
>>>
>>> I have written out how I think a large part of the symmetric merge
>>> algori
On 4/17/2012 11:38 AM, Paul Burba wrote:
On Mon, Apr 16, 2012 at 12:25 PM, Julian Foad wrote:
I have written out how I think a large part of the symmetric merge
algorithm should go, in more detail. Review and other feedback would
be welcome.
We need to write out the algorithm in this level
On Mon, Apr 16, 2012 at 12:25 PM, Julian Foad wrote:
> I have written out how I think a large part of the symmetric merge
> algorithm should go, in more detail. Review and other feedback would
> be welcome.
>
> We need to write out the algorithm in this level of detail and a
>
I have written out how I think a large part of the symmetric merge
algorithm should go, in more detail. Review and other feedback would
be welcome.
We need to write out the algorithm in this level of detail and a
little more detail, and then write several new functions for
implementing parts of
14 matches
Mail list logo
