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

# test for issue351

     4

     5

# Environement setup for MQ

     6

echo "[extensions]" >> $HGRCPATH

     7

echo "mq=" >> $HGRCPATH

     8

     9

#Repo init

    10

hg init

    11

hg qinit

    12

    13

echo b > b

    14

hg ci -A -m foo

    15

echo cc > b

    16

hg qnew -f foo.diff

    17

echo b > b

    18

hg qrefresh

    19

hg debugindex .hg/store/data/b.i