Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: fix builtin cvsps when no branchpoints are present
authorRocco Rutte <pdmef@gmx.net>
Sun, 14 Jun 2009 20:24:18 +0200
changeset 8890 c487719cccef
parent 8889 9be824115ee8
child 8891 5fe8dc75aa4a
convert: fix builtin cvsps when no branchpoints are present
hgext/convert/cvsps.py file | annotate | diff | comparison | revisions 
--- 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
hg-stable