# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 2008-02-19 22:34:18
# Node ID 31d81d476a7f62941cc6c89f0e0a77f587019f36
# Parent  53ae5af55db371fc7dd4fd14c97ce138849b479f

update output of test-convert

diff --git a/tests/test-convert.out b/tests/test-convert.out
--- a/tests/test-convert.out
+++ b/tests/test-convert.out
@@ -56,6 +56,17 @@ Convert a foreign SCM repository to a Me
     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 @@ options:
     --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