changeset 9472:a15813fae0a8

convert/cvs: update debugcvsps documentation
author Patrick Mezard <pmezard@gmail.com>
date Tue, 22 Sep 2009 13:30:32 +0200
parents bccf780f78ed
children ffaf6074d1bd
files hgext/convert/__init__.py tests/test-convert.out
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/__init__.py	Sat Sep 19 13:55:18 2009 +0200
+++ b/hgext/convert/__init__.py	Tue Sep 22 13:30:32 2009 +0200
@@ -178,9 +178,10 @@
         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
     -----------------
--- a/tests/test-convert.out	Sat Sep 19 13:55:18 2009 +0200
+++ b/tests/test-convert.out	Tue Sep 22 13:30:32 2009 +0200
@@ -153,9 +153,10 @@
         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
     -----------------