Mercurial > hg

comparison hgext/convert/__init__.py @ 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
71 and can be run repeatedly to copy new commits. 71 and can be run repeatedly to copy new commits.
72 72
73 The [username mapping] file is a simple text file that maps each 73 The [username mapping] file is a simple text file that maps each
74 source commit author to a destination commit author. It is handy 74 source commit author to a destination commit author. It is handy
75 for source SCMs that use unix logins to identify authors (eg: 75 for source SCMs that use unix logins to identify authors (eg:
76 CVS). One line per author mapping and the line format is: 76 CVS). One line per author mapping and the line format is::
77 srcauthor=whatever string you want 77
78 source author = destination author
79
80 Empty lines and lines starting with a ``#`` are ignored.
78 81
79 The filemap is a file that allows filtering and remapping of files 82 The filemap is a file that allows filtering and remapping of files
80 and directories. Each line can contain one of the following 83 and directories. Each line can contain one of the following
81 directives:: 84 directives::
82 85
102 The splicemap is a file that allows insertion of synthetic 105 The splicemap is a file that allows insertion of synthetic
103 history, letting you specify the parents of a revision. This is 106 history, letting you specify the parents of a revision. This is
104 useful if you want to e.g. give a Subversion merge two parents, or 107 useful if you want to e.g. give a Subversion merge two parents, or
105 graft two disconnected series of history together. Each entry 108 graft two disconnected series of history together. Each entry
106 contains a key, followed by a space, followed by one or two 109 contains a key, followed by a space, followed by one or two
107 comma-separated values. The key is the revision ID in the source 110 comma-separated values::
111
112 key parent1, parent2
113
114 The key is the revision ID in the source
108 revision control system whose parents should be modified (same 115 revision control system whose parents should be modified (same
109 format as a key in .hg/shamap). The values are the revision IDs 116 format as a key in .hg/shamap). The values are the revision IDs
110 (in either the source or destination revision control system) that 117 (in either the source or destination revision control system) that
111 should be used as the new parents for that node. For example, if 118 should be used as the new parents for that node. For example, if
112 you have merged "release-1.0" into "trunk", then you should 119 you have merged "release-1.0" into "trunk", then you should
116 The branchmap is a file that allows you to rename a branch when it is 123 The branchmap is a file that allows you to rename a branch when it is
117 being brought in from whatever external repository. When used in 124 being brought in from whatever external repository. When used in
118 conjunction with a splicemap, it allows for a powerful combination 125 conjunction with a splicemap, it allows for a powerful combination
119 to help fix even the most badly mismanaged repositories and turn them 126 to help fix even the most badly mismanaged repositories and turn them
120 into nicely structured Mercurial repositories. The branchmap contains 127 into nicely structured Mercurial repositories. The branchmap contains
121 lines of the form "original_branch_name new_branch_name". 128 lines of the form::
122 "original_branch_name" is the name of the branch in the source 129
123 repository, and "new_branch_name" is the name of the branch is the 130 original_branch_name new_branch_name
124 destination repository. This can be used to (for instance) move code 131
125 in one repository from "default" to a named branch. 132 where "original_branch_name" is the name of the branch in the
133 source repository, and "new_branch_name" is the name of the branch
134 is the destination repository. No whitespace is allowed in the
135 branch names. This can be used to (for instance) move code in one
136 repository from "default" to a named branch.
126 137
127 Mercurial Source 138 Mercurial Source
128 ---------------- 139 ----------------
129 140
130 --config convert.hg.ignoreerrors=False (boolean) 141 --config convert.hg.ignoreerrors=False (boolean)