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

echo "[extensions]" >> $HGRCPATH

     4

echo "mq=" >> $HGRCPATH

     5

     6

hg init a

     7

cd a

     8

echo a > a

     9

hg ci -Ama

    10

    11

hg qnew a.patch

    12

echo a >> a

    13

hg qrefresh

    14

    15

hg qnew b.patch

    16

echo b > b

    17

hg add b

    18

hg qrefresh

    19

    20

hg qnew c.patch

    21

echo c > c

    22

hg add c

    23

hg qrefresh

    24

    25

hg qgoto a.patch

    26

hg qgoto c.patch

    27

hg qgoto b.patch