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

Robert Collins robertc at robertcollins.net
Fri Dec 28 08:21:44 GMT 2007


On Wed, 2007-12-26 at 21:36 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi all,
> 
> This patch adds support for previewing the result of a merge or other
> TreeTransform.  This is a result of the combined efforts of me and
> Michael Hudson.  He wants it for Launchpad, but I can also see it being
> useful for Bundle Buggy, Loggerhead, or a graphical merge tool like John
> Meinel's merge-into-gui.

bb:comment

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. 

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


More information about the bazaar mailing list