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 'sync' and > 'reintegrate' merge code. > > Please review it and send me all your criticism and suggestions. > Seriously. > > 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 :-)
Julian, can you give any pointers on reviewing this work? Are we talking about a straight code read? Perhaps there's a good pair of trunk revision the differences between which carry the lion's share of your changes? May I assume that all the pertinent details remain in libsvn_client/merge.c? -- C. Michael Pilato <cmpil...@collab.net> CollabNet <> www.collab.net <> Enterprise Cloud Development
