379 switching to topic foo |
379 switching to topic foo |
380 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
380 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
381 $ hg prev |
381 $ hg prev |
382 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
382 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
383 [s3] add eee |
383 [s3] add eee |
|
384 |
|
385 Test showing that currently stackaliases does not support --continue case |
|
386 ------------------------------------------------------------------------- |
|
387 $ hg up 18 |
|
388 switching to topic bar |
|
389 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
390 $ hg evolve --all |
|
391 move:[s2] add ggg |
|
392 atop:[s1] add fff |
|
393 move:[s3] add hhh |
|
394 move:[s4] add iii |
|
395 move:[s5] add jjj |
|
396 working directory is now at 38a82cbb794a |
|
397 $ hg up 18 |
|
398 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
399 $ echo "changes in hhh" > hhh |
|
400 $ hg add hhh |
|
401 $ hg ci --amend |
|
402 4 new orphan changesets |
|
403 $ hg log -G |
|
404 @ 26 - {bar} 2c295936ac04 add fff (draft) |
|
405 | |
|
406 | * 25 - {bar} 38a82cbb794a add jjj (draft) |
|
407 | | |
|
408 | * 24 - {bar} 4a44eba0fdb3 add iii (draft) |
|
409 | | |
|
410 | * 23 - {bar} 7acd9ea5d677 add hhh (draft) |
|
411 | | |
|
412 | * 22 - {bar} 735c7bd8f133 add ggg (draft) |
|
413 | | |
|
414 | x 18 - {bar} 793eb6370b2d add fff (draft) |
|
415 |/ |
|
416 o 12 - {foo} 42b49017ff90 add eee (draft) |
|
417 | |
|
418 o 10 - {foo} d9cacd156ffc add ddd (draft) |
|
419 | |
|
420 o 2 - {foo} cced9bac76e3 add ccc (draft) |
|
421 | |
|
422 o 1 - {} a4dbed0837ea add bbb (draft) |
|
423 | |
|
424 o 0 - {} 199cc73e9a0b add aaa (draft) |
|
425 |
|
426 $ hg evolve --all |
|
427 move:[s2] add ggg |
|
428 atop:[s1] add fff |
|
429 move:[s3] add hhh |
|
430 merging hhh |
|
431 warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark') |
|
432 fix conflicts and see `hg help evolve.interrupted` |
|
433 [1] |
|
434 $ echo "resolved hhh" > hhh |
|
435 $ hg resolve --mark hhh |
|
436 (no more unresolved files) |
|
437 continue: hg evolve --continue |
|
438 $ hg evolve --continue |
|
439 evolving 23:7acd9ea5d677 "add hhh" |
|
440 move:[24] add iii |
|
441 atop:[28] add hhh |
|
442 move:[25] add jjj |
|
443 working directory is now at 119e4c126fb2 |