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 a

     4

cd a

     5

echo bar > foo

     6

hg add foo

     7

hg ci -m 'add foo' -d '1000000 0'

     8

     9

echo foobar > foo

    10

hg ci -m 'change foo' -d '1000001 0'

    11

    12

echo 'quiet:'

    13

hg --quiet diff -r 0 -r 1

    14

echo

    15

    16

echo 'normal:'

    17

hg diff -r 0 -r 1

    18

echo

    19

    20

echo 'verbose:'

    21

hg --verbose diff -r 0 -r 1

    22

echo

    23

    24

echo 'debug:'

    25

hg --debug diff -r 0 -r 1

    26

echo