D2442: filemerge: do what the context __bytes__ does, but locally
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Mon Feb 26 00:43:49 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3ab9d74dd1c5: filemerge: do what the context __bytes__ does, but locally (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2442?vs=6089&id=6098
REVISION DETAIL
https://phab.mercurial-scm.org/D2442
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -520,8 +520,8 @@
baselabel = 'base'
env = {'HG_FILE': fcd.path(),
'HG_MY_NODE': short(mynode),
- 'HG_OTHER_NODE': str(fco.changectx()),
- 'HG_BASE_NODE': str(fca.changectx()),
+ 'HG_OTHER_NODE': short(fco.changectx().node()),
+ 'HG_BASE_NODE': short(fca.changectx().node()),
'HG_MY_ISLINK': 'l' in fcd.flags(),
'HG_OTHER_ISLINK': 'l' in fco.flags(),
'HG_BASE_ISLINK': 'l' in fca.flags(),
To: durin42, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel
More information about the Mercurial-devel
mailing list