Mercurial > hg
view tests/test-addremove-similar.out @ 9827:4fe9ca519637
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 11 Nov 2009 18:31:42 +0100 |
parents | 1a96f1d9599b |
children |
line wrap: on
line source
adding empty-file adding large-file adding another-file removing empty-file removing large-file recording removal of large-file as rename to another-file (99% similar) % comparing two empty files caused ZeroDivisionError in the past 2 files updated, 0 files merged, 1 files removed, 0 files unresolved adding another-empty-file removing empty-file adding large-file adding tiny-file removing large-file adding small-file removing tiny-file recording removal of tiny-file as rename to small-file (82% similar) % should all fail abort: similarity must be a number abort: similarity must be between 0 and 100 abort: similarity must be between 0 and 100 % issue 1527 removing d/a adding d/b recording removal of d/a as rename to d/b (100% similar) r 0 0 1970-01-01 00:00:00 d/a a 0 -1 unset d/b copy: d/a -> d/b % no copies found here (since the target isn't in d removing d/b % copies here adding c recording removal of d/a as rename to c (100% similar)