tests/test-changelog-exec
author Edward Lee <edward.lee@engineering.uiuc.edu>
Fri, 07 Sep 2007 16:35:43 +0200
changeset 5288 18091102a633
parent 5242 466323968b23
permissions -rwxr-xr-x
interhg: allow more flexible pattern specification (fixes 2/3 of issue699) - something else than "pat" followed by a number can be used as key - something else than "/" can be used as delimiter - "ilmsux" flags (e.g. "i" for case insensitive) can be used

#!/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' -d '0 0'

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

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

hg merge
hg ci -m 'merge' -d '0 0'

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

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