Patchwork D2250: merge: coerce nodes to bytes, not str

login
register
mail settings
Submitter phabricator
Date Feb. 14, 2018, 5:58 a.m.
Message ID <d106366ed51dcfced18cd3af98bfc7c9@localhost.localdomain>
Download mbox | patch
Permalink /patch/27884/
State Not Applicable
Headers show

Comments

phabricator - Feb. 14, 2018, 5:58 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG82ae565f0d8c: merge: coerce nodes to bytes, not str (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2250?vs=5685&id=5690

REVISION DETAIL
  https://phab.mercurial-scm.org/D2250

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: durin42, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -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: