Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: coerce nodes to bytes, not str
authorAugie Fackler <augie@google.com>
Tue, 13 Feb 2018 23:37:58 -0500
changeset 36177 187f2474bc11
parent 36176 0836c70ba5fa
child 36178 646002338365
merge: coerce nodes to bytes, not str Differential Revision: https://phab.mercurial-scm.org/D2250
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Tue Feb 13 19:12:44 2018 -0500
+++ b/mercurial/merge.py	Tue Feb 13 23:37:58 2018 -0500
@@ -1846,7 +1846,7 @@
             else:
                 pas = [p1.ancestor(p2, warn=branchmerge)]
 
-        fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
+        fp1, fp2, xp1, xp2 = p1.node(), p2.node(), bytes(p1), bytes(p2)
 
         ### check phase
         if not overwrite:
mercurial