Show More
@@ -1347,6 +1347,8 b' def bundle(ui, repo, fname, dest=None, *' | |||||
1347 | if dest: |
|
1347 | if dest: | |
1348 | raise error.Abort(_("--all is incompatible with specifying " |
|
1348 | raise error.Abort(_("--all is incompatible with specifying " | |
1349 | "a destination")) |
|
1349 | "a destination")) | |
|
1350 | if opts.get('base'): | |||
|
1351 | ui.warn(_("ignoring --base because --all was specified\n")) | |||
1350 | base = ['null'] |
|
1352 | base = ['null'] | |
1351 | else: |
|
1353 | else: | |
1352 | base = scmutil.revrange(repo, opts.get('base')) |
|
1354 | base = scmutil.revrange(repo, opts.get('base')) |
@@ -174,6 +174,9 b' should fail' | |||||
174 | 4 changesets found |
|
174 | 4 changesets found | |
175 | $ hg -R test bundle --base 2 test-bundle-all.hg |
|
175 | $ hg -R test bundle --base 2 test-bundle-all.hg | |
176 | 6 changesets found |
|
176 | 6 changesets found | |
|
177 | $ hg -R test bundle --base 2 --all test-bundle-all-2.hg | |||
|
178 | ignoring --base because --all was specified | |||
|
179 | 9 changesets found | |||
177 | $ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg |
|
180 | $ hg -R test bundle --base 3 -r tip test-bundle-should-fail.hg | |
178 | 1 changesets found |
|
181 | 1 changesets found | |
179 |
|
182 |
General Comments 0
You need to be logged in to leave comments.
Login now