Show More
@@ -704,5 +704,6 def shelvecmd(ui, repo, *pats, **opts): | |||||
704 |
|
704 | |||
705 | def extsetup(ui): |
|
705 | def extsetup(ui): | |
706 | cmdutil.unfinishedstates.append( |
|
706 | cmdutil.unfinishedstates.append( | |
707 |
[shelvedstate._filename, False, |
|
707 | [shelvedstate._filename, False, False, | |
|
708 | _('unshelve already in progress'), | |||
708 | _("use 'hg unshelve --continue' or 'hg unshelve --abort'")]) |
|
709 | _("use 'hg unshelve --continue' or 'hg unshelve --abort'")]) |
@@ -303,6 +303,11 attempt to continue | |||||
303 | $ hg revert -r . a/a |
|
303 | $ hg revert -r . a/a | |
304 | $ hg resolve -m a/a |
|
304 | $ hg resolve -m a/a | |
305 |
|
305 | |||
|
306 | $ hg commit -m 'commit while unshelve in progress' | |||
|
307 | abort: unshelve already in progress | |||
|
308 | (use 'hg unshelve --continue' or 'hg unshelve --abort') | |||
|
309 | [255] | |||
|
310 | ||||
306 | $ hg unshelve -c |
|
311 | $ hg unshelve -c | |
307 | unshelve of 'default' complete |
|
312 | unshelve of 'default' complete | |
308 |
|
313 |
General Comments 0
You need to be logged in to leave comments.
Login now