Mercurial > hg
view tests/test-revert.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 | 3f4f14eab085 |
children | a4fbbe0fbc38 |
line wrap: on
line source
%% should show b unknown ? b %% should show b unknown and c modified M c ? b %% should show b added and c modified M c A b %% should show a removed, b added and c modified M c A b R a %% should show b added, copy saved, and c modified M c A b %% should show b unknown, and c modified M c ? b %% should show unknown: b ? b %% should show b added A b %% should show b deleted ! b forgetting b %% should not find b b: No such file or directory %% should show a c e a c e %% should verbosely save backup to e.orig saving current version of e as e.orig reverting e %% should say no changes needed no changes needed to a %% should say file not managed file not managed: q %% should say file not found notfound: No such file in rev 095eacd0c0d7 A z ? e.orig %% should add a, remove d, forget z adding a removing d forgetting z %% should forget a, undelete d forgetting a undeleting d %% should silently add a A a R d %% should silently keep d removed R d 1 files updated, 0 files merged, 0 files removed, 0 files unresolved reverting c %% should print non-executable non-executable reverting c %% should print executable executable %% issue 241 adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail - no arguments abort: no files or directories specified; use --all to revert the whole repo % should succeed reverting a %% issue332 adding b/b created new head reverting b/b forgetting newdir/newfile reverting b/b % reverting a rename target should revert the source ? newa %% 4 ignored files (we will add/commit everything) I ignored I ignoreddir/file I ignoreddir/removed I removed %% should revert ignored* and undelete *removed reverting ignored reverting ignoreddir/file undeleting ignoreddir/removed undeleting removed %% should silently revert the named files