changeset 31463 | 55df8fa15b09 |
parent 31455 | 7b5fb4b0c0e8 |
child 31477 | 3fb2081ef896 |
--- a/mercurial/commands.py Thu Mar 16 14:27:41 2017 -0700 +++ b/mercurial/commands.py Thu Mar 16 09:13:13 2017 +0530 @@ -4754,7 +4754,7 @@ stat = repo.status(node1, node2, m, 'ignored' in show, 'clean' in show, 'unknown' in show, opts.get('subrepos')) - changestates = zip(states, 'MAR!?IC', stat) + changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat) if (opts.get('all') or opts.get('copies') or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):