Show More
@@ -1031,8 +1031,6 b' def _histedit(ui, repo, state, *freeargs' | |||||
1031 | cmdutil.checkunfinished(repo) |
|
1031 | cmdutil.checkunfinished(repo) | |
1032 | cmdutil.bailifchanged(repo) |
|
1032 | cmdutil.bailifchanged(repo) | |
1033 |
|
1033 | |||
1034 | if repo.vfs.exists('histedit-last-edit.txt'): |
|
|||
1035 | repo.vfs.unlink('histedit-last-edit.txt') |
|
|||
1036 | topmost, empty = repo.dirstate.parents() |
|
1034 | topmost, empty = repo.dirstate.parents() | |
1037 | if outg: |
|
1035 | if outg: | |
1038 | if freeargs: |
|
1036 | if freeargs: | |
@@ -1146,6 +1144,8 b' def _histedit(ui, repo, state, *freeargs' | |||||
1146 | state.clear() |
|
1144 | state.clear() | |
1147 | if os.path.exists(repo.sjoin('undo')): |
|
1145 | if os.path.exists(repo.sjoin('undo')): | |
1148 | os.unlink(repo.sjoin('undo')) |
|
1146 | os.unlink(repo.sjoin('undo')) | |
|
1147 | if repo.vfs.exists('histedit-last-edit.txt'): | |||
|
1148 | repo.vfs.unlink('histedit-last-edit.txt') | |||
1149 |
|
1149 | |||
1150 | def bootstrapcontinue(ui, state, opts): |
|
1150 | def bootstrapcontinue(ui, state, opts): | |
1151 | repo = state.repo |
|
1151 | repo = state.repo |
@@ -77,6 +77,26 b' edit the history' | |||||
77 |
|
77 | |||
78 | $ EDITED="$TESTTMP/editedhistory" |
|
78 | $ EDITED="$TESTTMP/editedhistory" | |
79 | $ cat > $EDITED <<EOF |
|
79 | $ cat > $EDITED <<EOF | |
|
80 | > edit 177f92b77385 c | |||
|
81 | > pick e860deea161a e | |||
|
82 | > pick 652413bf663e f | |||
|
83 | > pick 055a42cdd887 d | |||
|
84 | > EOF | |||
|
85 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle | |||
|
86 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | |||
|
87 | Make changes as needed, you may commit or record as needed now. | |||
|
88 | When you are finished, run hg histedit --continue to resume. | |||
|
89 | ||||
|
90 | rules should end up in .hg/histedit-last-edit.txt: | |||
|
91 | $ cat .hg/histedit-last-edit.txt | |||
|
92 | edit 177f92b77385 c | |||
|
93 | pick e860deea161a e | |||
|
94 | pick 652413bf663e f | |||
|
95 | pick 055a42cdd887 d | |||
|
96 | ||||
|
97 | $ hg histedit --abort | |||
|
98 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
99 | $ cat > $EDITED <<EOF | |||
80 | > pick 177f92b77385 c |
|
100 | > pick 177f92b77385 c | |
81 | > pick e860deea161a e |
|
101 | > pick e860deea161a e | |
82 | > pick 652413bf663e f |
|
102 | > pick 652413bf663e f | |
@@ -85,13 +105,6 b' edit the history' | |||||
85 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
|
105 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle | |
86 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
106 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
87 |
|
107 | |||
88 | rules should end up in .hg/histedit-last-edit.txt: |
|
|||
89 | $ cat .hg/histedit-last-edit.txt |
|
|||
90 | pick 177f92b77385 c |
|
|||
91 | pick e860deea161a e |
|
|||
92 | pick 652413bf663e f |
|
|||
93 | pick 055a42cdd887 d |
|
|||
94 |
|
||||
95 | log after edit |
|
108 | log after edit | |
96 | $ hg log --graph |
|
109 | $ hg log --graph | |
97 | @ changeset: 5:07114f51870f |
|
110 | @ changeset: 5:07114f51870f |
General Comments 0
You need to be logged in to leave comments.
Login now