branch | stable |
changeset 19963 | 6f29cc567845 |
parent 19961 | 1d7a36ff2615 |
child 19973 | 1184edaead7a |
--- a/tests/test-shelve.t Wed Oct 30 16:03:42 2013 -0500 +++ b/tests/test-shelve.t Tue Oct 29 01:03:43 2013 +0900 @@ -303,6 +303,11 @@ $ hg revert -r . a/a $ hg resolve -m a/a + $ hg commit -m 'commit while unshelve in progress' + abort: unshelve already in progress + (use 'hg unshelve --continue' or 'hg unshelve --abort') + [255] + $ hg unshelve -c unshelve of 'default' complete