diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist index 83d62df28ab60deab90f808e5bdaca59ee6b6867_Y29udHJpYi9weXRob24zLXdoaXRlbGlzdA==..b436059c1cca85ec327889a8fba17837e5c7b8e6_Y29udHJpYi9weXRob24zLXdoaXRlbGlzdA== 100644 --- a/contrib/python3-whitelist +++ b/contrib/python3-whitelist @@ -121,6 +121,7 @@ test-convert-hg-sink.t test-convert-hg-source.t test-convert-hg-startrev.t +test-convert-mtn.t test-convert-splicemap.t test-convert-svn-sink.t test-convert-tagsbranch-topology.t diff --git a/mercurial/changelog.py b/mercurial/changelog.py index 83d62df28ab60deab90f808e5bdaca59ee6b6867_bWVyY3VyaWFsL2NoYW5nZWxvZy5weQ==..b436059c1cca85ec327889a8fba17837e5c7b8e6_bWVyY3VyaWFsL2NoYW5nZWxvZy5weQ== 100644 --- a/mercurial/changelog.py +++ b/mercurial/changelog.py @@ -70,7 +70,10 @@ def encodeextra(d): # keys must be sorted to produce a deterministic changelog entry - items = [_string_escape('%s:%s' % (k, d[k])) for k in sorted(d)] + items = [ + _string_escape('%s:%s' % (k, pycompat.bytestr(d[k]))) + for k in sorted(d) + ] return "\0".join(items) def stripdesc(desc):