[PATCH] Use merge3 for text merging

[Aaron Bentley]

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

Martin Pool wrote:
> On 27 Jul 2005, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> 
> 
>>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.
> 
> 
> OK, we can do that fairly easily.  Do you think we need it now or is it
> just nice-to-have?

We don't need it immediately, but we should have it.  What we have now
is unlikely to break anytime soon, but it is still wrong, and supporting
different peoples' preferences would be nice.


>>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've been using 
> 
>   bzr unknowns
>   rm -v $( bzr unknowns)
> 
> to get rid of them.

Ah.  I think it's unlikely that would lead to wanted files being lost,
but I it could, e.g. in a large tree.

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

iD8DBQFC72xA0F+nu1YWqI0RAnXmAJ98w8rV/9nG0coChfP1Ddj6ypbXSwCcCM08
gY4p7niTOe5wpL3lbXmMgAM=
=GHFp
-----END PGP SIGNATURE-----