[MERGE] auto-resolve for commit

[Aaron Bentley]

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

Martin Pool wrote:

> I don't think there should be a specific command; the point is to
> eliminate a step.  How about instead:
> 
>   Commit fails if there are conflicts.
> 
>   The conflicts in a tree are taken from the tree's conflict list, 
>   except that any text conflicts where the markers have been removed 
>   are considered to be resolved.
> 
> This just requires WorkingTree.conflicts() to filter the list after it
> reads it and everything else should just work(?)

It does change the performance characteristics of
WorkingTree.conflicts(), and it will probably break some test cases, but
if you think that's the right way forward, we can do it.

A side effect will be that 'resolve' will auto-resolve conflicts.

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

iD8DBQFFUXX80F+nu1YWqI0RAkGlAJ0Q+PUyiA5E6wmRlacBnREvfNsx9ACeOXBn
SfzKE4bMX3Vc7k42IQMKBRQ=
=D1j8
-----END PGP SIGNATURE-----