equal
deleted
inserted
replaced
141 |
141 |
142 Test patch.eol is handled |
142 Test patch.eol is handled |
143 (this also tests that editor is not invoked for '--bypass', if the |
143 (this also tests that editor is not invoked for '--bypass', if the |
144 commit message is explicitly specified, regardless of '--edit') |
144 commit message is explicitly specified, regardless of '--edit') |
145 |
145 |
146 $ python -c 'file("a", "wb").write("a\r\n")' |
146 $ $PYTHON -c 'file("a", "wb").write("a\r\n")' |
147 $ hg ci -m makeacrlf |
147 $ hg ci -m makeacrlf |
148 $ HGEDITOR=cat hg import -m 'should fail because of eol' --edit --bypass ../test.diff |
148 $ HGEDITOR=cat hg import -m 'should fail because of eol' --edit --bypass ../test.diff |
149 applying ../test.diff |
149 applying ../test.diff |
150 patching file a |
150 patching file a |
151 Hunk #1 FAILED at 0 |
151 Hunk #1 FAILED at 0 |