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

mkdir alpha

     6

touch alpha/one

     7

mkdir beta

     8

touch beta/two

     9

    10

hg add alpha/one beta/two

    11

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

    12

    13

echo 1 > alpha/one

    14

echo 2 > beta/two

    15

    16

echo EVERYTHING

    17

hg diff --nodates

    18

    19

echo BETA ONLY

    20

hg diff --nodates beta

    21

    22

echo INSIDE BETA

    23

cd beta

    24

hg diff --nodates .