tests/test-issue619
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 02 Sep 2008 15:08:26 +0200
changeset 6971 b3bc518a73c3
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
performance: do not stat() things when not required Ignore unknown files if we don't need them (eg in hg diff). It slows things down a little bit for big trees (kernel repo), since _join() is called for each file instead of for each directory. fix issue567

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done