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

cat > $HGRCPATH <<EOF

     4

[extensions]

     5

alias=

     6

     7

[alias]

     8

myinit = init

     9

cleanstatus = status -c

    10

unknown = bargle

    11

ambiguous = s

    12

recursive = recursive

    13

EOF

    14

    15

echo '% basic'

    16

hg myinit alias

    17

    18

echo '% unknown'

    19

hg unknown

    20

    21

echo '% ambiguous'

    22

hg ambiguous

    23

    24

echo '% recursive'

    25

hg recursive

    26

    27

cd alias

    28

echo foo > foo

    29

hg ci -Amfoo

    30

    31

echo '% with opts'

    32

hg cleanst