VersionedFile.walk deprecated?

John Yates jyates at
Wed Apr 19 14:51:40 BST 2006

On Monday, 2006-04-17, Aaron Bentley wrote:

> I have started work on plan_merge as described here, but here's what I
> think would be better:
> 1. knits maintain a concept of line identity.
> 2. We do sequence matching in two passes:
>    i. sequence match on the entire files, matching exact line identity
>    ii. in conflict regions, do a second sequence match, matching text

I am not really "up to speed" on the intricacies of the various merge
techniques being discussed.  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:

My sense is that Aaron's concept of line identity is more one of object
identity.  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


More information about the bazaar mailing list