diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py
--- a/hgext/convert/__init__.py
+++ b/hgext/convert/__init__.py
@@ -123,6 +123,9 @@ def convert(ui, src, dest=None, revmapfi
     Internal cvsps is selected by setting
         --config convert.cvsps=builtin
     and has a few more configurable options:
+        --config convert.cvsps.cache=True     (boolean)
+            Set to False to disable remote log caching, for testing and 
+            debugging purposes.
         --config convert.cvsps.fuzz=60        (integer)
             Specify the maximum time (in seconds) that is allowed
             between commits with identical user and log message in a
diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py
--- a/hgext/convert/cvs.py
+++ b/hgext/convert/cvs.py
@@ -67,7 +67,10 @@ class convert_cvs(converter_source):
                 # builtin cvsps code
                 self.ui.status(_('using builtin cvsps\n'))
 
-                db = cvsps.createlog(self.ui, cache='update')
+                cache = 'update'
+                if not self.ui.configbool('convert', 'cvsps.cache', True):
+                    cache = None
+                db = cvsps.createlog(self.ui, cache=cache)
                 db = cvsps.createchangeset(self.ui, db,
                       fuzz=int(self.ui.config('convert', 'cvsps.fuzz', 60)),
                       mergeto=self.ui.config('convert', 'cvsps.mergeto', None),
diff --git a/tests/test-convert-cvs-branch b/tests/test-convert-cvs-branch
--- a/tests/test-convert-cvs-branch
+++ b/tests/test-convert-cvs-branch
@@ -14,6 +14,7 @@ echo "convert = " >> $HGRCPATH
 echo "graphlog = " >> $HGRCPATH
 echo "[convert]" >> $HGRCPATH
 echo "cvsps=builtin" >> $HGRCPATH
+echo "cvsps.cache=0" >> $HGRCPATH
 
 echo % create cvs repository
 mkdir cvsrepo
diff --git a/tests/test-convert.out b/tests/test-convert.out
--- a/tests/test-convert.out
+++ b/tests/test-convert.out
@@ -108,6 +108,9 @@ convert a foreign SCM repository to a Me
     Internal cvsps is selected by setting
         --config convert.cvsps=builtin
     and has a few more configurable options:
+        --config convert.cvsps.cache=True     (boolean)
+            Set to False to disable remote log caching, for testing and 
+            debugging purposes.
         --config convert.cvsps.fuzz=60        (integer)
             Specify the maximum time (in seconds) that is allowed
             between commits with identical user and log message in a