Pull from TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Pull from TAH
manifest hash: 600d04efbd836d555d11a3bd9d821d1d8c0a9790
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuPFxywK+sNU5EO8RAjfzAKC18Zc2EOkXhy1zcpgGnyPHnFMdmgCfW5Ut
I5HSWqZMt8H0WJx1Or7ajNc=
=27D5
-----END PGP SIGNATURE-----
#!/bin/sh +ex
mkdir test1
cd test1
hg init
touch a b
hg add a b
hg ci -t "added a b" -u test -d "0 0"
cd ..
mkdir test2
cd test2
hg init
hg merge ../test1
hg co
chmod +x a
hg ci -t "chmod +x a" -u test -d "0 0"
cd ../test1
echo 123 >>a
hg ci -t "a updated" -u test -d "0 0"
hg merge ../test2
hg heads
hg history
hg -dv co -m
ls -l ../test[12]/a > foo
cut -b 0-10 < foo