Mercurial > hg

diff tests/test-convert.out @ 9634:fbde669564d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: document parent order in splicemap help (issue1764)
author Martin Geisler <mg@lazybytes.net>
date Fri, 23 Oct 2009 22:55:28 +0200
parents 56a5f80556f5
children a7178eccf2dc
line wrap: on
line diff
--- a/tests/test-convert.out	Thu Oct 22 23:41:01 2009 +0200
+++ b/tests/test-convert.out	Fri Oct 23 22:55:28 2009 +0200
@@ -81,7 +81,10 @@
     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.
+    should be used as the new parents for that node. For example, if you have
+    merged "release-1.0" into "trunk", then you should specify the revision on
+    "trunk" as the first parent and the one on the "release-1.0" branch as the
+    second.
 
     The branchmap is a file that allows you to rename a branch when it is
     being brought in from whatever external repository. When used in