[PATCH] cumulative merge patch

Aaron Bentley aaron.bentley at utoronto.ca
Fri Jun 3 00:51:19 BST 2005


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

This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text

This patch is current as of revision 613.

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

iD8DBQFCn5t30F+nu1YWqI0RAr0/AJ433eiZom8sP3GahjEzfJjl8A+VEwCfQkbF
/bUP4zekNR1/TRERZeC9+U0=
=SHKY
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge.patch
Type: text/x-patch
Size: 12217 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050602/6b87ca69/attachment.bin 


More information about the bazaar mailing list