Mercurial > hg
view tests/test-purge.out @ 8810:ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 15 Jun 2009 00:03:26 +0200 |
| 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