167 o 1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b" |
167 o 1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b" |
168 | |
168 | |
169 o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a" |
169 o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a" |
170 |
170 |
171 |
171 |
172 abort editing session |
172 abort editing session, after first forcibly updating away |
|
173 $ hg up 0 |
|
174 abort: histedit in progress |
|
175 (use 'hg histedit --continue' or 'hg histedit --abort') |
|
176 [255] |
|
177 $ mv .hg/histedit-state .hg/histedit-state-ignore |
|
178 $ hg up 0 |
|
179 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
180 $ mv .hg/histedit-state-ignore .hg/histedit-state |
|
181 $ hg sum |
|
182 parent: 0:cb9a9f314b8b |
|
183 a |
|
184 branch: default |
|
185 commit: 1 modified, 1 unknown (new branch head) |
|
186 update: 6 new changesets (update) |
|
187 hist: 2 remaining (histedit --continue) |
|
188 |
173 $ hg histedit --abort 2>&1 | fixbundle |
189 $ hg histedit --abort 2>&1 | fixbundle |
174 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
190 [1] |
|
191 |
|
192 modified files should survive the abort when we've moved away already |
|
193 $ hg st |
|
194 M e |
|
195 ? edit.sh |
175 |
196 |
176 $ graphlog "log after abort" |
197 $ graphlog "log after abort" |
177 % log after abort |
198 % log after abort |
178 @ 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" |
199 o 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" |
179 | |
200 | |
180 o 4 e860deea161a2f77de56603b340ebbb4536308ae "e" |
201 o 4 e860deea161a2f77de56603b340ebbb4536308ae "e" |
181 | |
202 | |
182 o 3 055a42cdd88768532f9cf79daa407fc8d138de9b "d" |
203 o 3 055a42cdd88768532f9cf79daa407fc8d138de9b "d" |
183 | |
204 | |
184 o 2 177f92b773850b59254aa5e923436f921b55483b "c" |
205 o 2 177f92b773850b59254aa5e923436f921b55483b "c" |
185 | |
206 | |
186 o 1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b" |
207 o 1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b" |
187 | |
208 | |
188 o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a" |
209 @ 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a" |
189 |
210 |
190 |
211 |
191 $ cd .. |
212 $ cd .. |