convert: document parent order in splicemap help (
issue1764)
--- a/hgext/convert/__init__.py Thu Oct 22 23:41:01 2009 +0200
+++ b/hgext/convert/__init__.py Fri Oct 23 22:55:28 2009 +0200
@@ -103,7 +103,10 @@
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
--- 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