Binary diff/merge proposal

[jbowtie at amathaine.com]

On Thu, Oct 14, 2010 at 11:43 AM, Gordon Tyler <gordon at doxxx.net> wrote:
>
> Sorry, I misread the earlier part about a single tool being able to
> provide both a text merge and GUI merge.
>
> It seems simpler to just have the user provide different names when
> registering the tool to distinguish between text-mode and GUI-mode, e.g.
> "GIMP (text)" and "GIMP (gui)". Hardcoding this distinction into the
> tool framework with an explicit GUI flag doesn't handle the case where
> there might be more than one text mode or more than one GUI mode.
>

Good catch, that sounds like a much better way to handle it.

> Currently my mergetools module in bzr derives the tool name from the
> executable but that can be changed. Although, anything more complicated
> than the list of command-lines it currently stores is going to require
> some trickery with the bzr config API since embedded sections are not
> allowed.
>

There is definitely going to be some changes required here - I'm
expecting plugins to implement the diff/merge directly for some
formats rather than calling out to an executable. I think this will be
much clearer once I've written a proof-of-concept plugin and tried to
get it to interact with both bzr and qbzr.