# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1172513549 21600
# Node ID d5011e347476fb77ab4d7c31d21c239b4f83f879
# Parent  97251938485365716a52aebb013d271ba5f55e68# Parent  b53c6f7dbb1f49767217c0ddf1e838e6c651ceea
Merge with crew

diff --git a/contrib/convert-repo b/contrib/convert-repo
--- a/contrib/convert-repo
+++ b/contrib/convert-repo
@@ -85,7 +85,7 @@ class convert_cvs:
             os.chdir(self.path)
             id = None
             state = 0
-            for l in os.popen("cvsps -A"):
+            for l in os.popen("cvsps -A -u --cvs-direct -q"):
                 if state == 0: # header
                     if l.startswith("PatchSet"):
                         id = l[9:-2]
@@ -102,8 +102,8 @@ class convert_cvs:
                     elif l.startswith("Author"):
                         author = self.recode(l[8:-1])
                     elif l.startswith("Tag: "):
-                        t = l[5:-1]
-                        if t != "(none) ":
+                        t = l[5:-1].rstrip()
+                        if t != "(none)":
                             self.tags[t] = id
                     elif l.startswith("Log:"):
                         state = 1