Re: [Monotone-devel] cooperative/parallel/resumed merging (was Re: branches)

[Patrick Mauritz]

Am Dienstag, 11. Mai 2004 12:35 schrieb Christof Petig:
> Since this is such an interesting feature I was astonished I got no
> feedback. I'm not sold to this particular implementation but I sincerely
> want a solution.
another proposal:
you have versions A and B, and you want to merge them to C. X is the common 
ancestor, X' is the common ancestor plus non-conflicting changes. A' and B' 
are sets of changes that definitely conflict entirely

- if there are no conflicts, C is created (as currently) and everything is 
fine.

   X
  / \
 A   B
  \ /
   C

- if there are conflicts, but some mergable changes
 - a common child is created containing a best-effort merge (that is, without 
the conflicting chunks)
 - this child instantly gets two children versions, containing the left-side 
and right-side changes that conflict

   X
  / \
 A   B
  \ /
   X'
  / \
 A'  B'

- if there are conflicts and no other changes, nothing is done

   X'
  / \
 A'  B'

after this, if there are multiple heads, you (or someone else) can merge them 
using the interactive merge tool (execute xxdiffs or whatever you configured)

a tool to merge two heads into the working copy, probably using whatever kind 
of markers, to manually resolve, _then_ commit would be nice, too, of course.


patrick mauritz