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

# http://www.selenic.com/mercurial/bts/issue352

     3

     4

"$TESTDIR/hghave" eol-in-paths || exit 80

     5

     6

hg init foo

     7

cd foo

     8

     9

A=`printf 'he\rllo'`

    10

    11

echo foo > "$A"

    12

hg add

    13

hg ci -A -m m

    14

rm "$A"

    15

    16

echo foo > "hell

    17

o"

    18

hg add

    19

hg ci -A -m m

    20

    21

echo foo > "$A"

    22

hg debugwalk

    23

    24

exit 0