comparison tests/test-convert.out @ 8377:29f4f0d66cd5

convert: adding branchmap functionality to convert extension
author Michael J. Pedersen <m.pedersen@icelus.org>
date Wed, 13 May 2009 15:03:31 -0400
parents d30a21594812
children 5edb2a8e29ea
comparison
equal deleted inserted replaced
8376:04f9253906bb 8377:29f4f0d66cd5
67 comma-separated values. The key is the revision ID in the source 67 comma-separated values. The key is the revision ID in the source
68 revision control system whose parents should be modified (same 68 revision control system whose parents should be modified (same
69 format as a key in .hg/shamap). The values are the revision IDs 69 format as a key in .hg/shamap). The values are the revision IDs
70 (in either the source or destination revision control system) that 70 (in either the source or destination revision control system) that
71 should be used as the new parents for that node. 71 should be used as the new parents for that node.
72
73 The branchmap is a file that allows you to rename a branch when it is
74 being brought in from whatever external repository. When used in
75 conjunction with a splicemap, it allows for a powerful combination
76 to help fix even the most badly mismanaged repositories and turn them
77 into nicely structured Mercurial repositories. The branchmap contains
78 lines of the form "original_branch_name new_branch_name".
79 "original_branch_name" is the name of the branch in the source
80 repository, and "new_branch_name" is the name of the branch is the
81 destination repository. This can be used to (for instance) move code
82 in one repository from "default" to a named branch.
72 83
73 Mercurial Source 84 Mercurial Source
74 ----------------- 85 -----------------
75 86
76 --config convert.hg.ignoreerrors=False (boolean) 87 --config convert.hg.ignoreerrors=False (boolean)
195 -d --dest-type destination repository type 206 -d --dest-type destination repository type
196 --filemap remap file names using contents of file 207 --filemap remap file names using contents of file
197 -r --rev import up to target revision REV 208 -r --rev import up to target revision REV
198 -s --source-type source repository type 209 -s --source-type source repository type
199 --splicemap splice synthesized history into place 210 --splicemap splice synthesized history into place
211 --branchmap change branch names while converting
200 --datesort try to sort changesets by date 212 --datesort try to sort changesets by date
201 213
202 use "hg -v help convert" to show global options 214 use "hg -v help convert" to show global options
203 adding a 215 adding a
204 assuming destination a-hg 216 assuming destination a-hg