Mercurial > hg
changeset 6148:31d81d476a7f
update output of test-convert
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 19 Feb 2008 19:34:18 -0300 |
parents | 53ae5af55db3 |
children | b023915aa1bc |
files | tests/test-convert.out |
diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert.out Tue Feb 19 19:20:10 2008 -0300 +++ b/tests/test-convert.out Tue Feb 19 19:34:18 2008 -0300 @@ -56,6 +56,17 @@ subdirectory into the root of the repository, use '.' as the path to rename to. + The splicemap is a file that allows insertion of synthetic + history, letting you specify the parents of a revision. This is + useful if you want to e.g. give a Subversion merge two parents, or + graft two disconnected series of history together. Each entry + contains a key, followed by a space, followed by one or two + values, separated by spaces. The key is the revision ID in the + source revision control system whose parents should be modified + (same format as a key in .hg/shamap). The values are the revision + IDs (in either the source or destination revision control system) + that should be used as the new parents for that node. + Back end options: --config convert.hg.clonebranches=False (boolean) @@ -81,6 +92,7 @@ --filemap remap file names using contents of file -r --rev import up to target revision REV -s --source-type source repository type + --splicemap splice synthesized history into place --datesort try to sort changesets by date use "hg -v help convert" to show global options