[MERGE] WorkingTree.merge_from_branch

Robert Collins robertc at robertcollins.net
Mon Sep 4 09:02:18 BST 2006


On Mon, 2006-09-04 at 17:40 +1000, Martin Pool wrote:
> On  4 Sep 2006, Robert Collins <robertc at robertcollins.net> wrote:
> > 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.
...  
> > +class PointlessMerge(BzrNewError):
> > +    """Nothing to merge."""
> > +
> > +
> 
> It might be more user friendly to say 
> 
>   "No new revisions to merge from %s into %s"
> 
> if that's practical.

Its easy enough to change, I was preserving the shape of the output in
builtins.merge though, as I kindof expected this to subsume that, before
I realised I wanted to finish soon :).

Merged the other fixes, let me know what we should do on this one.

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: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060904/e94b35cd/attachment.pgp 


More information about the bazaar mailing list