Mercurial > hg
comparison hgext/convert/cvsps.py @ 7950:9bbcfa898cd3
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 | 02981000012e |
children | 3e7611a83230 |
comparison
equal
deleted
inserted
replaced
7949:443c0c8636ac | 7950:9bbcfa898cd3 |
---|---|
599 m = mergefrom.search(c.comment) | 599 m = mergefrom.search(c.comment) |
600 if m: | 600 if m: |
601 m = m.group(1) | 601 m = m.group(1) |
602 if m == 'HEAD': | 602 if m == 'HEAD': |
603 m = None | 603 m = None |
604 if m in branches and c.branch != m: | 604 candidate = changesets[branches[m]] |
605 c.parents.append(changesets[branches[m]]) | 605 if m in branches and c.branch != m and not candidate.synthetic: |
606 c.parents.append(candidate) | |
606 | 607 |
607 if mergeto: | 608 if mergeto: |
608 m = mergeto.search(c.comment) | 609 m = mergeto.search(c.comment) |
609 if m: | 610 if m: |
610 try: | 611 try: |