Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 43929:08b8bf4a8516 | 43930:412f199b4092 |
|---|---|
| 485 | 485 |
| 486 $ cd .. | 486 $ cd .. |
| 487 $ cp -R hidden stabilize | 487 $ cp -R hidden stabilize |
| 488 $ cd stabilize | 488 $ cd stabilize |
| 489 $ hg rebase --auto-orphans '0::' -d 10 | 489 $ hg rebase --auto-orphans '0::' -d 10 |
| 490 abort: --auto-orphans is incompatible with --dest | 490 abort: cannot specify both --auto-orphans and --dest |
| 491 [255] | 491 [255] |
| 492 $ hg rebase --auto-orphans '0::' | 492 $ hg rebase --auto-orphans '0::' |
| 493 rebasing 9:cf44d2f5a9f4 "D" | 493 rebasing 9:cf44d2f5a9f4 "D" |
| 494 $ hg log -G | 494 $ hg log -G |
| 495 o 12:7e3935feaa68 D | 495 o 12:7e3935feaa68 D |