# HG changeset patch
# User Rocco Rutte <pdmef@gmx.net>
# Date 1245003858 -7200
# Node ID c487719cccef1a82db34abc3c7247028143e669c
# Parent  9be824115ee895e46fb91d54db0ef1ae3ccb70f8
convert: fix builtin cvsps when no branchpoints are present

diff -r 9be824115ee8 -r c487719cccef hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py	Mon Jun 22 00:02:31 2009 +0200
+++ b/hgext/convert/cvsps.py	Sun Jun 14 20:24:18 2009 +0200
@@ -511,7 +511,9 @@
                   e.comment == c.comment and
                   e.author == c.author and
                   e.branch == c.branch and
-                  e.branchpoints == c.branchpoints and
+                  (not hasattr(e, 'branchpoints') or
+                    not hasattr (c, 'branchpoints') or
+                    e.branchpoints == c.branchpoints) and
                   ((c.date[0] + c.date[1]) <=
                    (e.date[0] + e.date[1]) <=
                    (c.date[0] + c.date[1]) + fuzz) and