tests/test-flags
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 23 Jul 2005 17:14:05 +0100
changeset 792 49ec802b4a16
parent 749 7e4843b7efd2
child 800 ec85f9e6f3b1
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rwxr-xr-x
Added tests for bug with three-way-merging of old tip, tip and cwd.

#!/bin/sh -ex

umask 027
mkdir test1
cd test1

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

cd ..
mkdir test2
cd test2

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

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

hg pull ../test2
hg heads
hg history

hg -v co -m

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