[MERGE] WorkingTree.merge_from_branch

[Martin Pool]

On  4 Sep 2006, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> Robert Collins wrote:
> > 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 :).
> 
> I think this API is too limited to subsume builtins.merge, because it
> doesn't allow a client to specify:
> 
> - base
> - an arbitrary tree for BASE or THIS*
> - a merge type
> - merge options
> 
> * let's not consider the proposed "current:" revision spec here; that
> would mean opening the working tree of a branch, which is a serious
> layering defect.

Robert was talking the other day of adding APIs for various "stylized"
merges, rather than having many options and operations on a single API.
I think this is a step towards that?
 
> builtins.merge is uglier than it needs to be, sure.  But it's ugly for a
> reason...

We should try to make sure it only contains the ugliness needed for
dwim-type user operations.

-- 
Martin