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

     6

hg init

     7

mkdir src

     8

echo a > src/a.c

     9

hg ci -Ama -d "10000000 0"

    10

    11

hg mv src source

    12

hg ci -Ammove -d "1000000 0"

    13

    14

hg co -C 0

    15

echo new > src/a.c

    16

echo compiled > src/a.o

    17

hg ci -mupdate -d "1000000 0"

    18

    19

hg st

    20

    21

hg merge

    22

    23

hg st

    24