[MERGE] WorkingTree.merge_from_branch

Robert Collins robertc at robertcollins.net
Mon Sep 4 07:57:29 BST 2006

This patch adds a convenience method 'merge_from_branch' to WorkingTree.

I've added only the minimal functionality for now, but the plan is to
extend this api with portions of merge_inner and builtins.merge that
support library users. This is not a generic merge helper - its specific
to the use case of 'merge_from_branch'.

I've converted the current code base's use of TestCase.merge to use this
api, as its easier to understand and remember - I've also deprecated the
TestCase helper function.

GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: working-tree-merge-from-branch.patch
Type: text/x-patch
Size: 19593 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060904/b9507826/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060904/b9507826/attachment.pgp 

More information about the bazaar mailing list