Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-abort.t
changeset 45840 527ce85c2e60
parent 45826 21733e8c924f
child 46811 5a0b930cfb3e
equal deleted inserted replaced
45839:ebee234d952a 45840:527ce85c2e60 
   326 
   326 
   327   $ echo new > a
 
   327   $ echo new > a
 
   328   $ hg up 1               # user gets an error saying to run hg rebase --abort
 
   328   $ hg up 1               # user gets an error saying to run hg rebase --abort
 
   329   abort: rebase in progress
 
   329   abort: rebase in progress
 
   330   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
 
   330   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
 
   331   [255]
 
   331   [20]
 
   332 
   332 
   333   $ cat a
 
   333   $ cat a
 
   334   new
 
   334   new
 
   335   $ hg abort
 
   335   $ hg abort
 
   336   rebase aborted
 
   336   rebase aborted
 
   396   .hg/updatestate
 
   396   .hg/updatestate
 
   397 
   397 
   398   $ hg rebase -s 3 -d tip
 
   398   $ hg rebase -s 3 -d tip
 
   399   abort: rebase in progress
 
   399   abort: rebase in progress
 
   400   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
 
   400   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
 
   401   [255]
 
   401   [20]
 
   402   $ hg up .
 
   402   $ hg up .
 
   403   abort: rebase in progress
 
   403   abort: rebase in progress
 
   404   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
 
   404   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
 
   405   [255]
 
   405   [20]
 
   406   $ hg up -C .
 
   406   $ hg up -C .
 
   407   abort: rebase in progress
 
   407   abort: rebase in progress
 
   408   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
 
   408   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
 
   409   [255]
 
   409   [20]
 
   410 
   410 
   411   $ hg graft 3
 
   411   $ hg graft 3
 
   412   abort: rebase in progress
 
   412   abort: rebase in progress
 
   413   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
 
   413   (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop')
 
   414   [255]
 
   414   [20]
 
   415 
   415 
   416   $ hg abort
 
   416   $ hg abort
 
   417   saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
 
   417   saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/3d8812cf300d-93041a90-backup.hg
 
   418   rebase aborted
 
   418   rebase aborted
 
   419   $ hg log -G --template "{rev} {desc} {bookmarks}"
 
   419   $ hg log -G --template "{rev} {desc} {bookmarks}"
mercurial