D2143: py3: use bytes() to cast context instances
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Sun Feb 11 20:40:23 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4fe2041007ed: py3: use bytes() to cast context instances (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2143?vs=5428&id=5443
REVISION DETAIL
https://phab.mercurial-scm.org/D2143
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
@@ -973,14 +973,14 @@
# Rename all local conflicting files that have not been deleted.
for p in localconflicts:
if p not in deletedfiles:
- ctxname = str(wctx).rstrip('+')
+ ctxname = bytes(wctx).rstrip('+')
pnew = util.safename(p, ctxname, wctx, set(actions.keys()))
actions[pnew] = ('pr', (p,), "local path conflict")
actions[p] = ('p', (pnew, 'l'), "path conflict")
if remoteconflicts:
# Check if all files in the conflicting directories have been removed.
- ctxname = str(mctx).rstrip('+')
+ ctxname = bytes(mctx).rstrip('+')
for f, p in _filesindirs(repo, mf, remoteconflicts):
if f not in deletedfiles:
m, args, msg = actions[p]
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list