[MERGE] Revert now resolves conflicts recursively (#102739)

Aaron Bentley aaron.bentley at utoronto.ca
Fri Nov 23 20:50:49 GMT 2007


-----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.

> If there is, then
> perhaps the docstring or something should indicate the non-recursive use
> cases for future reference.

Okay.

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

iD8DBQFHRz0p0F+nu1YWqI0RAojiAKCHCF/ASa0hgoSO9aTCO9zAqdPK/gCfRTOZ
Zan1ao6hA96wDQmciZMW83E=
=R2kZ
-----END PGP SIGNATURE-----



More information about the bazaar mailing list