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

hg init

     4

     5

echo % should fail

     6

hg add .hg/00changelog.i

     7

     8

mkdir a

     9

echo a > a/a

    10

hg ci -Ama

    11

ln -s a b

    12

echo b > a/b

    13

    14

echo % should fail

    15

hg add b/b

    16

    17

echo % should succeed

    18

hg add b

    19

    20

echo % should still fail - maybe

    21

hg add b/b

    22

    23

exit 0