Mercurial > hg-stable

diff mercurial/filemerge.py @ 9709:5858117a0077

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: supply base node to merge tools in the environment Merge tools will be able to exploit this to correctly merge backouts. This won't work fully, though, until issue 1327 is solved, since the node information is not necessarily correct.
author Sune Foldager <cryo@cyanite.org>
date Wed, 04 Nov 2009 15:18:19 +0100
parents 4c041f1ee1b4
children 25e572394f5c
line wrap: on
line diff
--- a/mercurial/filemerge.py	Wed Nov 04 09:34:04 2009 +0100
+++ b/mercurial/filemerge.py	Wed Nov 04 15:18:19 2009 +0100
@@ -186,6 +186,7 @@
     env = dict(HG_FILE=fd,
                HG_MY_NODE=short(mynode),
                HG_OTHER_NODE=str(fco.changectx()),
+               HG_BASE_NODE=str(fca.changectx()),
                HG_MY_ISLINK='l' in fcd.flags(),
                HG_OTHER_ISLINK='l' in fco.flags(),
                HG_BASE_ISLINK='l' in fca.flags())