[MERGE] cleanup of merge command

[Aaron Bentley]

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

Hi all,

This patch cleans up the merge command and allows it to work properly
with revisions that don't have integer revnos.

Merge has essentially 3 behaviors:
1. merge from a branch
2. merge uncommitted changes from a tree
3. merge from a bundle or merge directive

Most of the code specific to merging from a branch has moved to
cmd_merge.from_branch.  It's quite long, but it's all related to input
interpretation, so I think it does belong there.

Code specific to merging from a bundle or merge directive has gone into
Merger.from_mergeable.

Code for merging uncommitted changes has gone into Merger.from_uncommitted.

Testcases that used _merge_helper have been updated to use
WorkingTree.merge_from_branch.  That required updating merge_from_branch
to take from_revision and merge_type parameters.

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

iD8DBQFGp9kZ0F+nu1YWqI0RAnIWAJ9XWQz4mMyKSFQw6JGQ0xHhr/zTTACZAR0N
hdBaic9pyFreGfrBXpdc8kA=
=e6X5
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-cleanup.patch
Type: text/x-patch
Size: 56054 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070725/ab187980/attachment-0001.bin