view tests/test-flags @ 2409:4068d6a7a99e

Fix diff header (line endings) for failed test output in run-tests.py.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 08 Jun 2006 15:06:31 +0200
parents e506c14382fd
children 455109df3669
line wrap: on
line source

#!/bin/sh -e

umask 027
mkdir test1
cd test1

hg init
touch a b
hg add a b
hg ci -m "added a b" -d "1000000 0"

cd ..
mkdir test2
cd test2

hg init
hg pull ../test1
hg co
chmod +x a
hg ci -m "chmod +x a" -d "1000000 0"

cd ../test1
echo 123 >>a
hg ci -m "a updated" -d "1000000 0"

hg pull ../test2
hg heads
hg history

hg -v merge

ls -l ../test[12]/a > foo
cut -b 1-10 < foo