equal
deleted
inserted
replaced
40 $ echo '\.rej' >> .hgignore |
40 $ echo '\.rej' >> .hgignore |
41 |
41 |
42 |
42 |
43 Test different --eol values |
43 Test different --eol values |
44 |
44 |
45 $ python -c 'file("a", "wb").write("a\nb\nc\nd\ne")' |
45 $ $PYTHON -c 'file("a", "wb").write("a\nb\nc\nd\ne")' |
46 $ hg ci -Am adda |
46 $ hg ci -Am adda |
47 adding .hgignore |
47 adding .hgignore |
48 adding a |
48 adding a |
49 $ python ../makepatch.py |
49 $ python ../makepatch.py |
50 $ hg qimport eol.diff |
50 $ hg qimport eol.diff |
148 |
148 |
149 Test .rej file EOL are left unchanged |
149 Test .rej file EOL are left unchanged |
150 |
150 |
151 $ hg init testeol |
151 $ hg init testeol |
152 $ cd testeol |
152 $ cd testeol |
153 $ python -c "file('a', 'wb').write('1\r\n2\r\n3\r\n4')" |
153 $ $PYTHON -c "file('a', 'wb').write('1\r\n2\r\n3\r\n4')" |
154 $ hg ci -Am adda |
154 $ hg ci -Am adda |
155 adding a |
155 adding a |
156 $ python -c "file('a', 'wb').write('1\r\n2\r\n33\r\n4')" |
156 $ $PYTHON -c "file('a', 'wb').write('1\r\n2\r\n33\r\n4')" |
157 $ hg qnew patch1 |
157 $ hg qnew patch1 |
158 $ hg qpop |
158 $ hg qpop |
159 popping patch1 |
159 popping patch1 |
160 patch queue now empty |
160 patch queue now empty |
161 $ python -c "file('a', 'wb').write('1\r\n22\r\n33\r\n4')" |
161 $ $PYTHON -c "file('a', 'wb').write('1\r\n22\r\n33\r\n4')" |
162 $ hg ci -m changea |
162 $ hg ci -m changea |
163 |
163 |
164 $ hg --config 'patch.eol=LF' qpush |
164 $ hg --config 'patch.eol=LF' qpush |
165 applying patch1 |
165 applying patch1 |
166 patching file a |
166 patching file a |