[MERGE] Revert now resolves conflicts recursively (#102739)
Robert Collins
robertc at robertcollins.net
Fri Nov 23 20:43:36 GMT 2007
On Fri, 2007-11-23 at 15:29 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi all,
>
> Here's yet another simple patch for a high-priority bug. It allows
> "revert" to resolve conflicts recursively.
This one is pretty simple. I think
bb:approve
I have one thing for you to consider - is there any need for a
non-recursive conflict resolving api ? If not, then I'd just consider it
a bugfix in the code and not add a keyword parameter. If there is, then
perhaps the docstring or something should indicate the non-recursive use
cases for future reference.
-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/20071124/21724f6d/attachment.pgp
More information about the bazaar
mailing list