Show More
@@ -10,7 +10,7 Test interactions between mq and patch.e | |||
|
10 | 10 | > EOF |
|
11 | 11 | |
|
12 | 12 | $ cat > makepatch.py <<EOF |
|
13 |
> f = |
|
|
13 | > f = open('eol.diff', 'wb') | |
|
14 | 14 | > w = f.write |
|
15 | 15 | > w('test message\n') |
|
16 | 16 | > w('diff --git a/a b/a\n') |
@@ -30,7 +30,7 Test interactions between mq and patch.e | |||
|
30 | 30 | |
|
31 | 31 | $ cat > cateol.py <<EOF |
|
32 | 32 | > import sys |
|
33 |
> for line in |
|
|
33 | > for line in open(sys.argv[1], 'rb'): | |
|
34 | 34 | > line = line.replace('\r', '<CR>') |
|
35 | 35 | > line = line.replace('\n', '<LF>') |
|
36 | 36 | > print(line) |
@@ -44,7 +44,7 Test interactions between mq and patch.e | |||
|
44 | 44 | |
|
45 | 45 | Test different --eol values |
|
46 | 46 | |
|
47 |
$ $PYTHON -c ' |
|
|
47 | $ $PYTHON -c 'open("a", "wb").write("a\nb\nc\nd\ne")' | |
|
48 | 48 | $ hg ci -Am adda |
|
49 | 49 | adding .hgignore |
|
50 | 50 | adding a |
@@ -152,15 +152,15 Test .rej file EOL are left unchanged | |||
|
152 | 152 | |
|
153 | 153 | $ hg init testeol |
|
154 | 154 | $ cd testeol |
|
155 |
$ $PYTHON -c " |
|
|
155 | $ $PYTHON -c "open('a', 'wb').write('1\r\n2\r\n3\r\n4')" | |
|
156 | 156 | $ hg ci -Am adda |
|
157 | 157 | adding a |
|
158 |
$ $PYTHON -c " |
|
|
158 | $ $PYTHON -c "open('a', 'wb').write('1\r\n2\r\n33\r\n4')" | |
|
159 | 159 | $ hg qnew patch1 |
|
160 | 160 | $ hg qpop |
|
161 | 161 | popping patch1 |
|
162 | 162 | patch queue now empty |
|
163 |
$ $PYTHON -c " |
|
|
163 | $ $PYTHON -c "open('a', 'wb').write('1\r\n22\r\n33\r\n4')" | |
|
164 | 164 | $ hg ci -m changea |
|
165 | 165 | |
|
166 | 166 | $ hg --config 'patch.eol=LF' qpush |
General Comments 0
You need to be logged in to leave comments.
Login now