# HG changeset patch
# User Greg Ward <greg-hg@gerg.ca>
# Date 1238257640 14400
# Node ID 9bbcfa898cd39939c193568fe8a604fcacaf3f77
# Parent  443c0c8636acc4d7bc923e920002e054ff6bc9ef
issue1578: fix crash: do not use synthetic changesets as merge parents.

diff -r 443c0c8636ac -r 9bbcfa898cd3 hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py	Fri Apr 03 14:52:03 2009 -0500
+++ b/hgext/convert/cvsps.py	Sat Mar 28 12:27:20 2009 -0400
@@ -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)