changeset 41260 | c146651a78e1 |
parent 40951 | e993a86cfcb8 |
child 41365 | 876494fd967d |
--- a/hgext/absorb.py Wed Jan 16 11:03:04 2019 -0500 +++ b/hgext/absorb.py Wed Jan 16 11:33:43 2019 -0500 @@ -489,7 +489,8 @@ if l[colonpos - 1:colonpos + 2] != ' : ': raise error.Abort(_('malformed line: %s') % l) linecontent = l[colonpos + 2:] - for i, ch in enumerate(l[leftpadpos:colonpos - 1]): + for i, ch in enumerate( + pycompat.bytestr(l[leftpadpos:colonpos - 1])): if ch == 'y': contents[visiblefctxs[i][0]] += linecontent # chunkstats is hard to calculate if anything changes, therefore