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-----

     1

+ hg init

     2

+ echo nothing

     3

+ hg add a

     4

+ hg commit -t ancestor -u test -d '0 0'

     5

+ echo something

     6

+ hg commit -t branch1 -u test -d '0 0'

     7

+ hg co 0

     8

+ echo 'something else'

     9

+ hg commit -t branch2 -u test -d '0 0'

    10

+ export HGMERGE=merge

    11

+ HGMERGE=merge

    12

+ hg up -m 1

    13

merge: warning: conflicts during merge

    14

merging a

    15

merging a failed!

    16

+ hg id

    17

32e80765d7fe+75234512624c+ tip

    18

+ grep -Ev '>>>|<<<' a

    19

something else

    20

=======

    21

something

    22

+ hg status

    23

C a

    24

? .out