Recipes vs. Looms vs. pipelines

Vincent Ladeuil v.ladeuil+lp at free.fr
Thu Dec 17 18:21:09 GMT 2009


>>>>> "jam" == John Arbash Meinel <john at arbash-meinel.com> writes:

    jam> Nope. You still have to merge it into your top thread and commit that.
    jam> So the history in the top thread is the same.

Hmmm, for me, history == graph, the graphs are different, so the
histories are different.

trunk -- my changes -- trunk merged
       \ new trunk  /

trunk -- new trunk  -- trunk merged
       \ my changes /

Different graphs. Same resulting trees.

Another key difference between pulling trunk in the base thread
is that, when I use several threads and I do up-thread --auto, I
resolve the conflicts for each thread, in several steps
(partitioning the conflicts), which is generally easier and
cleaner. And again, since there are now several commits, I hope
we can more easily agree that the histories are even more
different !

          Vincent



More information about the ubuntu-distributed-devel mailing list