[PATCH] convert: Fix builtin cvsps when no branchpoints are present

[Rocco Rutte]

# HG changeset patch
# User Rocco Rutte <pdmef at gmx.net>
# Date 1245003858 -7200
# Node ID 55e7f0a7e17f5d9dd0af82179e34501b88b9bcd1
# Parent  8bf6eb68ddaf1e6b8fa9247d9071f9458e66a6b6
convert: Fix builtin cvsps when no branchpoints are present

diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py
+++ b/hgext/convert/cvsps.py
@@ -511,7 +511,9 @@ def createchangeset(ui, log, fuzz=60, me
                   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