Show More
@@ -1,7 +1,10 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | hg init a |
|
3 | hg init a | |
|
4 | mkdir a/d1 | |||
|
5 | mkdir a/d1/d2 | |||
4 | echo line 1 > a/a |
|
6 | echo line 1 > a/a | |
|
7 | echo line 1 > a/d1/d2/a | |||
5 | hg --cwd a ci -d '0 0' -Ama |
|
8 | hg --cwd a ci -d '0 0' -Ama | |
6 |
|
9 | |||
7 | echo line 2 >> a/a |
|
10 | echo line 2 >> a/a | |
@@ -79,3 +82,19 b' python mkmsg.py | hg --cwd b import -' | |||||
79 | hg --cwd b tip | grep second |
|
82 | hg --cwd b tip | grep second | |
80 | rm -rf b |
|
83 | rm -rf b | |
81 |
|
84 | |||
|
85 | # bug non regression test | |||
|
86 | # importing a patch in a subdirectory failed at the commit stage | |||
|
87 | echo line 2 >> a/d1/d2/a | |||
|
88 | hg --cwd a ci -u someoneelse -d '1 0' -m'subdir change' | |||
|
89 | echo % hg import in a subdirectory | |||
|
90 | hg clone -r0 a b | |||
|
91 | hg --cwd a export tip | sed -e 's/d1\/d2\///' > tip.patch | |||
|
92 | pushd b/d1/d2 2>&1 > /dev/null | |||
|
93 | hg import ../../../tip.patch | |||
|
94 | popd 2>&1 > /dev/null | |||
|
95 | echo "% message should be 'subdir change'" | |||
|
96 | hg --cwd b tip | grep 'subdir change' | |||
|
97 | echo "% committer should be 'someoneelse'" | |||
|
98 | hg --cwd b tip | grep someoneelse | |||
|
99 | echo "% should be empty" | |||
|
100 | hg --cwd b status |
@@ -1,11 +1,12 b'' | |||||
1 | adding a |
|
1 | adding a | |
|
2 | adding d1/d2/a | |||
2 | % import exported patch |
|
3 | % import exported patch | |
3 | requesting all changes |
|
4 | requesting all changes | |
4 | adding changesets |
|
5 | adding changesets | |
5 | adding manifests |
|
6 | adding manifests | |
6 | adding file changes |
|
7 | adding file changes | |
7 |
added 1 changesets with |
|
8 | added 1 changesets with 2 changes to 2 files | |
8 |
|
|
9 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 | applying ../tip.patch |
|
10 | applying ../tip.patch | |
10 | patching file a |
|
11 | patching file a | |
11 | % message should be same |
|
12 | % message should be same | |
@@ -17,8 +18,8 b' requesting all changes' | |||||
17 | adding changesets |
|
18 | adding changesets | |
18 | adding manifests |
|
19 | adding manifests | |
19 | adding file changes |
|
20 | adding file changes | |
20 |
added 1 changesets with |
|
21 | added 1 changesets with 2 changes to 2 files | |
21 |
|
|
22 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
22 | applying ../tip.patch |
|
23 | applying ../tip.patch | |
23 | patching file a |
|
24 | patching file a | |
24 | transaction abort! |
|
25 | transaction abort! | |
@@ -28,8 +29,8 b' requesting all changes' | |||||
28 | adding changesets |
|
29 | adding changesets | |
29 | adding manifests |
|
30 | adding manifests | |
30 | adding file changes |
|
31 | adding file changes | |
31 |
added 1 changesets with |
|
32 | added 1 changesets with 2 changes to 2 files | |
32 |
|
|
33 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
33 | applying ../tip.patch |
|
34 | applying ../tip.patch | |
34 | patching file a |
|
35 | patching file a | |
35 | % import from stdin |
|
36 | % import from stdin | |
@@ -37,8 +38,8 b' requesting all changes' | |||||
37 | adding changesets |
|
38 | adding changesets | |
38 | adding manifests |
|
39 | adding manifests | |
39 | adding file changes |
|
40 | adding file changes | |
40 |
added 1 changesets with |
|
41 | added 1 changesets with 2 changes to 2 files | |
41 |
|
|
42 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
42 | applying patch from stdin |
|
43 | applying patch from stdin | |
43 | patching file a |
|
44 | patching file a | |
44 | % override commit message |
|
45 | % override commit message | |
@@ -46,8 +47,8 b' requesting all changes' | |||||
46 | adding changesets |
|
47 | adding changesets | |
47 | adding manifests |
|
48 | adding manifests | |
48 | adding file changes |
|
49 | adding file changes | |
49 |
added 1 changesets with |
|
50 | added 1 changesets with 2 changes to 2 files | |
50 |
|
|
51 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
51 | applying patch from stdin |
|
52 | applying patch from stdin | |
52 | patching file a |
|
53 | patching file a | |
53 | summary: override |
|
54 | summary: override | |
@@ -56,8 +57,8 b' requesting all changes' | |||||
56 | adding changesets |
|
57 | adding changesets | |
57 | adding manifests |
|
58 | adding manifests | |
58 | adding file changes |
|
59 | adding file changes | |
59 |
added 1 changesets with |
|
60 | added 1 changesets with 2 changes to 2 files | |
60 |
|
|
61 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
61 | applying ../msg.patch |
|
62 | applying ../msg.patch | |
62 | patching file a |
|
63 | patching file a | |
63 | user: email patcher |
|
64 | user: email patcher | |
@@ -67,8 +68,8 b' requesting all changes' | |||||
67 | adding changesets |
|
68 | adding changesets | |
68 | adding manifests |
|
69 | adding manifests | |
69 | adding file changes |
|
70 | adding file changes | |
70 |
added 1 changesets with |
|
71 | added 1 changesets with 2 changes to 2 files | |
71 |
|
|
72 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
72 | applying patch from stdin |
|
73 | applying patch from stdin | |
73 | patching file a |
|
74 | patching file a | |
74 | % plain diff in email, subject, no message body |
|
75 | % plain diff in email, subject, no message body | |
@@ -76,8 +77,8 b' requesting all changes' | |||||
76 | adding changesets |
|
77 | adding changesets | |
77 | adding manifests |
|
78 | adding manifests | |
78 | adding file changes |
|
79 | adding file changes | |
79 |
added 1 changesets with |
|
80 | added 1 changesets with 2 changes to 2 files | |
80 |
|
|
81 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
81 | applying patch from stdin |
|
82 | applying patch from stdin | |
82 | patching file a |
|
83 | patching file a | |
83 | % plain diff in email, no subject, no message body, should fail |
|
84 | % plain diff in email, no subject, no message body, should fail | |
@@ -85,8 +86,8 b' requesting all changes' | |||||
85 | adding changesets |
|
86 | adding changesets | |
86 | adding manifests |
|
87 | adding manifests | |
87 | adding file changes |
|
88 | adding file changes | |
88 |
added 1 changesets with |
|
89 | added 1 changesets with 2 changes to 2 files | |
89 |
|
|
90 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
90 | applying patch from stdin |
|
91 | applying patch from stdin | |
91 | patching file a |
|
92 | patching file a | |
92 | transaction abort! |
|
93 | transaction abort! | |
@@ -96,8 +97,22 b' requesting all changes' | |||||
96 | adding changesets |
|
97 | adding changesets | |
97 | adding manifests |
|
98 | adding manifests | |
98 | adding file changes |
|
99 | adding file changes | |
99 |
added 1 changesets with |
|
100 | added 1 changesets with 2 changes to 2 files | |
100 |
|
|
101 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
101 | applying patch from stdin |
|
102 | applying patch from stdin | |
102 | patching file a |
|
103 | patching file a | |
103 | summary: second change |
|
104 | summary: second change | |
|
105 | % hg import in a subdirectory | |||
|
106 | requesting all changes | |||
|
107 | adding changesets | |||
|
108 | adding manifests | |||
|
109 | adding file changes | |||
|
110 | added 1 changesets with 2 changes to 2 files | |||
|
111 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
112 | applying ../../../tip.patch | |||
|
113 | patching file a | |||
|
114 | % message should be 'subdir change' | |||
|
115 | summary: subdir change | |||
|
116 | % committer should be 'someoneelse' | |||
|
117 | user: someoneelse | |||
|
118 | % should be empty |
General Comments 0
You need to be logged in to leave comments.
Login now