view tests/test-changelog-exec @ 7229:7946503ec76e

introduce fncache repository layout * adds a new entry 'fncache' to '.hg/requires' for new repos * writes new file '.hg/store/fncache' * hash-encodes filenames with long paths (issue839) * encodes Windows reserved filenames (issue793)
author Adrian Buehlmann <adrian@cadifra.com>
date Sun, 19 Oct 2008 19:12:07 +0200
parents 466323968b23
children 6c82beaaa11a
line wrap: on
line source

#!/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