Mercurial > hg
diff tests/test-convert.out @ 7101:e786192d995d
convert: make built-in cvsps the default
Reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 15 Oct 2008 20:14:28 +0200 |
parents | 209ef5f3534c |
children | aff204c9bdd6 |
line wrap: on
line diff
--- a/tests/test-convert.out Wed Oct 15 16:27:36 2008 +0200 +++ b/tests/test-convert.out Wed Oct 15 20:14:28 2008 +0200 @@ -91,11 +91,12 @@ sandbox is ignored. Because CVS does not have changesets, it is necessary to collect - individual commits to CVS and merge them into changesets. CVS source - can use the external 'cvsps' program (this is a legacy option and may - be removed in future) or use its internal changeset merging code. - External cvsps is default, and options may be passed to it by setting - --config convert.cvsps='cvsps -A -u --cvs-direct -q' + individual commits to CVS and merge them into changesets. CVS + source uses its internal changeset merging code by default but can + be configured to call the external 'cvsps' program by setting: + --config convert.cvsps=cvsps -A -u --cvs-direct -q + This is a legacy option and may be removed in future. + The options shown are the defaults. Internal cvsps is selected by setting