Viewing all changes in revision 3514.2.2.
- Committer: John Arbash Meinel
- Date: 2008-07-09 21:42:24 UTC
- mto: This revision was merged to the branch mainline in revision 3543.
- Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.
To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.
To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.
expand all
collapse all
added
removed
