Re: Please review Symmetric Merge

2012-11-08 Thread Paul Burba
On Thu, Nov 8, 2012 at 9:49 AM, Julian Foad wrote: > Paul Burba wrote: > >> On Fri, Nov 2, 2012 at 5:29 PM, Paul Burba wrote: >>> What about all these two XFailing tests? >>> >>>merge_automatic_tests.py 16 'cherry2_fwd' >>>merge_automatic_tests.py 17 'cherry3_fwd >>> >>> Are you working

Re: Please review Symmetric Merge

2012-11-08 Thread Julian Foad
Paul Burba wrote: > On Fri, Nov 2, 2012 at 5:29 PM, Paul Burba wrote: >> What about all these two XFailing tests? >> >>   merge_automatic_tests.py 16 'cherry2_fwd' >>   merge_automatic_tests.py 17 'cherry3_fwd >> >> Are you working on those?  Are they blockers for 1.8?  Any existing >> issu

Re: Please review Symmetric Merge

2012-11-06 Thread Julian Foad
Paul Burba wrote: > On Fri, Nov 2, 2012 at 5:29 PM, Paul Burba wrote: >> What about all these two XFailing tests? >> >>   merge_automatic_tests.py 16 'cherry2_fwd' >>   merge_automatic_tests.py 17 'cherry3_fwd >> >> Are you working on those?  Are they blockers for 1.8?  Any existing >> iss

Re: Please review Symmetric Merge

2012-11-06 Thread Paul Burba
On Fri, Nov 2, 2012 at 5:29 PM, Paul Burba wrote: > On Thu, Sep 13, 2012 at 6:55 PM, Julian Foad > wrote: >> Hi, merge fans and QA fans. >> >> As you've seen, the 'symmetric merge' code is live in trunk and destined to >> be in 1.8. >> >> The principle is nice; however, the current implementati

Re: Please review Symmetric Merge

2012-11-02 Thread Paul Burba
On Thu, Sep 13, 2012 at 6:55 PM, Julian Foad wrote: > Hi, merge fans and QA fans. > > As you've seen, the 'symmetric merge' code is live in trunk and destined to > be in 1.8. > > The principle is nice; however, the current implementation is a rather ugly > hack, being just a layer on top of the

Re: Please review Symmetric Merge

2012-10-03 Thread Julian Foad
C. Michael Pilato wrote: > On 09/13/2012 06:55 PM, Julian Foad wrote: >> Hi, merge fans and QA fans. >> >> As you've seen, the 'symmetric merge' code is live in trunk and >> destined to be in 1.8. >> >> The principle is nice; however, the current implementation is a rather >> ugly hack, be

Re: Please review Symmetric Merge

2012-10-03 Thread C. Michael Pilato
On 09/13/2012 06:55 PM, Julian Foad wrote: > Hi, merge fans and QA fans. > > As you've seen, the 'symmetric merge' code is live in trunk and destined > to be in 1.8. > > The principle is nice; however, the current implementation is a rather > ugly hack, being just a layer on top of the existing '

Please review Symmetric Merge

2012-09-13 Thread Julian Foad
Hi, merge fans and QA fans. As you've seen, the 'symmetric merge' code is live in trunk and destined to be in 1.8. The principle is nice; however, the current implementation is a rather ugly hack, being just a layer on top of the existing 'sync' and 'reintegrate' merge code. Please review it