Show More
@@ -580,14 +580,15 b' def bootstrapcontinue(ui, repo, parentct' | |||
|
580 | 580 | # note: does not take non linear new change in account (but previous |
|
581 | 581 | # implementation didn't used them anyway (issue3655) |
|
582 | 582 | newchildren = [c.node() for c in repo.set('(%d::.)', parentctx)] |
|
583 | if not newchildren: | |
|
584 | # `parentctxnode` should match but no result. This means that | |
|
585 | # currentnode is not a descendant from parentctxnode. | |
|
586 | msg = _('%s is not an ancestor of working directory') | |
|
587 | hint = _('update to %s or descendant and run "hg histedit ' | |
|
588 | '--continue" again') % parentctx | |
|
589 | raise util.Abort(msg % parentctx, hint=hint) | |
|
590 | newchildren.pop(0) # remove parentctxnode | |
|
583 | if parentctx.node() != node.nullid: | |
|
584 | if not newchildren: | |
|
585 | # `parentctxnode` should match but no result. This means that | |
|
586 | # currentnode is not a descendant from parentctxnode. | |
|
587 | msg = _('%s is not an ancestor of working directory') | |
|
588 | hint = _('update to %s or descendant and run "hg histedit ' | |
|
589 | '--continue" again') % parentctx | |
|
590 | raise util.Abort(msg % parentctx, hint=hint) | |
|
591 | newchildren.pop(0) # remove parentctxnode | |
|
591 | 592 | # Commit dirty working directory if necessary |
|
592 | 593 | new = None |
|
593 | 594 | m, a, r, d = repo.status()[:4] |
@@ -209,3 +209,16 b' rollback should not work after a histedi' | |||
|
209 | 209 | [1] |
|
210 | 210 | |
|
211 | 211 | $ cd .. |
|
212 | $ hg clone -qr0 r r0 | |
|
213 | $ cd r0 | |
|
214 | $ echo edit cb9a9f314b8b a > $EDITED | |
|
215 | $ hg phase -fdr0 | |
|
216 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 0 2>&1 | |
|
217 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
218 | adding a | |
|
219 | abort: Make changes as needed, you may commit or record as needed now. | |
|
220 | When you are finished, run hg histedit --continue to resume. | |
|
221 | [255] | |
|
222 | $ HGEDITOR=true hg histedit --continue | |
|
223 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
224 | saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-backup.hg (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now