equal
deleted
inserted
replaced
225 |
225 |
226 Test patch.eol is handled |
226 Test patch.eol is handled |
227 (this also tests that editor is not invoked for '--bypass', if the |
227 (this also tests that editor is not invoked for '--bypass', if the |
228 commit message is explicitly specified, regardless of '--edit') |
228 commit message is explicitly specified, regardless of '--edit') |
229 |
229 |
230 $ $PYTHON -c 'file("a", "wb").write("a\r\n")' |
230 $ $PYTHON -c 'open("a", "wb").write(b"a\r\n")' |
231 $ hg ci -m makeacrlf |
231 $ hg ci -m makeacrlf |
232 $ HGEDITOR=cat hg import -m 'should fail because of eol' --edit --bypass ../test.diff |
232 $ HGEDITOR=cat hg import -m 'should fail because of eol' --edit --bypass ../test.diff |
233 applying ../test.diff |
233 applying ../test.diff |
234 patching file a |
234 patching file a |
235 Hunk #1 FAILED at 0 |
235 Hunk #1 FAILED at 0 |