Mercurial > hg
diff hgext/convert/common.py @ 9542:5287de171d74
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 05 Oct 2009 22:17:39 +0200 |
parents | 4c041f1ee1b4 314fc589b313 |
children | 25e572394f5c |
line wrap: on
line diff
--- a/hgext/convert/common.py Sun Oct 04 23:16:54 2009 +0200 +++ b/hgext/convert/common.py Mon Oct 05 22:17:39 2009 +0200 @@ -365,7 +365,7 @@ return for i, line in enumerate(fp): try: - key, value = line[:-1].rsplit(' ', 1) + key, value = line.splitlines()[0].rsplit(' ', 1) except ValueError: raise util.Abort(_('syntax error in %s(%d): key/value pair expected') % (self.path, i+1))