equal
deleted
inserted
replaced
72 Test --exact and patch header separators (issue3356) |
72 Test --exact and patch header separators (issue3356) |
73 |
73 |
74 $ hg strip --no-backup . |
74 $ hg strip --no-backup . |
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
76 >>> import re |
76 >>> import re |
77 >>> p = file('../r1.patch', 'rb').read() |
77 >>> p = open('../r1.patch', 'rb').read() |
78 >>> p = re.sub(r'Parent\s+', 'Parent ', p) |
78 >>> p = re.sub(r'Parent\s+', 'Parent ', p) |
79 >>> file('../r1-ws.patch', 'wb').write(p) |
79 >>> open('../r1-ws.patch', 'wb').write(p) |
80 $ hg import --exact ../r1-ws.patch |
80 $ hg import --exact ../r1-ws.patch |
81 applying ../r1-ws.patch |
81 applying ../r1-ws.patch |
82 |
82 |
83 $ cd .. |
83 $ cd .. |