[MERGE] auto-resolve for commit

[Aaron Bentley]

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

John Arbash Meinel wrote:
> I'm not sure about auto resolving on commit. However, I think a 'bzr
> resolve --check' would be a very good place for this.

Could you explain why that's an improvement?  From my POV, we shouldn't
ask the user to tell us what we already know.  What's the advantage of
the resolve step?

> Actually, I would
> even consider 'bzr resolve --all' should actually perform this check.
> While 'bzr resolve foo/bar' would sledgehammer that the conflict is
> resolved.

I don't think people would like this.

> Further, I think you could use the regex:
> 
> '^(<{7}|={7}|>{7})'

I used re.match, which will not match unless the regex matches at the
beginning of the line.  So the '^' is redundant.

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

iD8DBQFFT8Ry0F+nu1YWqI0RAj56AJ43+hpBNJOOWfyHP1s7Ks2GjNXO8gCeN2D5
K8JFH0D1HhosOI76up8GFp4=
=zxtO
-----END PGP SIGNATURE-----