Make makelock and readlock work on filesystems without symlink support. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make makelock and readlock work on filesystems without symlink support. This way you can have a repository on a fat partiton, e.g. a USB stick. manifest hash: cea2c120ef2b25a50c5d98b59648f773feefe470 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1t5yW7P1GVgWeRoRAsKjAJ9BFcn/EqBK/dmJ4BY1pPIZIbDDJACghN3p VCQS6CJ72MHpzhOOsnOpHzE= =laDT -----END PGP SIGNATURE-----

+ hg init
+ echo nothing
+ hg add a
+ hg commit -t ancestor -u test -d '0 0'
+ echo something
+ hg commit -t branch1 -u test -d '0 0'
+ hg co 0
+ echo 'something else'
+ hg commit -t branch2 -u test -d '0 0'
+ export HGMERGE=merge
+ HGMERGE=merge
+ hg up -m 1
merge: warning: conflicts during merge
merging a
merging a failed!
+ hg id
32e80765d7fe+75234512624c+ tip
+ grep -Ev '>>>|<<<' a
something else
=======
something
+ hg status
C a
? .out