# HG changeset patch
# User Greg Ward <greg-hg@gerg.ca>
# Date 2009-03-28 16:27:20
# Node ID 9bbcfa898cd39939c193568fe8a604fcacaf3f77
# Parent  443c0c8636acc4d7bc923e920002e054ff6bc9ef

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 @@ def createchangeset(ui, log, fuzz=60, me
                 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)