equal
deleted
inserted
replaced
62 The splicemap is a file that allows insertion of synthetic |
62 The splicemap is a file that allows insertion of synthetic |
63 history, letting you specify the parents of a revision. This is |
63 history, letting you specify the parents of a revision. This is |
64 useful if you want to e.g. give a Subversion merge two parents, or |
64 useful if you want to e.g. give a Subversion merge two parents, or |
65 graft two disconnected series of history together. Each entry |
65 graft two disconnected series of history together. Each entry |
66 contains a key, followed by a space, followed by one or two |
66 contains a key, followed by a space, followed by one or two |
67 values, separated by spaces. The key is the revision ID in the |
67 comma-separated values. The key is the revision ID in the |
68 source revision control system whose parents should be modified |
68 source revision control system whose parents should be modified |
69 (same format as a key in .hg/shamap). The values are the revision |
69 (same format as a key in .hg/shamap). The values are the revision |
70 IDs (in either the source or destination revision control system) |
70 IDs (in either the source or destination revision control system) |
71 that should be used as the new parents for that node. |
71 that should be used as the new parents for that node. |
72 |
72 |