# HG changeset patch # User Patrick Mezard # Date 2009-09-22 11:30:32 # Node ID a15813fae0a8f414228f9da768c235f9d017ebfa # Parent bccf780f78ed7cab3fac47bfac68fdd56a059ba7 convert/cvs: update debugcvsps documentation diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -178,9 +178,10 @@ def convert(ui, src, dest=None, revmapfi add the most recent revision on the branch indicated in the regex as the second parent of the changeset. - The hgext/convert/cvsps wrapper script allows the builtin + An additional "debugcvsps" Mercurial command allows the builtin changeset merging code to be run without doing a conversion. Its - parameters and output are similar to that of cvsps 2.1. + parameters and output are similar to that of cvsps 2.1. Please see + the command help for more details. Subversion Source ----------------- diff --git a/tests/test-convert.out b/tests/test-convert.out --- a/tests/test-convert.out +++ b/tests/test-convert.out @@ -153,9 +153,10 @@ convert a foreign SCM repository to a Me recent revision on the branch indicated in the regex as the second parent of the changeset. - The hgext/convert/cvsps wrapper script allows the builtin changeset + An additional "debugcvsps" Mercurial command allows the builtin changeset merging code to be run without doing a conversion. Its parameters and - output are similar to that of cvsps 2.1. + output are similar to that of cvsps 2.1. Please see the command help for + more details. Subversion Source -----------------