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

Vincent Ladeuil wrote:
>>>>>> "jam" == John Arbash Meinel <j...@arbash-meinel.com> writes:
>     jam> Actually, those produce the exact same history.
> 
> No.

> No. A base thread for trunk were I can pull and feature thread on
> top is enough.
> 
> In one case I *pull* trunk in the base thread while in the other
> I *merge* trunk in the top thread.

In both cases, you are merging the same revision into the top thread.
In the loom case, you are using "up-thread -a" to merge from your
base-thread mirror.  In the non-loom case, you are using "merge;commit"
to merge directly from trunk.

How can the history be different if you're merging the same revision
into the same line-of-development?

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

iEYEARECAAYFAksqVmsACgkQ0F+nu1YWqI08ZACfbX3aEa0CbN6K1ZMSlfKJ7VXe
vU4AnRcDaG2P7yTife2cY3hwodwuOm7q
=5hNb
-----END PGP SIGNATURE-----

-- 
ubuntu-distributed-devel mailing list
ubuntu-distributed-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel

Reply via email to