# HG changeset patch # User jakob krainz # Date 2011-10-05 08:28:39 # Node ID 4e5b7d130e761dd8b57a1524769dac6ac1543d1c # Parent 3ce9b1a7538b0c0dace35428969e40a223dacb49 convert: detect false cset boundaries in cvsps descriptions diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py --- a/hgext/convert/cvsps.py +++ b/hgext/convert/cvsps.py @@ -363,8 +363,14 @@ def createlog(ui, directory=None, root=" elif state == 8: # store commit log message if re_31.match(line): - state = 5 - store = True + cpeek = peek + if cpeek.endswith('\n'): + cpeek = cpeek[:-1] + if re_50.match(cpeek): + state = 5 + store = True + else: + e.comment.append(line) elif re_32.match(line): state = 0 store = True