[RFC] convenience merge routine...

[John Arbash Meinel]

Robert Collins wrote:
> Just asking what folk would think if I added a new workingtree method to
> do common-case merges - 
> 
> something like
> def merge(other_tree, [merge_inner_parameter=None ...])
> 
> Cheers,
> Rob

I like it. Similar to 'changes_from'. I find the merge.merge_inner()
rather unobvious. Probably because there is one helper that is meant for
command line, and another helper for internals, but they don't actually
do the same thing. (The external one sets pending merges, the internal
one doesn't, IIRC).

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060812/281a1cb1/attachment.pgp