Loom merge

[Robert Collins]

On Sat, Feb 5, 2011 at 6:00 AM, John Arbash Meinel
<john at arbash-meinel.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> I've been thinking about what it should mean when merging looms, and I
> was wondering what other people think.
>
> My specific thought is that loom merge should operate on the loom
> itself, step by step. Consider this example:

Thats basically it,

Note that the working loom has room to record the tips of each thread
in much the same way a working tree can record pending merges, with
the intent of the same basic workflow:
$ bzr merge otherloom
-> does as much as can be done until conflicts occur; writes all state to disk,
$ bzr conflicts
-> tells you about conflicts (we could add bzr loom-conflicts, or
union the output)
$ bzr up-thread/down-thread can put you into a pending-merge state or
whatever as appropriate

-Rob