tests/test-changelog-exec
author Mads Kiilerich <mads@kiilerich.com>
Wed, 21 Jul 2010 17:51:37 +0200
branchstable
changeset 11639 a0c5f531daab
parent 8167 6c82beaaa11a
permissions -rwxr-xr-x
doc: make sure we use our own code for generating man pages docutils would in some situations pick up its own manpage.py instead of doc/manpage.py. Renaming to hgmanpage.py makes it less ambiguous.

#!/bin/sh
# b51a8138292a introduced a regression where we would mention in the
# changelog executable files added by the second parent of a merge.
# Test that that doesn't happen anymore

"$TESTDIR/hghave" execbit || exit 80

hg init repo
cd repo
echo foo > foo
hg ci -qAm 'add foo'

echo bar > bar
chmod +x bar
hg ci -qAm 'add bar'
echo '% manifest of p2:'
hg manifest
echo

hg up -qC 0
echo >> foo
hg ci -m 'change foo'
echo '% manifest of p1:'
hg manifest

hg merge
hg ci -m 'merge'

echo '% this should not mention bar:'
hg tip -v

hg debugindex .hg/store/data/bar.i