On Fri, Dec 18, 2015 at 01:49:08PM +0000, Philip Martin wrote: > Julian Foad <julianf...@apache.org> writes: > > > I (Julian Foad) wrote: > > > >> 4. Conversion of the element-based result to a series of WC edits. The > >> code in branch_compat.c doesn't quite do this, as it assumes an Ev1 > >> output (with only a 'copy' operation) whereas the WC API has a 'move' > >> operation that we probably need to use. In general it will need to > >> insert temporary moves e.g. to swap X and Y it may need to start by > >> moving X to temporary name Z. Unless the WC API moves can also be set > >> up using just 'copy' operations, in which case the approach in > >> branch_compat.c is on the right track although it is currently buggy. > > > > Anyone willing to help write one of the other parts? > > I'll start looking at 4.
I'm looking back at this thread now, trying to figure out to what extend I should try to support moves in the new conflict resolver. Did any of this element-based merge code make it into our repository?