Mercurial > public > mercurial-scm > hg-stable
diff tests/test-import-git.t @ 48412:220506bb213e
patch: add hint about mangled whitespace on bad patch
One of the most common reasons that a patch doesn't apply is because
its whitespace has been mangled (e.g. by their mail client or though
copy&paste). Let's provide a hint about that.
Differential Revision: https://phab.mercurial-scm.org/D11825
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 19 Nov 2021 09:17:30 -0800 |
| parents | 6a454e7053a1 |
| children |
line wrap: on
line diff
--- a/tests/test-import-git.t Fri Nov 19 12:57:53 2021 -0800 +++ b/tests/test-import-git.t Fri Nov 19 09:17:30 2021 -0800 @@ -519,6 +519,7 @@ > EOF applying patch from stdin abort: could not decode "binary2" binary patch: bad base85 character at position 6 + (check that whitespace in the patch has not been mangled) [10] $ hg revert -aq @@ -534,6 +535,7 @@ > EOF applying patch from stdin abort: "binary2" length is 5 bytes, should be 6 + (check that whitespace in the patch has not been mangled) [10] $ hg revert -aq @@ -548,6 +550,7 @@ > EOF applying patch from stdin abort: could not extract "binary2" binary data + (check that whitespace in the patch has not been mangled) [10] Simulate a copy/paste turning LF into CRLF (issue2870)