Mercurial > hg
diff tests/test-graft.t @ 41174:08dd462ea782
graft: abort if --date/user specified with --currentdate/currentuser (BC)
They are conflicting options. Let's explicitly ban such combination.
Note that this means you need "--no-currentdate --date" to override
--currentdate specified in aliases/defaults.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Thu, 10 Jan 2019 21:57:21 +0900 |
parents | 1a6bb5a85e30 |
children | b9e5f3853a97 |
line wrap: on
line diff
--- a/tests/test-graft.t Thu Jan 10 21:32:37 2019 +0900 +++ b/tests/test-graft.t Thu Jan 10 21:57:21 2019 +0900 @@ -112,6 +112,16 @@ skipping ancestor revision 1:5d205f8b35b6 [255] +Conflicting date/user options: + + $ hg up -q 0 + $ hg graft -U --user foo 2 + abort: --user and --currentuser are mutually exclusive + [255] + $ hg graft -D --date '0 0' 2 + abort: --date and --currentdate are mutually exclusive + [255] + Can't graft with dirty wd: $ hg up -q 0