Mercurial > hg
view tests/test-addremove-similar.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 | 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)