Show More
@@ -103,7 +103,10 b' def convert(ui, src, dest=None, revmapfi' | |||
|
103 | 103 | revision control system whose parents should be modified (same |
|
104 | 104 | format as a key in .hg/shamap). The values are the revision IDs |
|
105 | 105 | (in either the source or destination revision control system) that |
|
106 | should be used as the new parents for that node. | |
|
106 | should be used as the new parents for that node. For example, if | |
|
107 | you have merged "release-1.0" into "trunk", then you should | |
|
108 | specify the revision on "trunk" as the first parent and the one on | |
|
109 | the "release-1.0" branch as the second. | |
|
107 | 110 | |
|
108 | 111 | The branchmap is a file that allows you to rename a branch when it is |
|
109 | 112 | being brought in from whatever external repository. When used in |
@@ -81,7 +81,10 b' convert a foreign SCM repository to a Me' | |||
|
81 | 81 | revision ID in the source revision control system whose parents should be |
|
82 | 82 | modified (same format as a key in .hg/shamap). The values are the revision |
|
83 | 83 | IDs (in either the source or destination revision control system) that |
|
84 | should be used as the new parents for that node. | |
|
84 | should be used as the new parents for that node. For example, if you have | |
|
85 | merged "release-1.0" into "trunk", then you should specify the revision on | |
|
86 | "trunk" as the first parent and the one on the "release-1.0" branch as the | |
|
87 | second. | |
|
85 | 88 | |
|
86 | 89 | The branchmap is a file that allows you to rename a branch when it is |
|
87 | 90 | being brought in from whatever external repository. When used in |
General Comments 0
You need to be logged in to leave comments.
Login now