[MERGE] Add support for previewing the result of a merge

[Aaron Bentley]

-----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.

Okay, here's a version that includes that functionality in merge.  (Not
diff, because it's more important to vary the merge parameters than the
diff parameters).

Aaron

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

iD8DBQFHdeY/0F+nu1YWqI0RAsi3AJ9mK8ydTRTQ5AtqJCNL3icKuiqJaQCfdVX6
IOUGOgiXKxBpLoVNUZgtIyk=
=dG5W
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: transform-preview-3.patch
Type: text/x-diff
Size: 79122 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071229/d06f422e/attachment-0001.bin