Show More
@@ -2393,6 +2393,10 b' def _dograft(ui, repo, *revs, **opts):' | |||||
2393 | # list of new nodes created by ongoing graft |
|
2393 | # list of new nodes created by ongoing graft | |
2394 | statedata['newnodes'] = [] |
|
2394 | statedata['newnodes'] = [] | |
2395 |
|
2395 | |||
|
2396 | if opts.get('user') and opts.get('currentuser'): | |||
|
2397 | raise error.Abort(_('--user and --currentuser are mutually exclusive')) | |||
|
2398 | if opts.get('date') and opts.get('currentdate'): | |||
|
2399 | raise error.Abort(_('--date and --currentdate are mutually exclusive')) | |||
2396 | if not opts.get('user') and opts.get('currentuser'): |
|
2400 | if not opts.get('user') and opts.get('currentuser'): | |
2397 | opts['user'] = ui.username() |
|
2401 | opts['user'] = ui.username() | |
2398 | if not opts.get('date') and opts.get('currentdate'): |
|
2402 | if not opts.get('date') and opts.get('currentdate'): |
@@ -112,6 +112,16 b' Specify revisions with -r:' | |||||
112 | skipping ancestor revision 1:5d205f8b35b6 |
|
112 | skipping ancestor revision 1:5d205f8b35b6 | |
113 | [255] |
|
113 | [255] | |
114 |
|
114 | |||
|
115 | Conflicting date/user options: | |||
|
116 | ||||
|
117 | $ hg up -q 0 | |||
|
118 | $ hg graft -U --user foo 2 | |||
|
119 | abort: --user and --currentuser are mutually exclusive | |||
|
120 | [255] | |||
|
121 | $ hg graft -D --date '0 0' 2 | |||
|
122 | abort: --date and --currentdate are mutually exclusive | |||
|
123 | [255] | |||
|
124 | ||||
115 | Can't graft with dirty wd: |
|
125 | Can't graft with dirty wd: | |
116 |
|
126 | |||
117 | $ hg up -q 0 |
|
127 | $ hg up -q 0 |
General Comments 0
You need to be logged in to leave comments.
Login now