Recipes vs. Looms vs. pipelines

[Aaron Bentley]

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

Vincent Ladeuil wrote:
> My point was (and is still) that the difference when using a loom
> is that there is a point where you get a better control on how
> the trunk is merged in each thread because the trunk is brought
> "by the bottom", 'up-thread --auto' stops in case of conflicts
> for a good reason.

I understand and agree.

> Putting that back in the udd context means that you get a chance
> to resolve the conflicts from upstream (there shouldn't be any
> since we do a pull and we can do that because we preserved the
> starting point) before resolving the conflicts from each patch,
> the conflicts from debian and finally the conflicts from ubuntu.

That is fine with me, but do you have any comments on the original issue?

The original discussion was about "down-thread; pull; up-thread -a"
feeling more natural than "pull -d submit:; merge; commit;".  It wasn't
about the advantages of stacks when you have multiple lines of
development, it was about the loom workflow feeling more natural even
when you only had one line of development.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAksrnckACgkQ0F+nu1YWqI0w/gCfSF7+/2l/ov+k/YbHkOfmcOFL
u8oAnAiWnxLELt4x6yWQHa+N7oPuIWwO
=XuGF
-----END PGP SIGNATURE-----