Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: typo in bundle abort message
authorMartin Geisler <mg@lazybytes.net>
Sun, 31 May 2009 18:09:19 +0200
changeset 8669 6f0f69da003e
parent 8668 aea3a23151bd
child 8670 472ecf2c55d9
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).
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-bundle-r.out file | annotate | diff | comparison | revisions 
--- 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
Mercurial