Mercurial > hg

comparison 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
comparison
equal deleted inserted replaced
9708:a9424b6a1a6d 9709:5858117a0077
184 util.copyfile(back, a) # restore from backup and try again 184 util.copyfile(back, a) # restore from backup and try again
185 185
186 env = dict(HG_FILE=fd, 186 env = dict(HG_FILE=fd,
187 HG_MY_NODE=short(mynode), 187 HG_MY_NODE=short(mynode),
188 HG_OTHER_NODE=str(fco.changectx()), 188 HG_OTHER_NODE=str(fco.changectx()),
189 HG_BASE_NODE=str(fca.changectx()),
189 HG_MY_ISLINK='l' in fcd.flags(), 190 HG_MY_ISLINK='l' in fcd.flags(),
190 HG_OTHER_ISLINK='l' in fco.flags(), 191 HG_OTHER_ISLINK='l' in fco.flags(),
191 HG_BASE_ISLINK='l' in fca.flags()) 192 HG_BASE_ISLINK='l' in fca.flags())
192 193
193 if tool == "internal:merge": 194 if tool == "internal:merge":