Mercurial > hg-stable

changeset 7950:9bbcfa898cd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
issue1578: fix crash: do not use synthetic changesets as merge parents.
author Greg Ward <greg-hg@gerg.ca>
date Sat, 28 Mar 2009 12:27:20 -0400
parents 443c0c8636ac
children 4d9e8efb7326
files hgext/convert/cvsps.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)