Show More
| @@ -503,3 +503,74 b' Note that there is a few reordering in t' | |||||
| 503 | abort: cannot edit history that contains merges |
|
503 | abort: cannot edit history that contains merges | |
| 504 | [255] |
|
504 | [255] | |
| 505 | $ cd .. |
|
505 | $ cd .. | |
|
|
506 | ||||
|
|
507 | Check abort behavior | |||
|
|
508 | ------------------------------------------- | |||
|
|
509 | ||||
|
|
510 | We checks that abort properly clean the repository so the same histedit can be | |||
|
|
511 | attempted later. | |||
|
|
512 | ||||
|
|
513 | $ cp -R base abort | |||
|
|
514 | $ cd abort | |||
|
|
515 | $ hg histedit -r 'b449568bf7fc' --commands - << EOF | |||
|
|
516 | > pick b449568bf7fc 13 f | |||
|
|
517 | > pick 7395e1ff83bd 15 h | |||
|
|
518 | > pick 6b70183d2492 14 g | |||
|
|
519 | > pick b605fb7503f2 16 i | |||
|
|
520 | > roll 3a6c53ee7f3d 17 j | |||
|
|
521 | > edit ee118ab9fa44 18 k | |||
|
|
522 | > EOF | |||
|
|
523 | Editing (ee118ab9fa44), you may commit or record as needed now. | |||
|
|
524 | (hg histedit --continue to resume) | |||
|
|
525 | [1] | |||
|
|
526 | ||||
|
|
527 | $ hg histedit --abort | |||
|
|
528 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
|
529 | saved backup bundle to $TESTTMP/abort/.hg/strip-backup/4dc06258baa6-dff4ef05-backup.hg (glob) | |||
|
|
530 | ||||
|
|
531 | $ hg log -G | |||
|
|
532 | @ 18:ee118ab9fa44 (secret) k | |||
|
|
533 | | | |||
|
|
534 | o 17:3a6c53ee7f3d (secret) j | |||
|
|
535 | | | |||
|
|
536 | o 16:b605fb7503f2 (secret) i | |||
|
|
537 | | | |||
|
|
538 | o 15:7395e1ff83bd (draft) h | |||
|
|
539 | | | |||
|
|
540 | o 14:6b70183d2492 (draft) g | |||
|
|
541 | | | |||
|
|
542 | o 13:b449568bf7fc (draft) f | |||
|
|
543 | | | |||
|
|
544 | o 12:40db8afa467b (public) c | |||
|
|
545 | | | |||
|
|
546 | o 0:cb9a9f314b8b (public) a | |||
|
|
547 | ||||
|
|
548 | $ hg histedit -r 'b449568bf7fc' --commands - << EOF | |||
|
|
549 | > pick b449568bf7fc 13 f | |||
|
|
550 | > pick 7395e1ff83bd 15 h | |||
|
|
551 | > pick 6b70183d2492 14 g | |||
|
|
552 | > pick b605fb7503f2 16 i | |||
|
|
553 | > pick 3a6c53ee7f3d 17 j | |||
|
|
554 | > edit ee118ab9fa44 18 k | |||
|
|
555 | > EOF | |||
|
|
556 | Editing (ee118ab9fa44), you may commit or record as needed now. | |||
|
|
557 | (hg histedit --continue to resume) | |||
|
|
558 | [1] | |||
|
|
559 | $ hg histedit --continue | |||
|
|
560 | $ hg log -G | |||
|
|
561 | @ 23:175d6b286a22 (secret) k | |||
|
|
562 | | | |||
|
|
563 | o 22:44ca09d59ae4 (secret) j | |||
|
|
564 | | | |||
|
|
565 | o 21:31747692a644 (secret) i | |||
|
|
566 | | | |||
|
|
567 | o 20:9985cd4f21fa (draft) g | |||
|
|
568 | | | |||
|
|
569 | o 19:4dc06258baa6 (draft) h | |||
|
|
570 | | | |||
|
|
571 | o 13:b449568bf7fc (draft) f | |||
|
|
572 | | | |||
|
|
573 | o 12:40db8afa467b (public) c | |||
|
|
574 | | | |||
|
|
575 | o 0:cb9a9f314b8b (public) a | |||
|
|
576 | ||||
General Comments 0
You need to be logged in to leave comments.
Login now