Show More
@@ -1209,8 +1209,8 b' def _aborthistedit(ui, repo, state):' | |||||
1209 | if repo.unfiltered().revs('parents() and (%n or %ln::)', |
|
1209 | if repo.unfiltered().revs('parents() and (%n or %ln::)', | |
1210 | state.parentctxnode, leafs | tmpnodes): |
|
1210 | state.parentctxnode, leafs | tmpnodes): | |
1211 | hg.clean(repo, state.topmost, show_stats=True, quietempty=True) |
|
1211 | hg.clean(repo, state.topmost, show_stats=True, quietempty=True) | |
1212 | cleanupnode(ui, repo, 'created', tmpnodes) |
|
1212 | safecleanupnode(ui, repo, 'created', tmpnodes) | |
1213 | cleanupnode(ui, repo, 'temp', leafs) |
|
1213 | safecleanupnode(ui, repo, 'temp', leafs) | |
1214 | except Exception: |
|
1214 | except Exception: | |
1215 | if state.inprogress(): |
|
1215 | if state.inprogress(): | |
1216 | ui.warn(_('warning: encountered an exception during histedit ' |
|
1216 | ui.warn(_('warning: encountered an exception during histedit ' |
@@ -503,3 +503,49 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 | Abort | |||
|
508 | ------------------------------------------- | |||
|
509 | ||||
|
510 | $ cp -R base abort | |||
|
511 | $ cd abort | |||
|
512 | $ hg histedit -r 'b449568bf7fc' --commands - << EOF | |||
|
513 | > pick b449568bf7fc 13 f | |||
|
514 | > pick 7395e1ff83bd 15 h | |||
|
515 | > pick 6b70183d2492 14 g | |||
|
516 | > pick b605fb7503f2 16 i | |||
|
517 | > pick 3a6c53ee7f3d 17 j | |||
|
518 | > edit ee118ab9fa44 18 k | |||
|
519 | > EOF | |||
|
520 | Editing (ee118ab9fa44), you may commit or record as needed now. | |||
|
521 | (hg histedit --continue to resume) | |||
|
522 | [1] | |||
|
523 | ||||
|
524 | $ hg histedit --abort | |||
|
525 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
526 | ||||
|
527 | $ hg log -G --hidden -r '::. + .:' | |||
|
528 | x 22:44ca09d59ae4 (secret) j | |||
|
529 | | | |||
|
530 | x 21:31747692a644 (secret) i | |||
|
531 | | | |||
|
532 | x 20:9985cd4f21fa (draft) g | |||
|
533 | | | |||
|
534 | x 19:4dc06258baa6 (draft) h | |||
|
535 | | | |||
|
536 | | @ 18:ee118ab9fa44 (secret) k | |||
|
537 | | | | |||
|
538 | | o 17:3a6c53ee7f3d (secret) j | |||
|
539 | | | | |||
|
540 | | o 16:b605fb7503f2 (secret) i | |||
|
541 | | | | |||
|
542 | | o 15:7395e1ff83bd (draft) h | |||
|
543 | | | | |||
|
544 | | o 14:6b70183d2492 (draft) g | |||
|
545 | |/ | |||
|
546 | o 13:b449568bf7fc (draft) f | |||
|
547 | | | |||
|
548 | o 12:40db8afa467b (public) c | |||
|
549 | | | |||
|
550 | o 0:cb9a9f314b8b (public) a | |||
|
551 |
General Comments 0
You need to be logged in to leave comments.
Login now