Major diff/merge changes in bzr and explorer

[Gordon Tyler]

On Tue, May 1, 2012 at 11:41 AM, Andreas Sommer <
andreas.sommer87 at googlemail.com> wrote:

> I will see that soon. From what I've seen in in mergetools, it has a
> different way of replacing arguments. Something like "executable
> /base:filename.BASE" is not possible because {base} must be a single
> argument (i.e. "executable /base filename.BASE" would be possible). This
> will be improved if I create a common module for tool invocation. If I
> remember correctly, this was actually bugging me for a while because I
> had to write a workaround in order to use the awesome TortoiseMerge. So
> it's a good chance to get that fixed too :)
>

It certainly sounds like that would be a good improvement and should be
backwards compatible.

Another diff-related feature request that I recall seeing was for proper
handling of multi-file diffs with tools that can handle them. I think it
might have been WinMerge that could display multiple diffs in a single
window, but the way our diff invocation currently works, it would show one
diff, wait for the diff app to close, invoke it again for the next file,
etc.

Ah, here it is: https://bugs.launchpad.net/bzr/+bug/490212

Ciao,
Gordon
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20120502/0cf6c5e3/attachment.html>