[MERGE] Revert now resolves conflicts recursively (#102739)
Robert Collins
robertc at robertcollins.net
Fri Nov 23 20:59:47 GMT 2007
On Fri, 2007-11-23 at 15:50 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Robert Collins wrote:
> >> 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 ?
>
> Yes. I would think GUI apps could provide users with fine selection of
> which conflicts to resolve.
>
> Now, technically, they could manipulate the conflict list directly, but
> conflict handling is tricky, because conflicts can match by file-id, or
> by path, and there are often multiple paths/file-ids involved. So I
> think having a helper like this does make sense.
Ok, that makes sense. Sounds like recursive=True should be the default
though.
-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/06158c7f/attachment.pgp
More information about the bazaar
mailing list