Show More
@@ -880,12 +880,10 b' def dounshelve(ui, repo, *shelved, **opt' | |||||
880 | 'operation') |
|
880 | 'operation') | |
881 | raise error.Abort(msg, hint=hint) |
|
881 | raise error.Abort(msg, hint=hint) | |
882 | elif abortf: |
|
882 | elif abortf: | |
883 | msg = _('could not read shelved state file, your working copy ' |
|
|||
884 | 'may be in an unexpected state\nplease update to some ' |
|
|||
885 | 'commit\n') |
|
|||
886 | ui.warn(msg) |
|
|||
887 | shelvedstate.clear(repo) |
|
883 | shelvedstate.clear(repo) | |
888 | return |
|
884 | raise error.Abort(_('could not read shelved state file, your ' | |
|
885 | 'working copy may be in an unexpected state\n' | |||
|
886 | 'please update to some commit\n')) | |||
889 |
|
887 | |||
890 | if abortf: |
|
888 | if abortf: | |
891 | return unshelveabort(ui, repo, state, opts) |
|
889 | return unshelveabort(ui, repo, state, opts) |
@@ -696,8 +696,10 b' Unshelve --continue fails with appropria' | |||||
696 |
|
696 | |||
697 | Unshelve --abort works with a corrupted shelvedstate |
|
697 | Unshelve --abort works with a corrupted shelvedstate | |
698 | $ hg unshelve --abort |
|
698 | $ hg unshelve --abort | |
699 | could not read shelved state file, your working copy may be in an unexpected state |
|
699 | abort: could not read shelved state file, your working copy may be in an unexpected state | |
700 | please update to some commit |
|
700 | please update to some commit | |
|
701 | ||||
|
702 | [255] | |||
701 |
|
703 | |||
702 | Unshelve --abort fails with appropriate message if there's no unshelve in |
|
704 | Unshelve --abort fails with appropriate message if there's no unshelve in | |
703 | progress |
|
705 | progress |
General Comments 0
You need to be logged in to leave comments.
Login now