Show More
@@ -1025,6 +1025,7 b' def rebase(ui, repo, **opts):' | |||
|
1025 | 1025 | opts, action, b'confirm', b'dry_run' |
|
1026 | 1026 | ) |
|
1027 | 1027 | cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') |
|
1028 | cmdutil.check_at_most_one_arg(opts, b'rev', b'source', b'base') | |
|
1028 | 1029 | |
|
1029 | 1030 | if action or repo.currenttransaction() is not None: |
|
1030 | 1031 | # in-memory rebase is not compatible with resuming rebases. |
@@ -1259,12 +1260,6 b' def _definedestmap(' | |||
|
1259 | 1260 | |
|
1260 | 1261 | # destspace is here to work around issues with `hg pull --rebase` see |
|
1261 | 1262 | # issue5214 for details |
|
1262 | if srcf and basef: | |
|
1263 | raise error.Abort(_(b'cannot specify both a source and a base')) | |
|
1264 | if revf and basef: | |
|
1265 | raise error.Abort(_(b'cannot specify both a revision and a base')) | |
|
1266 | if revf and srcf: | |
|
1267 | raise error.Abort(_(b'cannot specify both a revision and a source')) | |
|
1268 | 1263 | |
|
1269 | 1264 | cmdutil.checkunfinished(repo) |
|
1270 | 1265 | if not inmemory: |
@@ -73,14 +73,14 b' These fail:' | |||
|
73 | 73 | [255] |
|
74 | 74 | |
|
75 | 75 | $ hg rebase --base 5 --source 4 |
|
76 |
abort: cannot specify both |
|
|
76 | abort: cannot specify both --source and --base | |
|
77 | 77 | [255] |
|
78 | 78 | |
|
79 | 79 | $ hg rebase --rev 5 --source 4 |
|
80 |
abort: cannot specify both |
|
|
80 | abort: cannot specify both --rev and --source | |
|
81 | 81 | [255] |
|
82 | 82 | $ hg rebase --base 5 --rev 4 |
|
83 |
abort: cannot specify both |
|
|
83 | abort: cannot specify both --rev and --base | |
|
84 | 84 | [255] |
|
85 | 85 | |
|
86 | 86 | $ hg rebase --base 6 |
General Comments 0
You need to be logged in to leave comments.
Login now