[MERGE] auto-resolve for commit

[Aaron Bentley]

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

Martin Pool wrote:
> On  6 Nov 2006, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> 
> Will detection of those markers work properly if there was a conflict in
> a binary file?

A conflict in a binary file won't produce a TextConflict, it will
produce a ContentsConflict.  So the user will have to manually resolve
such conflicts.

> Can you add some text to doc/tutorial.txt explaining how conflicts will
> work in this case?

Okay.

> Trying to explain this does make me more sure the special case shouldn't
> be confined to just commit.

I'm happy to do it in cmd_conflicts and cmd_status, too.

>> +def auto_resolve(tree):
> I think this should be a Tree method not a function.

If you wish.

Aaron

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

iD8DBQFFUCsX0F+nu1YWqI0RAtE6AJ9gZU77CmjExoma9ocJd5gQacdRqwCeNPCt
Ng2SD+VibfmDSdfddFfBFWQ=
=q69z
-----END PGP SIGNATURE-----