Show More
@@ -1,4 +1,5 | |||||
1 | test-abort-checkin.t |
|
1 | test-abort-checkin.t | |
|
2 | test-absorb-edit-lines.t | |||
2 | test-absorb-filefixupstate.py |
|
3 | test-absorb-filefixupstate.py | |
3 | test-absorb-phase.t |
|
4 | test-absorb-phase.t | |
4 | test-absorb-rename.t |
|
5 | test-absorb-rename.t |
@@ -489,7 +489,8 class filefixupstate(object): | |||||
489 | if l[colonpos - 1:colonpos + 2] != ' : ': |
|
489 | if l[colonpos - 1:colonpos + 2] != ' : ': | |
490 | raise error.Abort(_('malformed line: %s') % l) |
|
490 | raise error.Abort(_('malformed line: %s') % l) | |
491 | linecontent = l[colonpos + 2:] |
|
491 | linecontent = l[colonpos + 2:] | |
492 |
for i, ch in enumerate( |
|
492 | for i, ch in enumerate( | |
|
493 | pycompat.bytestr(l[leftpadpos:colonpos - 1])): | |||
493 | if ch == 'y': |
|
494 | if ch == 'y': | |
494 | contents[visiblefctxs[i][0]] += linecontent |
|
495 | contents[visiblefctxs[i][0]] += linecontent | |
495 | # chunkstats is hard to calculate if anything changes, therefore |
|
496 | # chunkstats is hard to calculate if anything changes, therefore |
General Comments 0
You need to be logged in to leave comments.
Login now