Patchwork D855: py3: use pycompat.bytestr instead of str

login
register
mail settings
Submitter phabricator
Date Sept. 30, 2017, 1:39 p.m.
Message ID <fdf9cac599f34cf089f1970b65c273c8@localhost.localdomain>
Download mbox | patch
Permalink /patch/24264/
State Not Applicable
Headers show

Comments

phabricator - Sept. 30, 2017, 1:39 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6f49ea88d984: py3: use pycompat.bytestr instead of str (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D855?vs=2186&id=2191

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -990,7 +990,8 @@ 
     else: # only when merge.preferancestor=* - the default
         repo.ui.note(
             _("note: merging %s and %s using bids from ancestors %s\n") %
-            (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))
+            (wctx, mctx, _(' and ').join(pycompat.bytestr(anc)
+                                            for anc in ancestors)))
 
         # Call for bids
         fbids = {} # mapping filename to bids (action method to list af actions)