# HG changeset patch # User Martin Geisler # Date 2009-05-31 16:09:19 # Node ID 6f0f69da003e7837c9454fb02550a0e3715b8de3 # Parent aea3a23151bde07a7d40a4ca0e4bdcf7bdf6362a 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). diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -497,7 +497,7 @@ def bundle(ui, repo, fname, dest=None, * 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 diff --git a/tests/test-bundle-r.out b/tests/test-bundle-r.out --- a/tests/test-bundle-r.out +++ b/tests/test-bundle-r.out @@ -156,7 +156,7 @@ checking files 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