view tests/test-changelog-exec @ 10827:b66388f6adfa

color: don't split colors across lines (which confuses less -R) Currently, less -R doesn't support colors spanning multiple lines; only the first line will be colorized. Instead of allowing colors to span multiple lines, the color extension now applies colors to each line it receives, even when ui.write() is given multiple lines in one call.
author Brodie Rao <brodie@bitheap.org>
date Fri, 02 Apr 2010 15:22:19 -0500
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