issue1578: fix crash: do not use synthetic changesets as merge parents.
--- 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)