hg
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Tue, 10 Oct 2006 21:03:24 +0300
changeset 3325 50a18815e3f0
parent 1698 ad4a2eefe4d7
child 3877 abaee83ce0a6
permissions -rwxr-xr-x
Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:

#!/usr/bin/env python
#
# mercurial - scalable distributed SCM
#
# Copyright 2005, 2006 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.

from mercurial import commands

commands.run()