Mercurial > hg
changeset 8669:6f0f69da003e
commands: typo in bundle abort message
This error trigger if one calls bundle with the wrong parameters and
it is thus not an error scripts will want to look for (they could and
should ensure that they call bundle with the correct parameters).
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 31 May 2009 18:09:19 +0200 |
| parents | aea3a23151bd |
| children | 472ecf2c55d9 |
| files | mercurial/commands.py tests/test-bundle-r.out |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sun May 31 14:55:51 2009 +0200 +++ b/mercurial/commands.py Sun May 31 18:09:19 2009 +0200 @@ -497,7 +497,7 @@ base = opts.get('base') if base: if dest: - raise util.Abort(_("--base is incompatible with specifiying " + raise util.Abort(_("--base is incompatible with specifying " "a destination")) base = [repo.lookup(rev) for rev in base] # create the right base
--- a/tests/test-bundle-r.out Sun May 31 14:55:51 2009 +0200 +++ b/tests/test-bundle-r.out Sun May 31 18:09:19 2009 +0200 @@ -156,7 +156,7 @@ 4 files, 9 changesets, 7 total revisions rolling back last transaction % should fail -abort: --base is incompatible with specifiying a destination +abort: --base is incompatible with specifying a destination abort: repository default-push not found! 2 changesets found 4 changesets found