Mercurial > hg

comparison tests/test-rebase-parameters.t @ 43931:8c87cc169946

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: use cmdutil.check_at_most_one_arg() for action+revision Differential Revision: https://phab.mercurial-scm.org/D7645
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 12 Dec 2019 23:20:48 -0800
parents 08b8bf4a8516
children 6e4ff6a766c2
comparison
equal deleted inserted replaced
43930:412f199b4092 43931:8c87cc169946
67 $ hg rebase --continue --collapse 67 $ hg rebase --continue --collapse
68 abort: cannot use collapse with continue or abort 68 abort: cannot use collapse with continue or abort
69 [255] 69 [255]
70 70
71 $ hg rebase --continue --dest 4 71 $ hg rebase --continue --dest 4
72 abort: abort and continue do not allow specifying revisions 72 abort: cannot specify both --continue and --dest
73 [255] 73 [255]
74 74
75 $ hg rebase --base 5 --source 4 75 $ hg rebase --base 5 --source 4
76 abort: cannot specify both --source and --base 76 abort: cannot specify both --source and --base
77 [255] 77 [255]