##// END OF EJS Templates
fix typo in convert help text, update test
Benoit Boissinot -
r5488:247af577 default
parent child Browse files
Show More
@@ -344,7 +344,7 b' def convert(ui, src, dest=None, revmapfi'
344
344
345 The 'include' directive causes a file, or all files under a
345 The 'include' directive causes a file, or all files under a
346 directory, to be included in the destination repository, and the
346 directory, to be included in the destination repository, and the
347 exclussion of all other files and dirs not explicitely included.
347 exclusion of all other files and dirs not explicitely included.
348 The 'exclude' directive causes files or directories to be omitted.
348 The 'exclude' directive causes files or directories to be omitted.
349 The 'rename' directive renames a file or directory. To rename from a
349 The 'rename' directive renames a file or directory. To rename from a
350 subdirectory into the root of the repository, use '.' as the path to
350 subdirectory into the root of the repository, use '.' as the path to
@@ -3,6 +3,7 b' hg convert [OPTION]... SOURCE [DEST [MAP'
3 Convert a foreign SCM repository to a Mercurial one.
3 Convert a foreign SCM repository to a Mercurial one.
4
4
5 Accepted source formats:
5 Accepted source formats:
6 - Mercurial
6 - CVS
7 - CVS
7 - Darcs
8 - Darcs
8 - git
9 - git
@@ -19,8 +20,8 b' Convert a foreign SCM repository to a Me'
19 basename of the source with '-hg' appended. If the destination
20 basename of the source with '-hg' appended. If the destination
20 repository doesn't exist, it will be created.
21 repository doesn't exist, it will be created.
21
22
22 If <revmapfile> isn't given, it will be put in a default location
23 If <MAPFILE> isn't given, it will be put in a default location
23 (<dest>/.hg/shamap by default). The <revmapfile> is a simple text
24 (<dest>/.hg/shamap by default). The <MAPFILE> is a simple text
24 file that maps each source commit ID to the destination ID for
25 file that maps each source commit ID to the destination ID for
25 that revision, like so:
26 that revision, like so:
26 <source ID> <destination ID>
27 <source ID> <destination ID>
@@ -46,11 +47,12 b' Convert a foreign SCM repository to a Me'
46 rename from/file to/file
47 rename from/file to/file
47
48
48 The 'include' directive causes a file, or all files under a
49 The 'include' directive causes a file, or all files under a
49 directory, to be included in the destination repository. The
50 directory, to be included in the destination repository, and the
50 'exclude' directive causes files or directories to be omitted.
51 exclusion of all other files and dirs not explicitely included.
51 The 'rename' directive renames a file or directory. To rename
52 The 'exclude' directive causes files or directories to be omitted.
52 from a subdirectory into the root of the repository, use '.' as
53 The 'rename' directive renames a file or directory. To rename from a
53 the path to rename to.
54 subdirectory into the root of the repository, use '.' as the path to
55 rename to.
54
56
55 options:
57 options:
56
58
General Comments 0
You need to be logged in to leave comments. Login now