hg
author Patrick Mezard <pmezard@gmail.com>
Wed, 03 Oct 2007 23:09:36 +0200
changeset 5390 36c46e20976a
parent 5197 55860a45bbf2
child 5531 a3fe91b4f6eb
permissions -rwxr-xr-x
merge: provide *_ISLINK environment vars to merge helper Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.

#!/usr/bin/env python
#
# mercurial - scalable distributed SCM
#
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

# enable importing on demand to reduce startup time
from mercurial import demandimport; demandimport.enable()

import mercurial.dispatch
mercurial.dispatch.run()