Submitter | Szymon Wróblewski |
---|---|
Date | April 29, 2013, 6:46 p.m. |
Message ID | <CAF-_pHip_bmDm6RBkrQFb62zdcODa+SBA2ggdcLM3uwzLRH7Sw@mail.gmail.com> |
Download | mbox | patch |
Permalink | /patch/1501/ |
State | Changes Requested |
Headers | show |
Comments
Patch
diff -r f01a351db791 -r 79f31e640403 hgext/convert/common.py --- a/hgext/convert/common.py Fri Apr 26 01:12:03 2013 +0900 +++ b/hgext/convert/common.py Mon Apr 29 20:43:01 2013 +0200 @@ -438,12 +438,13 @@ continue try: child, parents = line.split(' ', 1) - parents = parents.replace(',', ' ').split() + parents = parents.split(',') except ValueError: raise util.Abort(_('syntax error in %s(%d): child parent1' '[,parent2] expected') % (path, i + 1)) pp = [] for p in parents: + p = p.strip() if p not in pp: pp.append(p) m[child] = pp