[bzr-loom:MERGE] Accept a --merge-type for up-thread

[Aaron Bentley]

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

Hi all,

This patch adds a merge-type to the up-thread command.  This allows it
to use merge types which perform the particular merge better.

I've largely rewritten up-thread so that it
1. accepts a merge type
2. uses a more modern approach to perform the merge
3. is faster
4. when doing an up-thread from a thread with commits into a thread with
   no commits, make the branch last_revision the same as the previous
   thread.  (Otherwise, you get a discrepancy between tree.last_revision
   and branch.last_revision)

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

iD8DBQFH4fSS0F+nu1YWqI0RAvSAAJ9MmWzH7NJhQ65uAYlj8vbKcDCtvgCfWS9r
kg8Hn5RTAIoMwSRuJsP/e2g=
=vIx3
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: loom-83.patch
Type: text/x-diff
Size: 16136 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080320/c20163b7/attachment-0001.bin