comparison hgext/convert/cvsps.py @ 8890:c487719cccef

convert: fix builtin cvsps when no branchpoints are present
author Rocco Rutte <pdmef@gmx.net>
date Sun, 14 Jun 2009 20:24:18 +0200
parents 6019e6517f95
children 3b76321aa0de
comparison
equal deleted inserted replaced
8889:9be824115ee8 8890:c487719cccef
509 # made to ensure that this is, in fact, what happens. 509 # made to ensure that this is, in fact, what happens.
510 if not (c and 510 if not (c and
511 e.comment == c.comment and 511 e.comment == c.comment and
512 e.author == c.author and 512 e.author == c.author and
513 e.branch == c.branch and 513 e.branch == c.branch and
514 e.branchpoints == c.branchpoints and 514 (not hasattr(e, 'branchpoints') or
515 not hasattr (c, 'branchpoints') or
516 e.branchpoints == c.branchpoints) and
515 ((c.date[0] + c.date[1]) <= 517 ((c.date[0] + c.date[1]) <=
516 (e.date[0] + e.date[1]) <= 518 (e.date[0] + e.date[1]) <=
517 (c.date[0] + c.date[1]) + fuzz) and 519 (c.date[0] + c.date[1]) + fuzz) and
518 e.file not in files): 520 e.file not in files):
519 c = changeset(comment=e.comment, author=e.author, 521 c = changeset(comment=e.comment, author=e.author,