purge: abort with missing files avoiding problems with name-mangling fs In a name mangling filesystem (e.g. a case insensitive one) dirstate.walk() can yield filenames different from the ones stored in the dirstate. This already confuses the status and add commands, but with purge this may cause data loss. To prevent this purge refuses to work if there are missing files and has a 'force' option if the user knows it is safe. Even with the force option purge checks if any of the missing files is still available in the working dir: if so there may be some problem with the underlying filesystem, so it unconditionally aborts.

     1

#!/bin/sh

     2

     3

mkdir t

     4

cd t

     5

hg init

     6

echo "[merge]" >> .hg/hgrc

     7

echo "followcopies = 1" >> .hg/hgrc

     8

echo foo > a

     9

echo foo > a2

    10

hg add a a2

    11

hg ci -m "start" -d "0 0"

    12

hg mv a b

    13

hg mv a2 b2

    14

hg ci -m "rename" -d "0 0"

    15

echo "checkout"

    16

hg co 0

    17

echo blahblah > a

    18

echo blahblah > a2

    19

hg mv a2 c2

    20

hg ci -m "modify" -d "0 0"

    21

echo "merge"

    22

hg merge -y --debug

    23

hg status -AC

    24

cat b

    25

hg ci -m "merge" -d "0 0"

    26

hg debugindex .hg/store/data/b.i

    27

hg debugrename b