Mercurial > hg
diff tests/test-rebase-obsolete.t @ 39094:2cf0b8b830ba
rebase: raise error for options conflicting with --stop
Make sure --stop feature raise error for conflicting options
--continue, --abort, --confirm, --dry-run. Tests are added to
reflect the same.
Differential Revision: https://phab.mercurial-scm.org/D3969
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sun, 22 Jul 2018 22:04:49 +0530 |
parents | cc37009e95ca |
children | 33f5cffe725f |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Wed Jul 18 00:25:52 2018 +0530 +++ b/tests/test-rebase-obsolete.t Sun Jul 22 22:04:49 2018 +0530 @@ -2003,3 +2003,22 @@ o 0:cb9a9f314b8b test a +Test --stop raise errors with conflicting options: +================================================= + $ hg rebase -s 3 -d 5 + rebasing 3:055a42cdd887 "d" + merging d + warning: conflicts while merging d! (edit, then use 'hg resolve --mark') + unresolved conflicts (see hg resolve, then hg rebase --continue) + [1] + $ hg rebase --stop --dry-run + abort: cannot use --stop with --dry-run or --confirm + [255] + + $ 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]