equal
deleted
inserted
replaced
126 Because CVS does not have changesets, it is necessary to collect |
126 Because CVS does not have changesets, it is necessary to collect |
127 individual commits to CVS and merge them into changesets. CVS |
127 individual commits to CVS and merge them into changesets. CVS |
128 source uses its internal changeset merging code by default but can |
128 source uses its internal changeset merging code by default but can |
129 be configured to call the external 'cvsps' program by setting: |
129 be configured to call the external 'cvsps' program by setting: |
130 --config convert.cvsps='cvsps -A -u --cvs-direct -q' |
130 --config convert.cvsps='cvsps -A -u --cvs-direct -q' |
131 This is a legacy option and may be removed in future. |
131 This option is deprecated and will be removed in Mercurial 1.4. |
132 |
132 |
133 The options shown are the defaults. |
133 The options shown are the defaults. |
134 |
134 |
135 Internal cvsps is selected by setting |
135 Internal cvsps is selected by setting |
136 --config convert.cvsps=builtin |
136 --config convert.cvsps=builtin |