Show More
@@ -497,7 +497,7 b' def bundle(ui, repo, fname, dest=None, *' | |||||
497 | base = opts.get('base') |
|
497 | base = opts.get('base') | |
498 | if base: |
|
498 | if base: | |
499 | if dest: |
|
499 | if dest: | |
500 |
raise util.Abort(_("--base is incompatible with specif |
|
500 | raise util.Abort(_("--base is incompatible with specifying " | |
501 | "a destination")) |
|
501 | "a destination")) | |
502 | base = [repo.lookup(rev) for rev in base] |
|
502 | base = [repo.lookup(rev) for rev in base] | |
503 | # create the right base |
|
503 | # create the right base |
@@ -156,7 +156,7 b' checking files' | |||||
156 | 4 files, 9 changesets, 7 total revisions |
|
156 | 4 files, 9 changesets, 7 total revisions | |
157 | rolling back last transaction |
|
157 | rolling back last transaction | |
158 | % should fail |
|
158 | % should fail | |
159 |
abort: --base is incompatible with specif |
|
159 | abort: --base is incompatible with specifying a destination | |
160 | abort: repository default-push not found! |
|
160 | abort: repository default-push not found! | |
161 | 2 changesets found |
|
161 | 2 changesets found | |
162 | 4 changesets found |
|
162 | 4 changesets found |
General Comments 0
You need to be logged in to leave comments.
Login now