Recipes vs. Looms vs. pipelines

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Vincent Ladeuil wrote:
>>>>>> "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
> 

Maybe you and I are using different versions of bzr-loom. I just did this:

bzr init test
cd test
bzr nick base
bzr loomify
bzr commit -m one --unchanged
bzr create-thread next
bzr commit -m next --unchanged
bzr down-thread
bzr commit -m "base two" --unchanged
bzr up-thread --auto


And it merged 'base two' into the 'next' thread, in the same way I would
have done it, if I had done "bzr merge ../base; bzr commit".

See the attached qlog screenshot. That clearly looks (to me) like

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

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksqlEIACgkQJdeBCYSNAANSZgCdHXv3j01+4oRENZjYJoFk+Mfq
XYAAoJnW68qF2tA98dHonog1/xTlpic9
=MuYD
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: loom_upthread.png
Type: image/png
Size: 27027 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/ubuntu-distributed-devel/attachments/20091217/d7483476/attachment-0001.png