changeset 41174 | 08dd462ea782 |
parent 40676 | 1a6bb5a85e30 |
child 42055 | b9e5f3853a97 |
--- 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