[MERGE] Revert merge and pull display using TreeTransform._iter_changes

Aaron Bentley aaron.bentley at utoronto.ca
Fri Feb 9 17:12:03 GMT 2007


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

Hi all,

This patch implements Transform._iter_changes, which translates a
pending transform into _iter_changes format, for display purposes.

It then changes "revert" to use TreeTransform._iter_changes, so that it
reflects conflict resolution better.  It adds the same output to "merge"
and "pull".

Since the output is provided using trace.note(), --quiet will silence it.

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

iD8DBQFFzKtj0F+nu1YWqI0RAl5RAJ40cs2QOd9YapQ1vQTHYqLMVaFCNQCdFqbO
L5rDLpsW0w0sndYTEm4LUeM=
=4GB4
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: transform-translation.patch
Type: text/x-patch
Size: 74842 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070209/3bf62b3f/attachment-0001.bin 


More information about the bazaar mailing list