[PATCH] convert-cvs: correctly handle Removed replies, fixes bug 1427

Frank Kingswood frank at kingswood-consulting.co.uk
Thu Dec 11 07:35:13 CST 2008


# HG changeset patch
# User Frank Kingswood <frank at kingswood-consulting.co.uk>
# Date 1229002415 0
# Node ID d26435507d2d8db7828ca4f7a94c1dffe4d7a70e
# Parent  16905fc2690f744eeb009b872ca7cd6bf2f93027
convert-cvs: correctly handle Removed replies, fixes bug 1427

diff -r 16905fc2690f -r d26435507d2d hgext/convert/cvs.py
--- a/hgext/convert/cvs.py	Wed Dec 10 14:02:54 2008 +0000
+++ b/hgext/convert/cvs.py	Thu Dec 11 13:33:35 2008 +0000
@@ -328,9 +328,6 @@
                     self.ui.warn(_("cvs server: %s\n") % line[2:])
                 elif line.startswith("Remove"):
                     l = self.readp.readline()
-                    l = self.readp.readline()
-                    if l != "ok\n":
-                        raise util.Abort(_("unknown CVS response: %s") % l)
                 else:
                     raise util.Abort(_("unknown CVS response: %s") % line)
 


More information about the Mercurial-devel mailing list