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

[Robert Collins]

On Thu, 2008-03-20 at 01:22 -0400, Aaron Bentley wrote:
> -----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)

This looks nice. A tweak please:
 - the vertical white space mid function doesn't seem needed.

Otherwise, I think this is good, please do a merge into a checkout of
trunk; or I can do that for you.

Cheers,
Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080320/5618bebc/attachment.pgp