martinvonz updated this revision to Diff 17438. REPOSITORY rHG Mercurial
CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7183?vs=17430&id=17438 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7183/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7183 AFFECTED FILES hgext/histedit.py CHANGE DETAILS diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1427,7 +1427,7 @@ conflicts = rule.conflicts if len(conflicts) > 0: - conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts)) + conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts)) conflictstr = b"changed files overlap with %s" % conflictstr else: conflictstr = b'no overlap' @@ -1466,7 +1466,7 @@ conflicts = [r.ctx for r in rules if r.conflicts] if len(conflicts) > 0: - line = b"potential conflict in %s" % b','.join(map(str, conflicts)) + line = b"potential conflict in %s" % b','.join(map(pycompat.bytestr, conflicts)) addln(rulesscr, -1, 0, line, curses.color_pair(COLOR_WARN)) for y, rule in enumerate(rules[start:]): To: martinvonz, durin42, #hg-reviewers, indygreg Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
