[MERGE] WorkingTree.merge_from_branch

[Aaron Bentley]

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

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.

builtins.merge is uglier than it needs to be, sure.  But it's ugly for a
reason...

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

iD8DBQFE/OLf0F+nu1YWqI0RAjdnAJ4meH+j5RozsOEK2ejURcqmmg8sqQCfX1jk
niZwo/mwhSKV0uYVB8TyGb4=
=lct8
-----END PGP SIGNATURE-----