On Thu, Sep 13, 2012 at 6:55 PM, Julian Foad <julianf...@btopenworld.com> 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 'sync' and 'reintegrate' > merge code. > > Please review it and send me all your criticism and suggestions. Seriously.
Hi Julian, 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 issue they can be associated with? -- Paul T. Burba CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development Skype: ptburba > I intend to do some self-review as well, but there's nothing like one of you > fellow developers looking at it to motivate me to fix it :-) > > Thanks. > > - Julian >
