Show More
@@ -1289,8 +1289,16 b' Try again but with a corrupted shelve st' | |||||
1289 | [1] |
|
1289 | [1] | |
1290 | $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate |
|
1290 | $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate | |
1291 | $ mv ../corrupt-shelvedstate .hg/histedit-state |
|
1291 | $ mv ../corrupt-shelvedstate .hg/histedit-state | |
1292 |
$ hg unshelve --abort 2>&1 | grep ' |
|
1292 | $ hg unshelve --abort 2>&1 | grep 'aborted' | |
1293 | rebase aborted |
|
1293 | rebase aborted | |
|
1294 | unshelve of 'default-01' aborted | |||
|
1295 | $ hg summary | |||
|
1296 | parent: 0:ae8c668541e8 tip | |||
|
1297 | root | |||
|
1298 | branch: default | |||
|
1299 | commit: 1 modified, 1 unknown | |||
|
1300 | update: (current) | |||
|
1301 | phases: 1 draft | |||
1294 | $ hg up -C . |
|
1302 | $ hg up -C . | |
1295 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1303 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1296 |
|
1304 |
General Comments 0
You need to be logged in to leave comments.
Login now