Mercurial > hg

comparison tests/test-shelve2.t @ 45840:527ce85c2e60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: introduce StateError and use it from commands and cmdutil This very similar to an earlier patch (which was for `InputError`). In this patch, I also updated the transplant extension only because `test-transplant.t` would otherwise have needed a `#if continueflag`. Differential Revision: https://phab.mercurial-scm.org/D9310
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 12 Oct 2020 12:44:18 -0700
parents 21733e8c924f
children 832a6a2efe4f
comparison
equal deleted inserted replaced
45839:ebee234d952a 45840:527ce85c2e60
735 progress 735 progress
736 736
737 #if abortflag 737 #if abortflag
738 $ hg unshelve --abort 738 $ hg unshelve --abort
739 abort: no unshelve in progress 739 abort: no unshelve in progress
740 [255] 740 [20]
741 #else 741 #else
742 $ hg abort 742 $ hg abort
743 aborting the merge, updating back to 9451eaa6eee3 743 aborting the merge, updating back to 9451eaa6eee3
744 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 744 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
745 #endif 745 #endif
910 $ hg log --template '{desc|firstline} {author} {date|isodate} \n' -r . 910 $ hg log --template '{desc|firstline} {author} {date|isodate} \n' -r .
911 pending changes temporary commit shelve@localhost 1970-01-01 00:00 +0000 911 pending changes temporary commit shelve@localhost 1970-01-01 00:00 +0000
912 $ hg merge --abort 912 $ hg merge --abort
913 abort: cannot abort merge with unshelve in progress 913 abort: cannot abort merge with unshelve in progress
914 (use 'hg unshelve --continue' or 'hg unshelve --abort') 914 (use 'hg unshelve --continue' or 'hg unshelve --abort')
915 [255] 915 [20]
916 916
917 $ hg unshelve --abort 917 $ hg unshelve --abort
918 unshelve of 'default' aborted 918 unshelve of 'default' aborted
919 919
920 $ hg log -G --template '{desc|firstline} {author} {date|isodate} \n' -r . 920 $ hg log -G --template '{desc|firstline} {author} {date|isodate} \n' -r .