Mercurial > evolve

comparison tests/test-evolve-continue.t @ 6396:e5bd76f95145 mercurial-5.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.6 into mercurial-5.5
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 06 Feb 2023 21:38:31 +0400
parents 34f5c849fc1d 1328195f76a9
children 716912541759
comparison
equal deleted inserted replaced
6350:0aff320554d2 6396:e5bd76f95145
31 o 0:8fa14d15e168 added hgignore 31 o 0:8fa14d15e168 added hgignore
32 () draft 32 () draft
33 33
34 Simple case of evolve --continue 34 Simple case of evolve --continue
35 35
36 $ hg up ca1b80f7960a 36 $ hg up 'desc("added c")'
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
38 $ echo bar > d 38 $ echo bar > d
39 $ hg add d 39 $ hg add d
40 $ hg amend 40 $ hg amend
41 1 new orphan changesets 41 1 new orphan changesets
69 69
70 $ hg evolve --continue 70 $ hg evolve --continue
71 evolving 4:c41c793e0ef1 "added d" 71 evolving 4:c41c793e0ef1 "added d"
72 72
73 $ hg glog 73 $ hg glog
74 o 6:2a4e03d422e2 added d 74 o 6:250d8c3c5ad9 added d
75 | () draft 75 | () draft
76 @ 5:cb6a2ab625bb added c 76 @ 5:cb6a2ab625bb added c
77 | () draft 77 | () draft
78 o 2:b1661037fa25 added b 78 o 2:b1661037fa25 added b
79 | () draft 79 | () draft
82 o 0:8fa14d15e168 added hgignore 82 o 0:8fa14d15e168 added hgignore
83 () draft 83 () draft
84 84
85 $ hg up 85 $ hg up
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
87
88 Testing hg continue for evolve
89
90 $ hg up 'desc("added b")'
91 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
92 $ echo bar > c
93 $ hg add c
94 $ hg amend
95 2 new orphan changesets
96 $ hg glog
97 @ 7:8591ebad2ee8 added b
98 | () draft
99 | * 6:250d8c3c5ad9 added d
100 | | () draft orphan
101 | * 5:cb6a2ab625bb added c
102 | | () draft orphan
103 | x 2:b1661037fa25 added b
104 |/ () draft
105 o 1:c7586e2a9264 added a
106 | () draft
107 o 0:8fa14d15e168 added hgignore
108 () draft
109
110 $ hg evolve --all
111 move:[5] added c
112 atop:[7] added b
113 merging c
114 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
115 unresolved merge conflicts
116 (see 'hg help evolve.interrupted')
117 [1]
118
119 $ echo foo > c
120 $ hg resolve -m
121 (no more unresolved files)
122 continue: hg evolve --continue
123
124 $ hg continue
125 evolving 5:cb6a2ab625bb "added c"
126 move:[6] added d
127 atop:[8] added c
128
129 $ hg glog
130 o 9:628919fc6772 added d
131 | () draft
132 o 8:f8d5006085c0 added c
133 | () draft
134 @ 7:8591ebad2ee8 added b
135 | () draft
136 o 1:c7586e2a9264 added a
137 | () draft
138 o 0:8fa14d15e168 added hgignore
139 () draft
140
141 $ hg up
142 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
87 143
88 Case when conflicts resolution lead to empty wdir in evolve --continue 144 Case when conflicts resolution lead to empty wdir in evolve --continue
89 145
90 $ echo foo > e 146 $ echo foo > e
91 $ hg ci -Aqm "added e" 147 $ hg ci -Aqm "added e"
92 $ hg prev 148 $ hg prev
93 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 149 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
94 [6] added d 150 [9] added d
95 $ echo bar > e 151 $ echo bar > e
96 $ hg add e 152 $ hg add e
97 $ hg amend 153 $ hg amend
98 1 new orphan changesets 154 1 new orphan changesets
99 155
100 $ hg glog 156 $ hg glog
101 @ 8:00a5c774cc37 added d 157 @ 11:7898e026e390 added d
102 | () draft 158 | () draft
103 | * 7:ad0a59d83efe added e 159 | * 10:5610cf0a9e66 added e
104 | | () draft orphan 160 | | () draft orphan
105 | x 6:2a4e03d422e2 added d 161 | x 9:628919fc6772 added d
106 |/ () draft 162 |/ () draft
107 o 5:cb6a2ab625bb added c 163 o 8:f8d5006085c0 added c
108 | () draft 164 | () draft
109 o 2:b1661037fa25 added b 165 o 7:8591ebad2ee8 added b
110 | () draft 166 | () draft
111 o 1:c7586e2a9264 added a 167 o 1:c7586e2a9264 added a
112 | () draft 168 | () draft
113 o 0:8fa14d15e168 added hgignore 169 o 0:8fa14d15e168 added hgignore
114 () draft 170 () draft
115 171
116 $ hg evolve --update 172 $ hg evolve --update
117 move:[7] added e 173 move:[10] added e
118 atop:[8] added d 174 atop:[11] added d
119 merging e 175 merging e
120 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') 176 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
121 unresolved merge conflicts 177 unresolved merge conflicts
122 (see 'hg help evolve.interrupted') 178 (see 'hg help evolve.interrupted')
123 [1] 179 [1]
127 (no more unresolved files) 183 (no more unresolved files)
128 continue: hg evolve --continue 184 continue: hg evolve --continue
129 $ hg diff 185 $ hg diff
130 186
131 $ hg evolve --continue 187 $ hg evolve --continue
132 evolving 7:ad0a59d83efe "added e" 188 evolving 10:5610cf0a9e66 "added e"
133 evolution of 7:ad0a59d83efe created no changes to commit 189 evolution of 10:5610cf0a9e66 created no changes to commit
134 190
135 $ hg glog 191 $ hg glog
136 @ 8:00a5c774cc37 added d 192 @ 11:7898e026e390 added d
137 | () draft 193 | () draft
138 o 5:cb6a2ab625bb added c 194 o 8:f8d5006085c0 added c
139 | () draft 195 | () draft
140 o 2:b1661037fa25 added b 196 o 7:8591ebad2ee8 added b
141 | () draft 197 | () draft
142 o 1:c7586e2a9264 added a 198 o 1:c7586e2a9264 added a
143 | () draft 199 | () draft
144 o 0:8fa14d15e168 added hgignore 200 o 0:8fa14d15e168 added hgignore
145 () draft 201 () draft
146 202
147 Case when there are a lot of revision to continue 203 Case when there are a lot of revision to continue
148 204
149 $ hg up c7586e2a9264 205 $ hg up 'desc("added a")'
150 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 206 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
151 $ echo bar > b 207 $ echo bar > b
152 $ hg add b 208 $ hg add b
153 $ hg amend 209 $ hg amend
154 3 new orphan changesets 210 3 new orphan changesets
155 211
156 $ hg evolve --all --update 212 $ hg evolve --all --update
157 move:[2] added b 213 move:[7] added b
158 atop:[9] added a 214 atop:[12] added a
159 merging b 215 merging b
160 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 216 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
161 unresolved merge conflicts 217 unresolved merge conflicts
162 (see 'hg help evolve.interrupted') 218 (see 'hg help evolve.interrupted')
163 [1] 219 [1]
165 $ echo foo > b 221 $ echo foo > b
166 $ hg resolve -m 222 $ hg resolve -m
167 (no more unresolved files) 223 (no more unresolved files)
168 continue: hg evolve --continue 224 continue: hg evolve --continue
169 $ hg evolve --continue 225 $ hg evolve --continue
170 evolving 2:b1661037fa25 "added b" 226 evolving 7:8591ebad2ee8 "added b"
171 move:[5] added c 227 move:[8] added c
172 atop:[10] added b 228 atop:[13] added b
173 move:[8] added d 229 move:[11] added d
174 working directory is now at 6642d2c9176e 230 working directory is now at 0fb68c8390f6
175 231
176 $ hg glog 232 $ hg glog
177 @ 12:6642d2c9176e added d 233 @ 15:0fb68c8390f6 added d
178 | () draft 234 | () draft
179 o 11:95665a2de664 added c 235 o 14:7bf9d72ff3bf added c
180 | () draft 236 | () draft
181 o 10:87f748868183 added b 237 o 13:aaa724b65a25 added b
182 | () draft 238 | () draft
183 o 9:53b632d203d8 added a 239 o 12:53b632d203d8 added a
184 | () draft 240 | () draft
185 o 0:8fa14d15e168 added hgignore 241 o 0:8fa14d15e168 added hgignore
186 () draft 242 () draft
187 243
188 Conlicts -> resolve -> continue -> conflicts -> resolve -> continue 244 Conlicts -> resolve -> continue -> conflicts -> resolve -> continue
189 Test multiple conflicts in one evolve 245 Test multiple conflicts in one evolve
190 246
191 $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done; 247 $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done;
192 248
193 $ hg glog 249 $ hg glog
194 @ 15:09becba8f97d added h 250 @ 18:1519cf722575 added h
195 | () draft 251 | () draft
196 o 14:5aa7b2bbd944 added g 252 o 17:04c32ddd9b44 added g
197 | () draft 253 | () draft
198 o 13:be88f889b6dc added f 254 o 16:29139ab665e3 added f
199 | () draft 255 | () draft
200 o 12:6642d2c9176e added d 256 o 15:0fb68c8390f6 added d
201 | () draft 257 | () draft
202 o 11:95665a2de664 added c 258 o 14:7bf9d72ff3bf added c
203 | () draft 259 | () draft
204 o 10:87f748868183 added b 260 o 13:aaa724b65a25 added b
205 | () draft 261 | () draft
206 o 9:53b632d203d8 added a 262 o 12:53b632d203d8 added a
207 | () draft 263 | () draft
208 o 0:8fa14d15e168 added hgignore 264 o 0:8fa14d15e168 added hgignore
209 () draft 265 () draft
210 266
211 $ hg up 95665a2de664 267 $ hg up 'desc("added c")'
212 1 files updated, 0 files merged, 4 files removed, 0 files unresolved 268 1 files updated, 0 files merged, 4 files removed, 0 files unresolved
213 269
214 $ echo bar > f 270 $ echo bar > f
215 $ echo bar > h 271 $ echo bar > h
216 $ hg add f h 272 $ hg add f h
217 $ hg amend 273 $ hg amend
218 4 new orphan changesets 274 4 new orphan changesets
219 275
220 $ hg glog 276 $ hg glog
221 @ 16:645135c5caa4 added c 277 @ 19:ebc872a542e5 added c
222 | () draft 278 | () draft
223 | * 15:09becba8f97d added h 279 | * 18:1519cf722575 added h
224 | | () draft orphan 280 | | () draft orphan
225 | * 14:5aa7b2bbd944 added g 281 | * 17:04c32ddd9b44 added g
226 | | () draft orphan 282 | | () draft orphan
227 | * 13:be88f889b6dc added f 283 | * 16:29139ab665e3 added f
228 | | () draft orphan 284 | | () draft orphan
229 | * 12:6642d2c9176e added d 285 | * 15:0fb68c8390f6 added d
230 | | () draft orphan 286 | | () draft orphan
231 | x 11:95665a2de664 added c 287 | x 14:7bf9d72ff3bf added c
232 |/ () draft 288 |/ () draft
233 o 10:87f748868183 added b 289 o 13:aaa724b65a25 added b
234 | () draft 290 | () draft
235 o 9:53b632d203d8 added a 291 o 12:53b632d203d8 added a
236 | () draft 292 | () draft
237 o 0:8fa14d15e168 added hgignore 293 o 0:8fa14d15e168 added hgignore
238 () draft 294 () draft
239 295
240 $ hg evolve --all --update 296 $ hg evolve --all --update
241 move:[12] added d 297 move:[15] added d
242 atop:[16] added c 298 atop:[19] added c
243 move:[13] added f 299 move:[16] added f
244 merging f 300 merging f
245 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') 301 warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
246 unresolved merge conflicts 302 unresolved merge conflicts
247 (see 'hg help evolve.interrupted') 303 (see 'hg help evolve.interrupted')
248 [1] 304 [1]
250 $ echo foo > f 306 $ echo foo > f
251 $ hg resolve -m 307 $ hg resolve -m
252 (no more unresolved files) 308 (no more unresolved files)
253 continue: hg evolve --continue 309 continue: hg evolve --continue
254 $ hg evolve --continue 310 $ hg evolve --continue
255 evolving 13:be88f889b6dc "added f" 311 evolving 16:29139ab665e3 "added f"
256 move:[14] added g 312 move:[17] added g
257 atop:[18] added f 313 atop:[21] added f
258 move:[15] added h 314 move:[18] added h
259 merging h 315 merging h
260 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') 316 warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
261 unresolved merge conflicts 317 unresolved merge conflicts
262 (see 'hg help evolve.interrupted') 318 (see 'hg help evolve.interrupted')
263 [1] 319 [1]
265 $ echo foo > h 321 $ echo foo > h
266 $ hg resolve -m 322 $ hg resolve -m
267 (no more unresolved files) 323 (no more unresolved files)
268 continue: hg evolve --continue 324 continue: hg evolve --continue
269 $ hg evolve --continue 325 $ hg evolve --continue
270 evolving 15:09becba8f97d "added h" 326 evolving 18:1519cf722575 "added h"
271 working directory is now at 3ba9d3d1b089 327 working directory is now at 0eb2b6434bd7
272 328
273 Make sure, confirmopt is respected while continue 329 Make sure, confirmopt is respected while continue
274 330
275 $ hg glog 331 $ hg glog
276 @ 20:3ba9d3d1b089 added h 332 @ 23:0eb2b6434bd7 added h
277 | () draft 333 | () draft
278 o 19:981e615b14ca added g 334 o 22:d4c17c25a1c7 added g
279 | () draft 335 | () draft
280 o 18:5794f1a3cbb2 added f 336 o 21:602e4bd1e5aa added f
281 | () draft 337 | () draft
282 o 17:e47537da02b3 added d 338 o 20:5cf56d246d18 added d
283 | () draft 339 | () draft
284 o 16:645135c5caa4 added c 340 o 19:ebc872a542e5 added c
285 | () draft 341 | () draft
286 o 10:87f748868183 added b 342 o 13:aaa724b65a25 added b
287 | () draft 343 | () draft
288 o 9:53b632d203d8 added a 344 o 12:53b632d203d8 added a
289 | () draft 345 | () draft
290 o 0:8fa14d15e168 added hgignore 346 o 0:8fa14d15e168 added hgignore
291 () draft 347 () draft
292 348
293 $ hg up 5794f1a3cbb2 349 $ hg up 'desc("added f")'
294 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 350 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
295 $ echo bar > g 351 $ echo bar > g
296 $ hg add g 352 $ hg add g
297 $ hg amend 353 $ hg amend
298 2 new orphan changesets 354 2 new orphan changesets
299 355
300 $ hg evolve --all --update --confirm << EOF 356 $ hg evolve --all --update --confirm << EOF
301 > y 357 > y
302 > EOF 358 > EOF
303 move:[19] added g 359 move:[22] added g
304 atop:[21] added f 360 atop:[24] added f
305 perform evolve? [Ny] y 361 perform evolve? [Ny] y
306 merging g 362 merging g
307 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') 363 warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
308 unresolved merge conflicts 364 unresolved merge conflicts
309 (see 'hg help evolve.interrupted') 365 (see 'hg help evolve.interrupted')
315 continue: hg evolve --continue 371 continue: hg evolve --continue
316 372
317 $ hg evolve --continue << EOF 373 $ hg evolve --continue << EOF
318 > y 374 > y
319 > EOF 375 > EOF
320 evolving 19:981e615b14ca "added g" 376 evolving 22:d4c17c25a1c7 "added g"
321 move:[20] added h 377 move:[23] added h
322 atop:[22] added g 378 atop:[25] added g
323 perform evolve? [Ny] y 379 perform evolve? [Ny] y
324 working directory is now at af6bd002a48d 380 working directory is now at cc583f773dc4
325 381
326 $ hg glog 382 $ hg glog
327 @ 23:af6bd002a48d added h 383 @ 26:cc583f773dc4 added h
328 | () draft 384 | () draft
329 o 22:d2c94a8f44bd added g 385 o 25:84772f0dfa79 added g
330 | () draft 386 | () draft
331 o 21:9849fa96c885 added f 387 o 24:d074fc123610 added f
332 | () draft 388 | () draft
333 o 17:e47537da02b3 added d 389 o 20:5cf56d246d18 added d
334 | () draft 390 | () draft
335 o 16:645135c5caa4 added c 391 o 19:ebc872a542e5 added c
336 | () draft 392 | () draft
337 o 10:87f748868183 added b 393 o 13:aaa724b65a25 added b
338 | () draft 394 | () draft
339 o 9:53b632d203d8 added a 395 o 12:53b632d203d8 added a
340 | () draft 396 | () draft
341 o 0:8fa14d15e168 added hgignore 397 o 0:8fa14d15e168 added hgignore
342 () draft 398 () draft
343 399
344 Testing `evolve --continue` after `hg next --evolve` 400 Testing `evolve --continue` after `hg next --evolve`
348 $ echo foobar > g 404 $ echo foobar > g
349 $ hg amend 405 $ hg amend
350 2 new orphan changesets 406 2 new orphan changesets
351 407
352 $ hg next --evolve 408 $ hg next --evolve
353 move:[22] added g 409 move:[25] added g
354 atop:[24] added f 410 atop:[27] added f
355 merging g 411 merging g
356 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') 412 warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
357 unresolved merge conflicts 413 unresolved merge conflicts
358 (see 'hg help evolve.interrupted') 414 (see 'hg help evolve.interrupted')
359 [1] 415 [1]
360 $ echo foo > g 416 $ echo foo > g
361 $ hg resolve -m 417 $ hg resolve -m
362 (no more unresolved files) 418 (no more unresolved files)
363 continue: hg evolve --continue 419 continue: hg evolve --continue
364 $ hg evolve --continue 420 $ hg evolve --continue
365 evolving 22:d2c94a8f44bd "added g" 421 evolving 25:84772f0dfa79 "added g"
366 422
367 Testing that interrupted evolve don't get confused about copies (issue5930): 423 Testing that interrupted evolve don't get confused about copies (issue5930):
368 ---------------------------------------------------------------------------- 424 ----------------------------------------------------------------------------
369 425
370 $ cd .. 426 $ cd ..