Recipes vs. Looms vs. pipelines

[Aaron Bentley]

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

Vincent Ladeuil wrote:
>>>>>> "Aaron" == Aaron Bentley <aaron at canonical.com> writes:
>     Aaron> In both cases, you are merging the same revision into
>     Aaron> the top thread.
> 
> No.

In both cases, you are merging from a mirror of trunk into the top
thread.  In the loom case, the mirror is the bottom thread.  In the
non-loom case, it is ../devel.

If we assume that the mirrors are not stale when you merge, or are
equally stale, then they will have the same tip revision as one another.

Therefore, you are merging the same revision either way.

>     Aaron> In the loom case, you are using "up-thread -a" to
>     Aaron> merge from your base-thread mirror.
> 
> Which has been updated by the pull. So up-thread --auto will
> create new revisions by merging each thread on top of that, the
> trunk starting as the left-hand parent

No, trunk's tip will be a right-hand parent in the top thread and the
last_revision in the bottom thread.

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

iEYEARECAAYFAksqbaYACgkQ0F+nu1YWqI23gwCfS8b6RIDqqgE9IKzYw+imHDBk
6gYAn08LkqZj1DDMBl4s4EZZelazsH+a
=6B/a
-----END PGP SIGNATURE-----