--- a/hgext/convert/cvsps.py	Sat Apr 04 18:04:38 2009 +0200
+++ b/hgext/convert/cvsps.py	Sat Apr 04 18:08:41 2009 +0200
@@ -466,7 +466,7 @@
                   e.file not in files):
             c = changeset(comment=e.comment, author=e.author,
                           branch=e.branch, date=e.date, entries=[],
-                          mergepoint=e.mergepoint)
+                          mergepoint=getattr(e, 'mergepoint', None))
             changesets.append(c)
             files = {}
             if len(changesets) % 100 == 0:
@@ -488,7 +488,8 @@
         #   "File file4 was added on branch ..." (synthetic, 1 entry)
         #   "Add file3 and file4 to fix ..."     (real, 2 entries)
         # Hence the check for 1 entry here.
-        c.synthetic = (len(c.entries) == 1 and c.entries[0].synthetic)
+        synth = getattr(c.entries[0], 'synthetic', None)
+        c.synthetic = (len(c.entries) == 1 and synth)
 
     # Sort files in each changeset