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

touch unknown

     5

     6

touch a

     7

hg add a

     8

hg ci -m "1" -d "1000000 0"

     9

    10

touch b

    11

hg add b

    12

hg ci -m "2" -d "1000000 0"

    13

    14

echo %% Should show unknown

    15

hg status

    16

hg revert -r 0 --all

    17

echo %% Should show unknown and b removed

    18

hg status

    19

echo %% Should show a and unknown

    20

ls