Submitter | phabricator |
---|---|
Date | Feb. 26, 2018, 5:43 a.m. |
Message ID | <f527bcd295c611de5b64c8f88e9816fc@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/28376/ |
State | Not Applicable |
Headers | show |
Comments
Patch
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(),