[MERGE] Add support for previewing the result of a merge
Aaron Bentley
aaron at aaronbentley.com
Wed Jan 2 14:46:07 GMT 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Michael Hudson wrote:
> Aaron Bentley wrote:
>> 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.
>
> Yay, thanks so much for putting the effort in to getting this mergeable!
You're welcome. Thanks for getting the ball rolling. I think it's
pretty cool functionality that we can build even wilder stuff on (like
an 'undo' command). Plus, the conflicts we're getting are just nasty.
> In my cold-inhibited fuddle, I didn't see a test for previewing a merge
> that deleted a file, and I _think_ I found a bug relating to this in my
> code a week or so ago... could it still be there?
There was a bug in bzr.dev relating to diffing any file deletion, not
just from preview trees, so I expect that's what you saw. It's fixed now.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHe6Ov0F+nu1YWqI0RAlyDAJ0S9vvJpijTvcGZ34MRiPazoc/GEQCdEIXn
oPIQ1GDIfVBuaxRzg5Ed0Mc=
=h7EA
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list