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

# test command parsing and dispatch

     3

     4

hg init a

     5

cd a

     6

echo a > a

     7

hg ci -Ama -d '0 0'

     8

     9

echo "# missing arg"

    10

hg cat

    11

    12

echo '% [defaults]'

    13

hg cat a

    14

cat > $HGRCPATH <<EOF

    15

[defaults]

    16

cat = -v

    17

EOF

    18

hg cat a

    19

    20

echo '% no repo'

    21

cd ..

    22

hg cat

    23

    24

exit 0

    25