equal
deleted
inserted
replaced
|
1 $ echo '[extensions]' >> $HGRCPATH |
|
2 $ echo 'mq =' >> $HGRCPATH |
|
3 |
1 $ cat >findbranch.py <<EOF |
4 $ cat >findbranch.py <<EOF |
2 > import re, sys |
5 > import re, sys |
3 > |
6 > |
4 > head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$') |
7 > head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$') |
5 > |
8 > |
53 $ cd c |
56 $ cd c |
54 $ hg import --exact ../r0.patch |
57 $ hg import --exact ../r0.patch |
55 applying ../r0.patch |
58 applying ../r0.patch |
56 $ hg import --exact ../r1.patch |
59 $ hg import --exact ../r1.patch |
57 applying ../r1.patch |
60 applying ../r1.patch |
|
61 |
|
62 Test --exact and patch header separators (issue3356) |
|
63 |
|
64 $ hg strip --no-backup . |
|
65 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66 >>> import re |
|
67 >>> p = file('../r1.patch', 'rb').read() |
|
68 >>> p = re.sub(r'Parent\s+', 'Parent ', p) |
|
69 >>> file('../r1-ws.patch', 'wb').write(p) |
|
70 $ hg import --exact ../r1-ws.patch |
|
71 applying ../r1-ws.patch |