|
1 ========================================================= |
|
2 Test the proper behavior of evolve during merge conflict. |
|
3 ========================================================= |
|
4 |
|
5 Initial setup |
|
6 |
|
7 $ cat >> $HGRCPATH <<EOF |
|
8 > [ui] |
|
9 > interactive=false |
|
10 > merge=internal:merge |
|
11 > promptecho = True |
|
12 > [defaults] |
|
13 > amend=-d "0 0" |
|
14 > [merge-tools] |
|
15 > touch.checkchanged=true |
|
16 > touch.gui=true |
|
17 > touch.args=babar |
|
18 > [extensions] |
|
19 > EOF |
|
20 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
|
21 |
|
22 $ safesed() { |
|
23 > sed "$1" "$2" > `pwd`/sed.temp |
|
24 > mv `pwd`/sed.temp "$2" |
|
25 > } |
|
26 |
|
27 create a simple repo |
|
28 |
|
29 $ hg init repo |
|
30 $ cd repo |
|
31 $ cat << EOF > babar |
|
32 > un |
|
33 > deux |
|
34 > trois |
|
35 > quatre |
|
36 > cinq |
|
37 > EOF |
|
38 $ hg add babar |
|
39 $ hg commit -m "babar count up to five" |
|
40 $ cat << EOF >> babar |
|
41 > six |
|
42 > sept |
|
43 > huit |
|
44 > neuf |
|
45 > dix |
|
46 > EOF |
|
47 $ hg commit -m "babar count up to ten" |
|
48 $ cat << EOF >> babar |
|
49 > onze |
|
50 > douze |
|
51 > treize |
|
52 > quatorze |
|
53 > quinze |
|
54 > EOF |
|
55 $ hg commit -m "babar count up to fifteen" |
|
56 |
|
57 |
|
58 proper behavior without conflict |
|
59 ---------------------------------- |
|
60 |
|
61 $ hg gdown |
|
62 gdown have been deprecated in favor of previous |
|
63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
64 [1] babar count up to ten |
|
65 $ safesed 's/huit/eight/' babar |
|
66 $ hg diff |
|
67 diff -r 9d5daf8bd956 babar |
|
68 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
|
69 +++ b/babar * (glob) |
|
70 @@ -5,6 +5,6 @@ |
|
71 cinq |
|
72 six |
|
73 sept |
|
74 -huit |
|
75 +eight |
|
76 neuf |
|
77 dix |
|
78 $ hg amend |
|
79 1 new unstable changesets |
|
80 $ hg evolve |
|
81 move:[2] babar count up to fifteen |
|
82 atop:[4] babar count up to ten |
|
83 merging babar |
|
84 working directory is now at 71c18f70c34f |
|
85 $ hg resolve -l |
|
86 $ hg log -G |
|
87 @ changeset: 5:71c18f70c34f |
|
88 | tag: tip |
|
89 | user: test |
|
90 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
91 | summary: babar count up to fifteen |
|
92 | |
|
93 o changeset: 4:5977072d13c5 |
|
94 | parent: 0:29ec1554cfaf |
|
95 | user: test |
|
96 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
97 | summary: babar count up to ten |
|
98 | |
|
99 o changeset: 0:29ec1554cfaf |
|
100 user: test |
|
101 date: Thu Jan 01 00:00:00 1970 +0000 |
|
102 summary: babar count up to five |
|
103 |
|
104 |
|
105 |
|
106 proper behavior with conflict using internal:merge |
|
107 -------------------------------------------------- |
|
108 |
|
109 $ hg gdown |
|
110 gdown have been deprecated in favor of previous |
|
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
112 [4] babar count up to ten |
|
113 $ safesed 's/dix/ten/' babar |
|
114 $ hg diff |
|
115 diff -r 5977072d13c5 babar |
|
116 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
|
117 +++ b/babar * (glob) |
|
118 @@ -7,4 +7,4 @@ |
|
119 sept |
|
120 eight |
|
121 neuf |
|
122 -dix |
|
123 +ten |
|
124 $ hg amend |
|
125 1 new unstable changesets |
|
126 $ hg evolve |
|
127 move:[5] babar count up to fifteen |
|
128 atop:[7] babar count up to ten |
|
129 merging babar |
|
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
|
131 evolve failed! |
|
132 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
|
133 abort: unresolved merge conflicts (see hg help resolve) |
|
134 [255] |
|
135 $ hg resolve -l |
|
136 U babar |
|
137 $ hg log -G |
|
138 @ changeset: 7:e04690b09bc6 |
|
139 | tag: tip |
|
140 | parent: 0:29ec1554cfaf |
|
141 | user: test |
|
142 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
143 | summary: babar count up to ten |
|
144 | |
|
145 | o changeset: 5:71c18f70c34f |
|
146 | | user: test |
|
147 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
148 | | trouble: unstable |
|
149 | | summary: babar count up to fifteen |
|
150 | | |
|
151 | x changeset: 4:5977072d13c5 |
|
152 |/ parent: 0:29ec1554cfaf |
|
153 | user: test |
|
154 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
155 | summary: babar count up to ten |
|
156 | |
|
157 o changeset: 0:29ec1554cfaf |
|
158 user: test |
|
159 date: Thu Jan 01 00:00:00 1970 +0000 |
|
160 summary: babar count up to five |
|
161 |
|
162 (fix the conflict and continue) |
|
163 |
|
164 $ hg revert -r 5 --all |
|
165 reverting babar |
|
166 $ safesed 's/dix/ten/' babar |
|
167 $ hg resolve --all -m |
|
168 (no more unresolved files) |
|
169 $ hg evolve --continue |
|
170 grafting 5:71c18f70c34f "babar count up to fifteen" |
|
171 $ hg resolve -l |
|
172 $ hg log -G |
|
173 @ changeset: 8:1836b91c6c1d |
|
174 | tag: tip |
|
175 | user: test |
|
176 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
177 | summary: babar count up to fifteen |
|
178 | |
|
179 o changeset: 7:e04690b09bc6 |
|
180 | parent: 0:29ec1554cfaf |
|
181 | user: test |
|
182 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
183 | summary: babar count up to ten |
|
184 | |
|
185 o changeset: 0:29ec1554cfaf |
|
186 user: test |
|
187 date: Thu Jan 01 00:00:00 1970 +0000 |
|
188 summary: babar count up to five |
|
189 |
|
190 proper behavior with conflict using an external merge tool |
|
191 ---------------------------------------------------------- |
|
192 |
|
193 $ safesed 's/merge=.*/merge=touch/' $HGRCPATH |
|
194 $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH |
|
195 $ hg gdown |
|
196 gdown have been deprecated in favor of previous |
|
197 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
198 [7] babar count up to ten |
|
199 $ safesed 's/ten/zehn/' babar |
|
200 $ hg diff |
|
201 diff -r e04690b09bc6 babar |
|
202 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
|
203 +++ b/babar * (glob) |
|
204 @@ -7,4 +7,4 @@ |
|
205 sept |
|
206 eight |
|
207 neuf |
|
208 -ten |
|
209 +zehn |
|
210 $ hg amend |
|
211 1 new unstable changesets |
|
212 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH |
|
213 $ hg evolve --tool touch <<EOF |
|
214 > n |
|
215 > EOF |
|
216 move:[8] babar count up to fifteen |
|
217 atop:[10] babar count up to ten |
|
218 merging babar |
|
219 output file babar appears unchanged |
|
220 was merge successful (yn)? n |
|
221 merging babar failed! |
|
222 evolve failed! |
|
223 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
|
224 abort: unresolved merge conflicts (see hg help resolve) |
|
225 [255] |
|
226 $ hg resolve -l |
|
227 U babar |
|
228 $ hg log -G |
|
229 @ changeset: 10:b20d08eea373 |
|
230 | tag: tip |
|
231 | parent: 0:29ec1554cfaf |
|
232 | user: test |
|
233 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
234 | summary: babar count up to ten |
|
235 | |
|
236 | o changeset: 8:1836b91c6c1d |
|
237 | | user: test |
|
238 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
239 | | trouble: unstable |
|
240 | | summary: babar count up to fifteen |
|
241 | | |
|
242 | x changeset: 7:e04690b09bc6 |
|
243 |/ parent: 0:29ec1554cfaf |
|
244 | user: test |
|
245 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
246 | summary: babar count up to ten |
|
247 | |
|
248 o changeset: 0:29ec1554cfaf |
|
249 user: test |
|
250 date: Thu Jan 01 00:00:00 1970 +0000 |
|
251 summary: babar count up to five |
|
252 |
|
253 $ cat babar |
|
254 un |
|
255 deux |
|
256 trois |
|
257 quatre |
|
258 cinq |
|
259 six |
|
260 sept |
|
261 eight |
|
262 neuf |
|
263 zehn |