Show More
@@ -602,7 +602,7 b' class edit(histeditaction):' | |||||
602 | def run(self): |
|
602 | def run(self): | |
603 | repo = self.repo |
|
603 | repo = self.repo | |
604 | rulectx = repo[self.node] |
|
604 | rulectx = repo[self.node] | |
605 | hg.update(repo, self.state.parentctxnode) |
|
605 | hg.update(repo, self.state.parentctxnode, quietempty=True) | |
606 | applychanges(repo.ui, repo, rulectx, {}) |
|
606 | applychanges(repo.ui, repo, rulectx, {}) | |
607 | raise error.InterventionRequired( |
|
607 | raise error.InterventionRequired( | |
608 | _('Make changes as needed, you may commit or record as needed ' |
|
608 | _('Make changes as needed, you may commit or record as needed ' |
@@ -146,7 +146,6 b' check state of working copy' | |||||
146 | When you are finished, run hg histedit --continue to resume. |
|
146 | When you are finished, run hg histedit --continue to resume. | |
147 | $ continueediting true "(leaving commit message unaltered)" |
|
147 | $ continueediting true "(leaving commit message unaltered)" | |
148 | % finalize changeset editing (leaving commit message unaltered) |
|
148 | % finalize changeset editing (leaving commit message unaltered) | |
149 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
150 | Make changes as needed, you may commit or record as needed now. |
|
149 | Make changes as needed, you may commit or record as needed now. | |
151 | When you are finished, run hg histedit --continue to resume. |
|
150 | When you are finished, run hg histedit --continue to resume. | |
152 | $ graphlog "log after first edit" |
|
151 | $ graphlog "log after first edit" | |
@@ -212,7 +211,6 b' aborting and not changing files can skip' | |||||
212 | $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets |
|
211 | $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets | |
213 | % start editing the history (not changing anything) |
|
212 | % start editing the history (not changing anything) | |
214 | | edit 292aec348d9e 6 closebranch |
|
213 | | edit 292aec348d9e 6 closebranch | |
215 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
216 | Make changes as needed, you may commit or record as needed now. |
|
214 | Make changes as needed, you may commit or record as needed now. | |
217 | When you are finished, run hg histedit --continue to resume. |
|
215 | When you are finished, run hg histedit --continue to resume. | |
218 | $ hg histedit --abort |
|
216 | $ hg histedit --abort |
General Comments 0
You need to be logged in to leave comments.
Login now