Mercurial > hg
comparison hgext/convert/__init__.py @ 7931:026bcd12a0ad
issue1582: improve description of splicemap syntax in help.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Tue, 31 Mar 2009 15:52:48 -0400 |
parents | 4a4c7f6a5912 |
children | 7b813bdbd5d0 |
comparison
equal
deleted
inserted
replaced
7930:072df47d84c1 | 7931:026bcd12a0ad |
---|---|
77 The splicemap is a file that allows insertion of synthetic | 77 The splicemap is a file that allows insertion of synthetic |
78 history, letting you specify the parents of a revision. This is | 78 history, letting you specify the parents of a revision. This is |
79 useful if you want to e.g. give a Subversion merge two parents, or | 79 useful if you want to e.g. give a Subversion merge two parents, or |
80 graft two disconnected series of history together. Each entry | 80 graft two disconnected series of history together. Each entry |
81 contains a key, followed by a space, followed by one or two | 81 contains a key, followed by a space, followed by one or two |
82 values, separated by spaces. The key is the revision ID in the | 82 comma-separated values. The key is the revision ID in the |
83 source revision control system whose parents should be modified | 83 source revision control system whose parents should be modified |
84 (same format as a key in .hg/shamap). The values are the revision | 84 (same format as a key in .hg/shamap). The values are the revision |
85 IDs (in either the source or destination revision control system) | 85 IDs (in either the source or destination revision control system) |
86 that should be used as the new parents for that node. | 86 that should be used as the new parents for that node. |
87 | 87 |