Mercurial > evolve

comparison tests/test-evolve-abort-orphan.t @ 6181:e6ae5af97683 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 08:19:44 +0300
parents c0921b5277a0
children 34f5c849fc1d 1328195f76a9
comparison
equal deleted inserted replaced
6180:0042d69b8648 6181:e6ae5af97683
62 abort: no interrupted evolve to abort 62 abort: no interrupted evolve to abort
63 [255] 63 [255]
64 #else 64 #else
65 $ hg abort 65 $ hg abort
66 abort: no operation in progress 66 abort: no operation in progress
67 [20] 67 [255]
68 #endif 68 #endif
69 69
70 Testing with wrong combination of flags 70 Testing with wrong combination of flags
71 ======================================= 71 =======================================
72 72
109 hit merge conflicts; retrying merge in working copy (inmemory !) 109 hit merge conflicts; retrying merge in working copy (inmemory !)
110 merging d 110 merging d
111 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 111 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
112 unresolved merge conflicts 112 unresolved merge conflicts
113 (see 'hg help evolve.interrupted') 113 (see 'hg help evolve.interrupted')
114 [240] 114 [1]
115 115
116 $ hg parents 116 $ hg parents
117 changeset: 5:e93a9161a274 117 changeset: 5:e93a9161a274
118 tag: tip 118 tag: tip
119 parent: 2:b1661037fa25 119 parent: 2:b1661037fa25
158 hit merge conflicts; retrying merge in working copy (inmemory !) 158 hit merge conflicts; retrying merge in working copy (inmemory !)
159 merging d 159 merging d
160 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 160 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
161 unresolved merge conflicts 161 unresolved merge conflicts
162 (see 'hg help evolve.interrupted') 162 (see 'hg help evolve.interrupted')
163 [240] 163 [1]
164 $ echo foo > d 164 $ echo foo > d
165 $ hg resolve -m 165 $ hg resolve -m
166 (no more unresolved files) 166 (no more unresolved files)
167 continue: hg evolve --continue 167 continue: hg evolve --continue
168 $ hg evolve --continue 168 $ hg evolve --continue
188 hit merge conflicts; retrying merge in working copy (inmemory !) 188 hit merge conflicts; retrying merge in working copy (inmemory !)
189 merging c 189 merging c
190 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 190 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
191 unresolved merge conflicts 191 unresolved merge conflicts
192 (see 'hg help evolve.interrupted') 192 (see 'hg help evolve.interrupted')
193 [240] 193 [1]
194 194
195 testing that interrupted evolve shows up in morestatus 195 testing that interrupted evolve shows up in morestatus
196 $ hg status -v 196 $ hg status -v
197 M c 197 M c
198 A d 198 A d
302 hit merge conflicts; retrying merge in working copy (inmemory !) 302 hit merge conflicts; retrying merge in working copy (inmemory !)
303 merging a 303 merging a
304 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 304 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
305 unresolved merge conflicts 305 unresolved merge conflicts
306 (see 'hg help evolve.interrupted') 306 (see 'hg help evolve.interrupted')
307 [240] 307 [1]
308 308
309 $ hg glog 309 $ hg glog
310 o 9:7f8e8bd9f0b6 added c 310 o 9:7f8e8bd9f0b6 added c
311 | () draft 311 | () draft
312 | o 8:db3b42ef4da7 added b 312 | o 8:db3b42ef4da7 added b
369 hit merge conflicts; retrying merge in working copy (inmemory !) 369 hit merge conflicts; retrying merge in working copy (inmemory !)
370 merging a 370 merging a
371 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 371 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
372 unresolved merge conflicts 372 unresolved merge conflicts
373 (see 'hg help evolve.interrupted') 373 (see 'hg help evolve.interrupted')
374 [240] 374 [1]
375 $ hg glog 375 $ hg glog
376 o 9:7f8e8bd9f0b6 added c 376 o 9:7f8e8bd9f0b6 added c
377 | () draft 377 | () draft
378 | o 8:db3b42ef4da7 added b 378 | o 8:db3b42ef4da7 added b
379 |/ () draft 379 |/ () draft
449 hit merge conflicts; retrying merge in working copy (inmemory !) 449 hit merge conflicts; retrying merge in working copy (inmemory !)
450 merging a 450 merging a
451 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 451 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
452 unresolved merge conflicts 452 unresolved merge conflicts
453 (see 'hg help evolve.interrupted') 453 (see 'hg help evolve.interrupted')
454 [240] 454 [1]
455 455
456 $ hg glog 456 $ hg glog
457 o 12:1c476940790a added d 457 o 12:1c476940790a added d
458 | () draft 458 | () draft
459 | o 11:c10a55eb0cc6 added c 459 | o 11:c10a55eb0cc6 added c
527 hit merge conflicts; retrying merge in working copy (inmemory !) 527 hit merge conflicts; retrying merge in working copy (inmemory !)
528 merging c 528 merging c
529 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 529 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
530 unresolved merge conflicts 530 unresolved merge conflicts
531 (see 'hg help evolve.interrupted') 531 (see 'hg help evolve.interrupted')
532 [240] 532 [1]
533 533
534 $ hg glog 534 $ hg glog
535 @ 5:c1f4718020e3 added b 535 @ 5:c1f4718020e3 added b
536 | (bm1) draft 536 | (bm1) draft
537 o 4:a0086c17bfc7 added a 537 o 4:a0086c17bfc7 added a
576 hit merge conflicts; retrying merge in working copy (inmemory !) 576 hit merge conflicts; retrying merge in working copy (inmemory !)
577 merging c 577 merging c
578 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 578 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
579 unresolved merge conflicts 579 unresolved merge conflicts
580 (see 'hg help evolve.interrupted') 580 (see 'hg help evolve.interrupted')
581 [240] 581 [1]
582 582
583 $ hg abort 583 $ hg abort
584 evolve aborted 584 evolve aborted
585 working directory is now at c1f4718020e3 585 working directory is now at c1f4718020e3
586 586