Major diff/merge changes in bzr and explorer

[Aaron Bentley]

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

On 12-05-03 04:41 AM, Andreas Sommer wrote:
> From: Gordon Tyler <gordon at doxxx.net>

>> Another diff-related feature request that I recall seeing was for
>> proper handling of multi-file diffs with tools that can handle
>> them.

> Good point. There is an important distinction to make:
> 
> 1) Tools that show multiple 2-way diffs, e.g. in tabs. This is done
> by multiple process invocations (e.g. WinMerge) or passing the file
> pairs as parameters (e.g. meld) as described in the bug comments.
> 
> 2) Tools that can handle 3+ way diffs like Diffuse. 'bzr diff' can
> only compare two revisions at the moment, so multi-revision diff
> tools can not be used yet. But it might be worth considering it in
> the implementation of a common tool invocation module. For example,
> instead of parameters (old_filename,new_filename) one could use a
> list new_filenames (that would contain one filename in case of the 
> traditional 2-way diff).

I would distinguish between per-file diff tools and per-tree diff
tools.  The diff code I wrote handles per-file diff tools as
extra_factories for DiffTree.  I imagined that per-tree diff tools
would be implemented using the same API as DiffTree, and registered
with bzrlib.diff.format_registry, but I didn't do any work on that.

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

iEYEARECAAYFAk+inycACgkQ0F+nu1YWqI0hnwCbBTsiTuArnPnfohKopMm141wx
Yv8AmwS66Zp8FmqsoKoYLB/dX9TIXrPc
=tIvE
-----END PGP SIGNATURE-----