fix typo in convert help text, update test

This commit is contained in:
Benoit Boissinot 2007-11-05 20:15:33 +01:00
parent 8561d688a1
commit 37290329f4
2 changed files with 10 additions and 8 deletions

View File

@ -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

View File

@ -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: