D855: py3: use pycompat.bytestr instead of str
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sat Sep 30 09:39:35 EDT 2017
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
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)
To: pulkit, #hg-reviewers, durin42
Cc: durin42, mercurial-devel
More information about the Mercurial-devel
mailing list