Mercurial > hg

comparison tests/test-convert.out @ 12184:025ca07351ea stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: show example splice, author, and branch map entries in help Also document that - empty lines are skipped and comment are supported in author map - whitespace is not allowed in branch map entries since we split on it when parsing the file
author Martin Geisler <mg@lazybytes.net>
date Fri, 10 Sep 2010 00:22:46 +0200
parents dec57aa0f8ca
children 6a94459b7afa
comparison
equal deleted inserted replaced
12170:581066a319e5 12184:025ca07351ea
52 repeatedly to copy new commits. 52 repeatedly to copy new commits.
53 53
54 The [username mapping] file is a simple text file that maps each source 54 The [username mapping] file is a simple text file that maps each source
55 commit author to a destination commit author. It is handy for source SCMs 55 commit author to a destination commit author. It is handy for source SCMs
56 that use unix logins to identify authors (eg: CVS). One line per author 56 that use unix logins to identify authors (eg: CVS). One line per author
57 mapping and the line format is: srcauthor=whatever string you want 57 mapping and the line format is:
58
59 source author = destination author
60
61 Empty lines and lines starting with a "#" are ignored.
58 62
59 The filemap is a file that allows filtering and remapping of files and 63 The filemap is a file that allows filtering and remapping of files and
60 directories. Each line can contain one of the following directives: 64 directories. Each line can contain one of the following directives:
61 65
62 include path/to/file-or-dir 66 include path/to/file-or-dir
79 83
80 The splicemap is a file that allows insertion of synthetic history, 84 The splicemap is a file that allows insertion of synthetic history,
81 letting you specify the parents of a revision. This is useful if you want 85 letting you specify the parents of a revision. This is useful if you want
82 to e.g. give a Subversion merge two parents, or graft two disconnected 86 to e.g. give a Subversion merge two parents, or graft two disconnected
83 series of history together. Each entry contains a key, followed by a 87 series of history together. Each entry contains a key, followed by a
84 space, followed by one or two comma-separated values. The key is the 88 space, followed by one or two comma-separated values:
85 revision ID in the source revision control system whose parents should be 89
86 modified (same format as a key in .hg/shamap). The values are the revision 90 key parent1, parent2
87 IDs (in either the source or destination revision control system) that 91
88 should be used as the new parents for that node. For example, if you have 92 The key is the revision ID in the source revision control system whose
89 merged "release-1.0" into "trunk", then you should specify the revision on 93 parents should be modified (same format as a key in .hg/shamap). The
90 "trunk" as the first parent and the one on the "release-1.0" branch as the 94 values are the revision IDs (in either the source or destination revision
91 second. 95 control system) that should be used as the new parents for that node. For
96 example, if you have merged "release-1.0" into "trunk", then you should
97 specify the revision on "trunk" as the first parent and the one on the
98 "release-1.0" branch as the second.
92 99
93 The branchmap is a file that allows you to rename a branch when it is 100 The branchmap is a file that allows you to rename a branch when it is
94 being brought in from whatever external repository. When used in 101 being brought in from whatever external repository. When used in
95 conjunction with a splicemap, it allows for a powerful combination to help 102 conjunction with a splicemap, it allows for a powerful combination to help
96 fix even the most badly mismanaged repositories and turn them into nicely 103 fix even the most badly mismanaged repositories and turn them into nicely
97 structured Mercurial repositories. The branchmap contains lines of the 104 structured Mercurial repositories. The branchmap contains lines of the
98 form "original_branch_name new_branch_name". "original_branch_name" is the 105 form:
99 name of the branch in the source repository, and "new_branch_name" is the 106
100 name of the branch is the destination repository. This can be used to (for 107 original_branch_name new_branch_name
101 instance) move code in one repository from "default" to a named branch. 108
109 where "original_branch_name" is the name of the branch in the source
110 repository, and "new_branch_name" is the name of the branch is the
111 destination repository. No whitespace is allowed in the branch names. This
112 can be used to (for instance) move code in one repository from "default"
113 to a named branch.
102 114
103 Mercurial Source 115 Mercurial Source
104 ---------------- 116 ----------------
105 117
106 --config convert.hg.ignoreerrors=False (boolean) 118 --config convert.hg.ignoreerrors=False (boolean)