[PATCH] Enables lock work under the other 'OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Enables lock work under the other 'OS' From: K Thananchayan <thananck@yahoo.com> os.symlink is not supported under Windows. This patch introduces util.mklockf, util.getlowner that use regular files under Winodws but symlink under unix. tweaked by mpm: - changed function names - fixed to work on UNIX manifest hash: 6f650a78a3b203dcad2f861582500b6b4036599a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuN5sywK+sNU5EO8RAva8AJ9L9z/JHRAJS1bix48ZzSpn9ZUyPwCffhmg UfLSFBmd5tPDDi3mgsrdDEA= =ZYS9 -----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