From 37290329f4276c2bc219fbdae143f35575b1d178 Mon Sep 17 00:00:00 2001
From: Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Date: Mon, 5 Nov 2007 20:15:33 +0100
Subject: [PATCH] fix typo in convert help text, update test

---
 hgext/convert/__init__.py |  2 +-
 tests/test-convert.out    | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py
index 3a58f91fb9..a78451049e 100644
--- a/hgext/convert/__init__.py
+++ b/hgext/convert/__init__.py
@@ -344,7 +344,7 @@ def convert(ui, src, dest=None, revmapfile=None, **opts):
     
     The 'include' directive causes a file, or all files under a
     directory, to be included in the destination repository, and the
-    exclussion of all other files and dirs not explicitely included.
+    exclusion of all other files and dirs not explicitely included.
     The 'exclude' directive causes files or directories to be omitted.
     The 'rename' directive renames a file or directory.  To rename from a
     subdirectory into the root of the repository, use '.' as the path to
diff --git a/tests/test-convert.out b/tests/test-convert.out
index e9eb4c2759..af870b251e 100644
--- a/tests/test-convert.out
+++ b/tests/test-convert.out
@@ -3,6 +3,7 @@ hg convert [OPTION]... SOURCE [DEST [MAPFILE]]
 Convert a foreign SCM repository to a Mercurial one.
 
     Accepted source formats:
+    - Mercurial
     - CVS
     - Darcs
     - git
@@ -19,8 +20,8 @@ Convert a foreign SCM repository to a Mercurial one.
     basename of the source with '-hg' appended.  If the destination
     repository doesn't exist, it will be created.
 
-    If <revmapfile> isn't given, it will be put in a default location
-    (<dest>/.hg/shamap by default).  The <revmapfile> is a simple text
+    If <MAPFILE> isn't given, it will be put in a default location
+    (<dest>/.hg/shamap by default).  The <MAPFILE> is a simple text
     file that maps each source commit ID to the destination ID for
     that revision, like so:
     <source ID> <destination ID>
@@ -46,11 +47,12 @@ Convert a foreign SCM repository to a Mercurial one.
       rename from/file to/file
     
     The 'include' directive causes a file, or all files under a
-    directory, to be included in the destination repository.  The
-    'exclude' directive causes files or directories to be omitted.
-    The 'rename' directive renames a file or directory.  To rename
-    from a subdirectory into the root of the repository, use '.' as
-    the path to rename to.
+    directory, to be included in the destination repository, and the
+    exclusion of all other files and dirs not explicitely included.
+    The 'exclude' directive causes files or directories to be omitted.
+    The 'rename' directive renames a file or directory.  To rename from a
+    subdirectory into the root of the repository, use '.' as the path to
+    rename to.
 
 options: