[PATCH] Use merge3 for text merging

[Aaron Bentley]

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

Martin Pool wrote:
 I think we should have some kind of ~/.bzr.ini file or
> ~/.bzr.conf/preferences file saying
> 
>   conflict-style = rejects | three-files | conflict-markers
> 
> (or perhaps any combination)

Okay, if you can supply an API for Merge3 to produce rejects, then I'll
change my mind, and say Merge3 should return a data structure describing
conflicted and unconflicted regions.  It would be nice if that data
structure had methods to produce rejects and a THIS+unconflicted changes
text, as well as a method to produce a diff3-style conflicted file.

(I don't think it would be great to use diff/patch for this, because
that's not the change the user requested.)

>>What *I*'d like to do about this is implement 'bzr resolved [--all]', to
>>tell bzr that you've resolved the conflict, and it can delete the files.
>>What do you think?
> 
> 
> That might be good, but deleting them is pretty easy...

Deleting all three is annoying to me, and resolve --all is nice, too.
Plus I can imagine using it for other types of conflicts, too.

>>I'd even take it futher, and refuse to commit conflicted files.  But
>>people say I'm wierd.
> 
> 
> Perhaps a forbidden-files list, similar to ignored files?  This could
> have .rej, .BASE, etc and also be customizable.

I'd be more inclined to follow baz's more limited model, where conflicts
are handled specially.  At least, in the Arch 1.0 model, 'unrecognized'
is just generally nasty.  Probably not so bad if the layering's
reasonable (i.e. if you add a forbidden file, it becomes a versioned
file) and if it only affects commits/merges ('unrecognized' prevents
*tla undo* from working...).

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

iD8DBQFC56Vt0F+nu1YWqI0RAtFiAJwOsNZZG/T/wkTPldQpC+z89CboLACcCz6E
GwqzX7c8hSEEp/Yy1iCxkus=
=xYNC
-----END PGP SIGNATURE-----