[PATCH 3 of 3] issue1578: fix crash: do not use synthetic changesets as merge parents

[Greg Ward]

# HG changeset patch
# User Greg Ward <greg-hg at gerg.ca>
# Date 1238257640 14400
# Node ID 63039658068b64a468c41f6c8c32a04786eb1499
# Parent  6fb6f7f83d0e2c24fb8dea9fec04fe801f1dcf51
issue1578: fix crash: do not use synthetic changesets as merge parents.

diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py
+++ b/hgext/convert/cvsps.py
@@ -601,8 +601,9 @@
                 m = m.group(1)
                 if m == 'HEAD':
                     m = None
-                if m in branches and c.branch != m:
-                    c.parents.append(changesets[branches[m]])
+                candidate = changesets[branches[m]]
+                if m in branches and c.branch != m and not candidate.synthetic:
+                    c.parents.append(candidate)
 
         if mergeto:
             m = mergeto.search(c.comment)