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

hg

     4

hg -q

     5

hg help

     6

hg -q help

     7

hg add -h

     8

hg add --skjdfks

     9

hg help diff

    10

hg help status

    11

hg -q help status

    12

hg help foo

    13

hg skjdfks

    14

    15

exit 0