view tests/test-pull-update @ 7172:fb1d7a42663c

Use dummy diffstat in tests and remove older diffstat workaround.

This makes test-notify pass on systems without diffstat installed
or where the diffstat version yields a different output.

#!/bin/sh
#

hg init t
cd t
echo 1 > foo
hg ci -Am m

cd ..
hg clone t tt
cd tt
echo 1.1 > foo
hg ci -Am m

cd ../t
echo 1.2 > foo
hg ci -Am m
echo % should fail
hg pull -u ../tt

cd ../tt
echo % should fail
hg pull -u ../t
HGMERGE=true hg merge
hg ci -mm

cd ../t
echo % should work
hg pull -u ../tt