annotate tests/test-inotify-issue1556.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 021de2d12355
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8601
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
1 % status without inotify
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
2 A a
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
3 ! b
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
4 % inserve
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
5 % status
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
6 A a
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
7 ! b
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
8 ? hg.pid
021de2d12355 inotify: adding test for issue1556
Dmitriy Kostunin <dmitriy.kostunin@gmail.com>
parents:
diff changeset
9 Are we able to kill the service? if not, the service died on some error