[MERGE] Add support for previewing the result of a merge
Aaron Bentley
aaron at aaronbentley.com
Fri Dec 28 15:38:58 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Robert Collins wrote:
> On Wed, 2007-12-26 at 21:36 -0500, Aaron Bentley wrote:
>> This patch adds support for previewing the result of a merge or other
>> TreeTransform.
> Does this add a UI to use it? (e.g. bzr merge --preview). It would be
> great to be able to generate a history sensitive diff between arbitrary
> branches (better than -r ancestor: does) by using this from the command
> line.
Not yet. For one thing, I'm trying to sort out whether it would be
better as an option to merge or diff. Both commands take various
options that can dramatically affect the result.
Since the result is a tree, it would be nice to access it as a revision
specifier, but I'm not sure how practical that is.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHdRiS0F+nu1YWqI0RAjmqAJwMVDhqpIbcetD69Dj1TG6fVSThOgCePz0p
83ZGMvkDz4AyNQ2Zk8AGtJ4=
=Wd43
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list