aaron.bentley at utoronto.ca
Wed Apr 19 15:58:14 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
John Yates wrote:
> Nonetheless the reference to exact line
> identity makes me wonder whether the ideas described in this write-up
> -- reconstructed from ancient memories -- of the matching algorithm in
> DSEE and ClearCase have any relevance:
This sounds very similar to the Patience sequence matcher which we will
merge in 0.9.
> My sense is that Aaron's concept of line identity is more one of object
Right. When performing a sequence match, I'd prefer to give first
priority to lines that are definitely the same line in both revisions,
second priority to lines that have the same text in both revisions, and
are unique in each, and third priority to non-unique lines.
> And of course his thread is about merging, not differencing.
> The algorithm I describe is only an elaborate comparison algorithm. But,
> given an edited file, this algorithm might provide better recovery of line
Yes, I think it would behave better than the Python standard sequence
matcher, but not very differently from the Patience one. Currently,
we've had to disable out-of-order matches, because our merge algorithms
can't cope with moves, but I hope we'll be able to implement a
move-sensitive merge in the future.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar