Mercurial > evolve

comparison tests/test-evolve-abort-orphan.t @ 3852:629558d09898

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: raise error.InterventionRequired instead of Abort when conflicts error.InterventionRequired is a better error to raise in such cases. Thanks to marmoute for noticing this.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 15 Jun 2018 00:16:29 +0530
parents f0096db2a7b1
children d00f0c369bc7 d081528bb372
comparison
equal deleted inserted replaced
3851:9ebed1e95ef7 3852:629558d09898
83 $ hg evolve --all 83 $ hg evolve --all
84 move:[4] added d 84 move:[4] added d
85 atop:[5] added c 85 atop:[5] added c
86 merging d 86 merging d
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
88 abort: fix conflicts and see `hg help evolve.interrupted` 88 fix conflicts and see `hg help evolve.interrupted`
89 [255] 89 [1]
90 90
91 $ hg evolve --abort 91 $ hg evolve --abort
92 evolve aborted 92 evolve aborted
93 working directory is now at e93a9161a274 93 working directory is now at e93a9161a274
94 94
115 $ hg evolve --all 115 $ hg evolve --all
116 move:[4] added d 116 move:[4] added d
117 atop:[5] added c 117 atop:[5] added c
118 merging d 118 merging d
119 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 119 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
120 abort: fix conflicts and see `hg help evolve.interrupted` 120 fix conflicts and see `hg help evolve.interrupted`
121 [255] 121 [1]
122 $ echo foo > d 122 $ echo foo > d
123 $ hg resolve -m 123 $ hg resolve -m
124 (no more unresolved files) 124 (no more unresolved files)
125 continue: hg evolve --continue 125 continue: hg evolve --continue
126 $ hg evolve --continue 126 $ hg evolve --continue
143 atop:[7] added a 143 atop:[7] added a
144 move:[5] added c 144 move:[5] added c
145 atop:[8] added b 145 atop:[8] added b
146 merging c 146 merging c
147 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 147 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
148 abort: fix conflicts and see `hg help evolve.interrupted` 148 fix conflicts and see `hg help evolve.interrupted`
149 [255] 149 [1]
150 150
151 testing that interrupted evolve shows up in morestatus 151 testing that interrupted evolve shows up in morestatus
152 $ hg status -v 152 $ hg status -v
153 M c 153 M c
154 A d 154 A d
254 atop:[7] added a 254 atop:[7] added a
255 move:[6] foo to a 255 move:[6] foo to a
256 atop:[7] added a 256 atop:[7] added a
257 merging a 257 merging a
258 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 258 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
259 abort: fix conflicts and see `hg help evolve.interrupted` 259 fix conflicts and see `hg help evolve.interrupted`
260 [255] 260 [1]
261 261
262 $ hg glog 262 $ hg glog
263 o 9:7f8e8bd9f0b6 added c 263 o 9:7f8e8bd9f0b6 added c
264 | () draft 264 | () draft
265 | o 8:db3b42ef4da7 added b 265 | o 8:db3b42ef4da7 added b
318 atop:[7] added a 318 atop:[7] added a
319 move:[6] foo to a 319 move:[6] foo to a
320 atop:[7] added a 320 atop:[7] added a
321 merging a 321 merging a
322 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 322 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
323 abort: fix conflicts and see `hg help evolve.interrupted` 323 fix conflicts and see `hg help evolve.interrupted`
324 [255] 324 [1]
325 $ hg glog 325 $ hg glog
326 o 9:7f8e8bd9f0b6 added c 326 o 9:7f8e8bd9f0b6 added c
327 | () draft 327 | () draft
328 | o 8:db3b42ef4da7 added b 328 | o 8:db3b42ef4da7 added b
329 |/ () draft 329 |/ () draft
395 atop:[9] added c 395 atop:[9] added c
396 move:[6] foo to a 396 move:[6] foo to a
397 atop:[7] added a 397 atop:[7] added a
398 merging a 398 merging a
399 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 399 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
400 abort: fix conflicts and see `hg help evolve.interrupted` 400 fix conflicts and see `hg help evolve.interrupted`
401 [255] 401 [1]
402 402
403 $ hg glog 403 $ hg glog
404 o 12:1c476940790a added d 404 o 12:1c476940790a added d
405 | () draft 405 | () draft
406 | o 11:c10a55eb0cc6 added c 406 | o 11:c10a55eb0cc6 added c
471 atop:[4] added a 471 atop:[4] added a
472 move:[3] added c 472 move:[3] added c
473 atop:[5] added b 473 atop:[5] added b
474 merging c 474 merging c
475 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 475 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
476 abort: fix conflicts and see `hg help evolve.interrupted` 476 fix conflicts and see `hg help evolve.interrupted`
477 [255] 477 [1]
478 478
479 $ hg glog 479 $ hg glog
480 @ 5:c1f4718020e3 added b 480 @ 5:c1f4718020e3 added b
481 | (bm1) draft 481 | (bm1) draft
482 o 4:a0086c17bfc7 added a 482 o 4:a0086c17bfc7 added a
517 $ hg next --evolve 517 $ hg next --evolve
518 move:[3] added c 518 move:[3] added c
519 atop:[5] added b 519 atop:[5] added b
520 merging c 520 merging c
521 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 521 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
522 abort: fix conflicts and see `hg help evolve.interrupted` 522 fix conflicts and see `hg help evolve.interrupted`
523 [255] 523 [1]
524 524
525 $ hg evolve --abort 525 $ hg evolve --abort
526 evolve aborted 526 evolve aborted
527 working directory is now at c1f4718020e3 527 working directory is now at c1f4718020e3