Mercurial > hg
diff tests/test-rebase-obsolete.t @ 43930:412f199b4092
rebase: use cmdutil.check_incompatible_arguments() for --auto-orphans
Differential Revision: https://phab.mercurial-scm.org/D7644
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 12 Dec 2019 23:03:52 -0800 |
| parents | 905b21783968 |
| children | 9c9cfecd4600 |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Thu Dec 12 22:43:15 2019 -0800 +++ b/tests/test-rebase-obsolete.t Thu Dec 12 23:03:52 2019 -0800 @@ -487,7 +487,7 @@ $ cp -R hidden stabilize $ cd stabilize $ hg rebase --auto-orphans '0::' -d 10 - abort: --auto-orphans is incompatible with --dest + abort: cannot specify both --auto-orphans and --dest [255] $ hg rebase --auto-orphans '0::' rebasing 9:cf44d2f5a9f4 "D"