Reverse the way backout is doing the merge Currently, backout is creating a backout revision as a child node of the backed out node and will leave you at this new head. This has several drawbacks: * this changes the current head * when there is a long history between the backed out node and the current head, this will generate a huge number of diffs that are scary at first sight, and not very natural to review before commit. The change consists to switch back to the original node as soon as the backout node (which becomes the new tip) has been created. Then the --merge option can just merge this new tip in the current node. * the current head/node is not changed from the user's point of view * even without using the --merge option, the backout revision is still easy to locate, as this is the tip * the merge is much more intuitive as diffs of the merge is right you are looking to backout

     1

#!/bin/sh

     2

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

     3

     4

echo % file replaced with directory

     5

     6

hg init a

     7

cd a

     8

echo a > a

     9

hg commit -Ama

    10

rm a

    11

mkdir a

    12

echo a > a/a

    13

    14

echo % should fail - would corrupt dirstate

    15

hg add a/a

    16

    17

cd ..

    18

    19

echo % directory replaced with file

    20

    21

hg init c

    22

cd c

    23

mkdir a

    24

echo a > a/a

    25

hg commit -Ama

    26

    27

rm -r a

    28

echo a > a

    29

    30

echo % should fail - would corrupt dirstate

    31

hg add a

    32

    33

cd ..

    34

    35

echo % directory replaced with file

    36

    37

hg init d

    38

cd d

    39

mkdir b

    40

mkdir b/c

    41

echo a > b/c/d

    42

hg commit -Ama

    43

rm -r b

    44

echo a > b

    45

    46

echo % should fail - would corrupt dirstate

    47

hg add b

    48

    49

exit 0