tests/test-rebase-abort.t
changeset 35400 4441705b7111
parent 34297 4f969b9e0cf5
child 37854 712d6f535fc9
equal deleted inserted replaced
35399:5feb782c7a95 35400:4441705b7111
   113   [255]
   113   [255]
   114 
   114 
   115 Abort (should clear out unsupported merge state):
   115 Abort (should clear out unsupported merge state):
   116 
   116 
   117   $ hg rebase --abort
   117   $ hg rebase --abort
   118   saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg (glob)
   118   saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg
   119   rebase aborted
   119   rebase aborted
   120   $ hg debugmergestate
   120   $ hg debugmergestate
   121   no merge state found
   121   no merge state found
   122 
   122 
   123   $ hg tglog
   123   $ hg tglog
   375   rebasing 3:3a71550954f1 "b"
   375   rebasing 3:3a71550954f1 "b"
   376   rebasing 4:e80b69427d80 "c"
   376   rebasing 4:e80b69427d80 "c"
   377   abort: ^C
   377   abort: ^C
   378   [255]
   378   [255]
   379   $ hg rebase --abort
   379   $ hg rebase --abort
   380   saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg (glob)
   380   saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
   381   rebase aborted
   381   rebase aborted
   382   $ hg log -G --template "{rev} {desc} {bookmarks}"
   382   $ hg log -G --template "{rev} {desc} {bookmarks}"
   383   o  6 no-a
   383   o  6 no-a
   384   |
   384   |
   385   | o  5 d
   385   | o  5 d