comparison hgext/convert/cvsps.py @ 7950:9bbcfa898cd3

issue1578: fix crash: do not use synthetic changesets as merge parents.

7949:443c0c8636ac

            m = mergefrom.search(c.comment)
            if m:
                m = m.group(1)
                if m == 'HEAD':
                    m = None
                if m in branches and c.branch != m:
                    c.parents.append(changesets[branches[m]])

        if mergeto:
            m = mergeto.search(c.comment)
            if m:
                try:

7950:9bbcfa898cd3

            m = mergefrom.search(c.comment)
            if m:
                m = m.group(1)
                if m == 'HEAD':
                    m = None
                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)
            if m:
                try: