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 init a

     4

echo a > a/a

     5

hg --cwd a ci -Ama

     6

     7

hg clone a c

     8

     9

hg clone a b

    10

echo b >> b/a

    11

hg --cwd b ci -mb

    12

    13

echo % push should push to default when default-push not set

    14

hg --cwd b push | sed 's/pushing to.*/pushing/'

    15

    16

echo % push should push to default-push when set

    17

echo 'default-push = ../c' >> b/.hg/hgrc

    18

hg --cwd b push | sed 's/pushing to.*/pushing/'