equal
deleted
inserted
replaced
126 $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF |
126 $ HGEDITOR=cat hg histedit -r 4 --commands - << EOF |
127 > edit 08d98a8350f3 4 five |
127 > edit 08d98a8350f3 4 five |
128 > EOF |
128 > EOF |
129 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
129 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
130 reverting alpha |
130 reverting alpha |
131 Make changes as needed, you may commit or record as needed now. |
131 Editing (08d98a8350f3), you may commit or record as needed now. |
132 When you are finished, run hg histedit --continue to resume. |
132 (hg histedit --continue to resume) |
133 [1] |
133 [1] |
134 |
134 |
135 $ mv .hg/histedit-state .hg/histedit-state.back |
135 $ mv .hg/histedit-state .hg/histedit-state.back |
136 $ hg update --quiet --clean 2 |
136 $ hg update --quiet --clean 2 |
137 $ echo alpha >> alpha |
137 $ echo alpha >> alpha |
306 $ hg strip -q -r . --config extensions.strip= |
306 $ hg strip -q -r . --config extensions.strip= |
307 $ hg histedit '.^' -q --keep --commands - << EOF |
307 $ hg histedit '.^' -q --keep --commands - << EOF |
308 > edit eb57da33312f 2 three |
308 > edit eb57da33312f 2 three |
309 > pick f3cfcca30c44 4 x |
309 > pick f3cfcca30c44 4 x |
310 > EOF |
310 > EOF |
311 Make changes as needed, you may commit or record as needed now. |
311 Editing (eb57da33312f), you may commit or record as needed now. |
312 When you are finished, run hg histedit --continue to resume. |
312 (hg histedit --continue to resume) |
313 [1] |
313 [1] |
314 $ echo edit >> alpha |
314 $ echo edit >> alpha |
315 $ hg histedit -q --continue |
315 $ hg histedit -q --continue |
316 $ hg log -G -T '{rev}:{node|short} {desc}' |
316 $ hg log -G -T '{rev}:{node|short} {desc}' |
317 @ 6:8fda0c726bf2 x |
317 @ 6:8fda0c726bf2 x |
333 Test that abort fails gracefully on exception |
333 Test that abort fails gracefully on exception |
334 ---------------------------------------------- |
334 ---------------------------------------------- |
335 $ hg histedit . -q --commands - << EOF |
335 $ hg histedit . -q --commands - << EOF |
336 > edit 8fda0c726bf2 6 x |
336 > edit 8fda0c726bf2 6 x |
337 > EOF |
337 > EOF |
338 Make changes as needed, you may commit or record as needed now. |
338 Editing (8fda0c726bf2), you may commit or record as needed now. |
339 When you are finished, run hg histedit --continue to resume. |
339 (hg histedit --continue to resume) |
340 [1] |
340 [1] |
341 Corrupt histedit state file |
341 Corrupt histedit state file |
342 $ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit |
342 $ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit |
343 $ mv ../corrupt-histedit .hg/histedit-state |
343 $ mv ../corrupt-histedit .hg/histedit-state |
344 $ hg histedit --abort |
344 $ hg histedit --abort |