​​On Wed, Dec 7, 2016 at 10:33 AM, Edward K. Ream <[email protected]>
wrote:

​> ​
Heh.  Imagine non-Leonistas using Leo as the ultimate git diff/merge tool!

​There is an interesting lacuna in this statement.  I was forgetting that
without a .leo file using Leo as a diff/merge tool implies using @auto to
bring in the files to be compared/merged.

Wait a minute. The two imported versions won't have the same gnx's.  But
the lack of comparable gnx's doesn't matter! It turns out that diff and
@auto complement each other superbly, even though they know nothing of each
other!

Indeed, @auto will break both files into pieces in a *consistent* way.  And
usually, most pieces will be identical.  A simple hashing scheme will very
quickly discover all identical nodes, which means that the O(N**2) diff
code *still* gets applied to relatively small (and relatively few) chunks.

Do you see what this means?  It means that @auto is a breakthrough in diff
and merge!  There is *no way* that meld, or any other text-based tool can
do as well as Leo can do in comparing the *logical* structure of two
versions of a source file.

Like I said, this is *way* to good to ignore...

EKR

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at https://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.

Reply via email to