Mercurial > hg
comparison hgext/convert/__init__.py @ 9634:fbde669564d8
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 | 69ce7a10e593 25e572394f5c |
comparison
equal
deleted
inserted
replaced
| 9633:82a4c54d51e1 | 9634:fbde669564d8 |
|---|---|
| 101 contains a key, followed by a space, followed by one or two | 101 contains a key, followed by a space, followed by one or two |
| 102 comma-separated values. The key is the revision ID in the source | 102 comma-separated values. The key is the revision ID in the source |
| 103 revision control system whose parents should be modified (same | 103 revision control system whose parents should be modified (same |
| 104 format as a key in .hg/shamap). The values are the revision IDs | 104 format as a key in .hg/shamap). The values are the revision IDs |
| 105 (in either the source or destination revision control system) that | 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 The branchmap is a file that allows you to rename a branch when it is | 111 The branchmap is a file that allows you to rename a branch when it is |
| 109 being brought in from whatever external repository. When used in | 112 being brought in from whatever external repository. When used in |
| 110 conjunction with a splicemap, it allows for a powerful combination | 113 conjunction with a splicemap, it allows for a powerful combination |
| 111 to help fix even the most badly mismanaged repositories and turn them | 114 to help fix even the most badly mismanaged repositories and turn them |