view tests/test-changelog-exec @ 9313:8736b1c853ff

notify: do not mime encode multipart templates Mulitpart templates should take care of this themselves. See http://www.selenic.com/pipermail/mercurial/2009-July/027017.html Also catch potential parsing errors gracefully.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 05 Aug 2009 17:19:08 +0200
parents 6c82beaaa11a
children
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'

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