equal
deleted
inserted
replaced
146 $ hg update --quiet --clean 2 |
146 $ hg update --quiet --clean 2 |
147 $ echo alpha >> alpha |
147 $ echo alpha >> alpha |
148 $ mv .hg/histedit-state.back .hg/histedit-state |
148 $ mv .hg/histedit-state.back .hg/histedit-state |
149 |
149 |
150 $ hg histedit --continue |
150 $ hg histedit --continue |
151 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-histedit.hg (glob) |
151 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-histedit.hg |
152 $ hg log -G -T '{rev} {shortest(node)} {desc}\n' -r 2:: |
152 $ hg log -G -T '{rev} {shortest(node)} {desc}\n' -r 2:: |
153 @ 4 f5ed five |
153 @ 4 f5ed five |
154 | |
154 | |
155 | o 3 c8e6 four |
155 | o 3 c8e6 four |
156 |/ |
156 |/ |
263 HG: Leave message empty to abort commit. |
263 HG: Leave message empty to abort commit. |
264 HG: -- |
264 HG: -- |
265 HG: user: test |
265 HG: user: test |
266 HG: branch 'default' |
266 HG: branch 'default' |
267 HG: changed alpha |
267 HG: changed alpha |
268 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/c8e68270e35a-63d8b8d8-histedit.hg (glob) |
268 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/c8e68270e35a-63d8b8d8-histedit.hg |
269 |
269 |
270 $ hg update -q 2 |
270 $ hg update -q 2 |
271 $ echo x > x |
271 $ echo x > x |
272 $ hg add x |
272 $ hg add x |
273 $ hg commit -m'x' x |
273 $ hg commit -m'x' x |