equal
deleted
inserted
replaced
16 hg --cwd b import ../tip.patch |
16 hg --cwd b import ../tip.patch |
17 echo % message should be same |
17 echo % message should be same |
18 hg --cwd b tip | grep 'second change' |
18 hg --cwd b tip | grep 'second change' |
19 echo % committer should be same |
19 echo % committer should be same |
20 hg --cwd b tip | grep someone |
20 hg --cwd b tip | grep someone |
|
21 rm -r b |
|
22 |
|
23 echo % import exported patch with external patcher |
|
24 cat > dummypatch.py <<EOF |
|
25 print 'patching file a' |
|
26 file('a', 'wb').write('line2\n') |
|
27 EOF |
|
28 chmod +x dummypatch.py |
|
29 hg clone -r0 a b |
|
30 hg --cwd a export tip > tip.patch |
|
31 hg --config ui.patch='python ../dummypatch.py' --cwd b import ../tip.patch |
|
32 cat b/a |
21 rm -r b |
33 rm -r b |
22 |
34 |
23 echo % import of plain diff should fail without message |
35 echo % import of plain diff should fail without message |
24 hg clone -r0 a b |
36 hg clone -r0 a b |
25 hg --cwd a diff -r0:1 > tip.patch |
37 hg --cwd a diff -r0:1 > tip.patch |