comparison tests/test-rebase-obsolete.t @ 39098:a42506059522

rebase: consolidate check for --abort/--stop/--continue conflicts

39097:c1a1fb389b4d

  $ hg rebase -s 3 -d 5
  abort: rebase in progress
  (use 'hg rebase --continue' or 'hg rebase --abort')
  [255]
  $ hg rebase --stop --continue
  abort: cannot use --stop with --abort or --continue
  [255]

Test --stop moves bookmarks of original revisions to new rebased nodes:
======================================================================
  $ cd ..

39098:a42506059522

  $ hg rebase -s 3 -d 5
  abort: rebase in progress
  (use 'hg rebase --continue' or 'hg rebase --abort')
  [255]
  $ hg rebase --stop --continue
  abort: cannot use --stop with --continue
  [255]

Test --stop moves bookmarks of original revisions to new rebased nodes:
======================================================================
  $ cd ..