Mercurial > hg
view tests/test-mq-symlinks.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 | a981ddb16b80 |
children | b0bb72460c44 |
line wrap: on
line source
a -> a not a symlink % test replacing a file with a symlink a -> b popping symlink.patch now at: base.patch applying symlink.patch now at: symlink.patch a -> b % test updating a symlink a -> c popping updatelink now at: symlink.patch applying updatelink patching file a a now at: updatelink a -> c % test replacing a symlink with a file popping replacelinkwithfile now at: addlink applying replacelinkwithfile now at: replacelinkwithfile sss % test symlink removal popping removesl.patch now at: replacelinkwithfile applying removesl.patch now at: removesl.patch C b C c C s