Mercurial > hg
view tests/test-purge.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 | b777dd8f7836 |
| children |
line wrap: on
line source
% init % setup % delete an empty directory empty_dir Removing directory empty_dir directory r1 % delete an untracked directory untracked_dir/untracked_file1 untracked_dir/untracked_file2 Removing file untracked_dir/untracked_file1 Removing file untracked_dir/untracked_file2 Removing directory untracked_dir directory r1 % delete an untracked file untracked_file untracked_file_readonly Removing file untracked_file Removing file untracked_file_readonly directory r1 % delete an untracked file in a tracked directory directory/untracked_file Removing file directory/untracked_file directory r1 % delete nested directories untracked_directory/nested_directory Removing directory untracked_directory/nested_directory Removing directory untracked_directory directory r1 % delete nested directories from a subdir untracked_directory/nested_directory Removing directory untracked_directory/nested_directory Removing directory untracked_directory directory r1 % delete only part of the tree untracked_directory/nested_directory Removing directory untracked_directory/nested_directory Removing directory untracked_directory directory r1 directory/untracked_file % skip ignored files if --all not specified directory ignored r1 ignored Removing file ignored directory r1 % abort with missing files until we support name mangling filesystems untracked_file ! r1 ? untracked_file untracked_file Removing file untracked_file ! r1 % tracked file in ignored directory (issue621) untracked_file Removing file untracked_file % skip excluded files directory excluded_file r1 % skip files in excluded dirs directory excluded_dir r1 file % skip excluded empty dirs directory excluded_dir r1 % skip patterns