view tests/test-changelog-exec @ 6486:960bc707ea10

doc: escape .hg at bol in manpages with make (issue1072) This works around a bug in old docbook stylesheets. Remove .*.swp example from hgignore.5.txt. Diagnosis and workaround thanks to Alexis S. L. Carvalho.
author Christian Ebert <blacktrash@gmx.net>
date Mon, 07 Apr 2008 09:02:04 +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