I have a pair of files for which it is difficult to generate a good side-by-side diff. I uploaded them to
https://www.fossil-scm.org/tmp/hard-diff.zip I added an experimental option to Fossil's diff-er, the --yy option, that runs slower but does a better job. It still need improvement though. You can compare as follows: fossil test-diff --tk diff-a.txt diff-b.txt fossil test-diff --tk --yy diff-a.txt diff-b.txt The "--yy" name clearly needs to be improved. Suggestions are welcomed. I tried the same two files using the FileMerge utility on Mac. It generated a better diff but it had to think about it for way longer than the --yy option of fossil - the busy spinner kept spinning and spinning. I'll be trying to tweak the current fossil diff algorithm to help it do a better job in this problem case. Meanwhile, if anybody else has any suggestions on how to improve the diff, please speak up. FWIW, this came up while trying to fix a bug in SQLite - specifically the query planner problem that was patched at https://www.sqlite.org/src/timeline?c=87aceb41 -- D. Richard Hipp d...@sqlite.org _______________________________________________ fossil-dev mailing list fossil-dev@mailinglists.sqlite.org http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev