Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.

     1

#!/bin/sh

     2

     3

mkdir t

     4

cd t

     5

hg init

     6

     7

echo 1 > a

     8

hg ci -qAm "first" -d "1000000 0"

     9

    10

hg cp a b

    11

hg mv a c

    12

echo 2 >> b

    13

echo 2 >> c

    14

    15

hg ci -qAm "second" -d "1000000 0"

    16

    17

hg co -C 0

    18

    19

echo 0 > a

    20

echo 1 >> a

    21

    22

hg ci -qAm "other" -d "1000000 0"

    23

    24

hg merge --debug

    25

    26

echo "-- b --"

    27

cat b

    28

    29

echo "-- c --"

    30

cat c