hgext/convert/cvsps.py

--- a/hgext/convert/cvsps.py	Sat May 12 16:00:58 2012 +0200
+++ b/hgext/convert/cvsps.py	Sat May 12 16:02:45 2012 +0200
@@ -706,11 +706,11 @@
         if mergeto:
             m = mergeto.search(c.comment)
             if m:
-                try:
+                if m.groups():
                     m = m.group(1)
                     if m == 'HEAD':
                         m = None
-                except:
+                else:
                     m = None   # if no group found then merge to HEAD
                 if m in branches and c.branch != m:
                     # insert empty changeset for merge