Show More
@@ -580,6 +580,7 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 parentctx.node() != node.nullid: | |
|
583 | 584 | if not newchildren: |
|
584 | 585 | # `parentctxnode` should match but no result. This means that |
|
585 | 586 | # currentnode is not a descendant from parentctxnode. |
@@ -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