Re: Symmetric Merge -- status

2012-06-12 Thread Julian Foad
(Just finishing an unfinished sentence...) I (Julian Foad) wrote: > I (Julian Foad) wrote: >> This is great.  You're right, the main thing seems to be that >> find_symmetric_merge is currently only fetching and analyzing >> the branch-root mergeinfo.  It needs to fetch and analyze all >> mer

Re: Symmetric Merge -- status

2012-06-12 Thread Julian Foad
I (Julian Foad) wrote: > This is great.  You're right, the main thing seems to be that > find_symmetric_merge is currently only fetching and analyzing > the branch-root mergeinfo.  It needs to fetch and analyze all > mergeinfo on the branch, finding a merge base for each subtree, > and proceed som

Re: Symmetric Merge -- status

2012-05-30 Thread Julian Foad
Thanks, Paul! This is great.  You're right, the main thing seems to be that find_symmetric_merge is currently only fetching and analyzing the branch-root mergeinfo.  It needs to fetch and analyze all mergeinfo on the branch, finding a merge base for each subtree, and proceed something like this

Re: Symmetric Merge -- status

2012-05-29 Thread Paul Burba
On Fri, May 25, 2012 at 12:08 PM, Julian Foad wrote: > Hi, all. > > I want to update you all on the "symmetric merge" [1] status and my plans, > and invite your thoughts and any assistance you can give. > > I'll be presenting this subject at Elego's SvnDay [2] and at WANdisco events > in October,

Symmetric Merge -- status

2012-05-25 Thread Julian Foad
Hi, all. I want to update you all on the "symmetric merge" [1] status and my plans, and invite your thoughts and any assistance you can give. I'll be presenting this subject at Elego's SvnDay [2] and at WANdisco events in October, but the presentation will be aimed at users and so will concentr

Re: Symmetric Merge - status

2012-04-05 Thread Julian Foad
>> Julian Foad wrote: >>>   I'm pleased to be able to say that as of this weekend we can welcome >>>   three more people -- Stefan Fuhrmann and Cristian Camerin and Oleksiy >>>   Suschuk [...] >> >> Welcome aboard! > > Correction: it's "Cristian Amarie" (IRC name: camerin). Correction 2: it's

Re: Symmetric Merge - status

2012-04-05 Thread Julian Foad
C. Michael Pilato wrote: > Julian Foad wrote: >> I'm pleased to be able to say that as of this weekend we can welcome >> three more people -- Stefan Fuhrmann and Cristian Camerin and Oleksiy >> Suschuk [...] > > Welcome aboard! Correction: it's "Cristian Amarie" (IRC name: camerin). - Julian

Re: Symmetric Merge - status

2012-04-02 Thread C. Michael Pilato
On 04/02/2012 11:02 AM, Julian Foad wrote: > I'm pleased to be able to say that as of this weekend we can welcome > three more people -- Stefan Fuhrmann and Cristian Camerin and Oleksiy > Suschuk -- who are all now getting involved with this work. They are all > working for Assembla and have just

Re: Symmetric Merge - status

2012-04-02 Thread Stefan Sperling
On Mon, Apr 02, 2012 at 04:02:03PM +0100, Julian Foad wrote: > New People > > > I'm pleased to be able to say that as of this weekend we can welcome three > more people -- Stefan Fuhrmann and Cristian Camerin and Oleksiy Suschuk -- > who are all now getting involved with this work.  They are al

Symmetric Merge - status

2012-04-02 Thread Julian Foad
Thanks to preliminary testing by Paul, Mark and Philip, the symmetric merge idea is starting to show its main point, but it is far from complete. What needs to be done? The current implementation is crude, and suffices only to get the development started by calling one or other of the current