Mercurial > hg

comparison tests/test-graft.t @ 43893:2e672ccc2220

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: use cmdutil.check_at_most_one_arg() Differential Revision: https://phab.mercurial-scm.org/D7634
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 12 Dec 2019 14:54:38 -0800
parents 5171937ad0f9
children 58db8f63f4e2
comparison
equal deleted inserted replaced
43892:d587937600be 43893:2e672ccc2220
125 125
126 Conflicting date/user options: 126 Conflicting date/user options:
127 127
128 $ hg up -q 0 128 $ hg up -q 0
129 $ hg graft -U --user foo 2 129 $ hg graft -U --user foo 2
130 abort: --user and --currentuser are mutually exclusive 130 abort: cannot specify both --user and --currentuser
131 [255] 131 [255]
132 $ hg graft -D --date '0 0' 2 132 $ hg graft -D --date '0 0' 2
133 abort: --date and --currentdate are mutually exclusive 133 abort: cannot specify both --date and --currentdate
134 [255] 134 [255]
135 135
136 Can't graft with dirty wd: 136 Can't graft with dirty wd:
137 137
138 $ hg up -q 0 138 $ hg up -q 0