[issue1615] cvs merge detection crashes if bad branch names in cvs source

[Greg Ward]

New submission from Greg Ward <greg-hg at gerg.ca>:

Conversion from CVS has the nice feature that you can supply a regex that
indicates "this commit was a merge in CVS", meaning it will become a merge in
Mercurial.  Unfortunately, if your CVS history was written by humans, it will
inevitably contain typos -- like wrong branch names in merge commits.  In that
case, "hg convert" crashes with a KeyError searching for the other parent of the
merge.

I'll copy in a stack trace as soon as I've written a test case.

----------
assignedto: gward
messages: 9119
nosy: gward
priority: bug
status: unread
title: cvs merge detection crashes if bad branch names in cvs source
topic: 1.2, convert

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1615>
____________________________________________________