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

echo a > a

     7

hg add a

     8

hg commit -m "test" -d "1000000 0"

     9

hg verify

    10

hg parents

    11

hg status

    12

hg rollback

    13

hg verify

    14

hg parents

    15

hg status