Mercurial > evolve

comparison tests/test-evolve-abort-orphan.t @ 5714:b3d9e6c805d6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update with more detailed exit codes CORE-TEST-OUTPUT-UPDATE: 21733e8c924f CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0 CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c CORE-TEST-OUTPUT-UPDATE: ebee234d952a CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60 CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b CORE-TEST-OUTPUT-UPDATE: f96fa4de5055 CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 19 Nov 2020 08:28:45 -0800
parents b2de5825e5ca
children 8e4f6354b316 c5dfbbe4363d
comparison
equal deleted inserted replaced
5713:c3c870f3b98e 5714:b3d9e6c805d6
54 abort: no interrupted evolve to abort 54 abort: no interrupted evolve to abort
55 [255] 55 [255]
56 #else 56 #else
57 $ hg abort 57 $ hg abort
58 abort: no operation in progress 58 abort: no operation in progress
59 [255] 59 [20]
60 #endif 60 #endif
61 61
62 Testing with wrong combination of flags 62 Testing with wrong combination of flags
63 ======================================= 63 =======================================
64 64
99 atop:[5] added c 99 atop:[5] added c
100 merging d 100 merging d
101 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 101 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
102 unresolved merge conflicts 102 unresolved merge conflicts
103 (see 'hg help evolve.interrupted') 103 (see 'hg help evolve.interrupted')
104 [1] 104 [240]
105 105
106 $ hg parents 106 $ hg parents
107 changeset: 5:e93a9161a274 107 changeset: 5:e93a9161a274
108 tag: tip 108 tag: tip
109 parent: 2:b1661037fa25 109 parent: 2:b1661037fa25
146 atop:[5] added c 146 atop:[5] added c
147 merging d 147 merging d
148 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 148 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
149 unresolved merge conflicts 149 unresolved merge conflicts
150 (see 'hg help evolve.interrupted') 150 (see 'hg help evolve.interrupted')
151 [1] 151 [240]
152 $ echo foo > d 152 $ echo foo > d
153 $ hg resolve -m 153 $ hg resolve -m
154 (no more unresolved files) 154 (no more unresolved files)
155 continue: hg evolve --continue 155 continue: hg evolve --continue
156 $ hg evolve --continue 156 $ hg evolve --continue
174 move:[5] added c 174 move:[5] added c
175 merging c 175 merging c
176 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 176 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
177 unresolved merge conflicts 177 unresolved merge conflicts
178 (see 'hg help evolve.interrupted') 178 (see 'hg help evolve.interrupted')
179 [1] 179 [240]
180 180
181 testing that interrupted evolve shows up in morestatus 181 testing that interrupted evolve shows up in morestatus
182 $ hg status -v 182 $ hg status -v
183 M c 183 M c
184 A d 184 A d
286 atop:[7] added a 286 atop:[7] added a
287 merging a 287 merging a
288 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 288 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
289 unresolved merge conflicts 289 unresolved merge conflicts
290 (see 'hg help evolve.interrupted') 290 (see 'hg help evolve.interrupted')
291 [1] 291 [240]
292 292
293 $ hg glog 293 $ hg glog
294 o 9:7f8e8bd9f0b6 added c 294 o 9:7f8e8bd9f0b6 added c
295 | () draft 295 | () draft
296 | o 8:db3b42ef4da7 added b 296 | o 8:db3b42ef4da7 added b
351 atop:[7] added a 351 atop:[7] added a
352 merging a 352 merging a
353 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 353 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
354 unresolved merge conflicts 354 unresolved merge conflicts
355 (see 'hg help evolve.interrupted') 355 (see 'hg help evolve.interrupted')
356 [1] 356 [240]
357 $ hg glog 357 $ hg glog
358 o 9:7f8e8bd9f0b6 added c 358 o 9:7f8e8bd9f0b6 added c
359 | () draft 359 | () draft
360 | o 8:db3b42ef4da7 added b 360 | o 8:db3b42ef4da7 added b
361 |/ () draft 361 |/ () draft
429 atop:[7] added a 429 atop:[7] added a
430 merging a 430 merging a
431 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 431 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
432 unresolved merge conflicts 432 unresolved merge conflicts
433 (see 'hg help evolve.interrupted') 433 (see 'hg help evolve.interrupted')
434 [1] 434 [240]
435 435
436 $ hg glog 436 $ hg glog
437 o 12:1c476940790a added d 437 o 12:1c476940790a added d
438 | () draft 438 | () draft
439 | o 11:c10a55eb0cc6 added c 439 | o 11:c10a55eb0cc6 added c
505 move:[3] added c 505 move:[3] added c
506 merging c 506 merging c
507 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 507 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
508 unresolved merge conflicts 508 unresolved merge conflicts
509 (see 'hg help evolve.interrupted') 509 (see 'hg help evolve.interrupted')
510 [1] 510 [240]
511 511
512 $ hg glog 512 $ hg glog
513 @ 5:c1f4718020e3 added b 513 @ 5:c1f4718020e3 added b
514 | (bm1) draft 514 | (bm1) draft
515 o 4:a0086c17bfc7 added a 515 o 4:a0086c17bfc7 added a
552 atop:[5] added b 552 atop:[5] added b
553 merging c 553 merging c
554 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 554 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
555 unresolved merge conflicts 555 unresolved merge conflicts
556 (see 'hg help evolve.interrupted') 556 (see 'hg help evolve.interrupted')
557 [1] 557 [240]
558 558
559 $ hg abort 559 $ hg abort
560 evolve aborted 560 evolve aborted
561 working directory is now at c1f4718020e3 561 working directory is now at c1f4718020e3
562 562