Fix undo after aborted commit bug Commit would overwrite undo.dirstate unconditionally, so an undo after an aborted commit would restore the dirstate from the aborted commit and not the prior transaction. This copies dirstate to journal.dirstate and moves it after a successful transaction.

     1

#!/bin/sh

     2

     3

mkdir a

     4

cd a

     5

hg init

     6

echo 123 > a

     7

hg add a

     8

hg commit -m "a" -u a -d "0 0"

     9

    10

cd ..

    11

mkdir b

    12

cd b

    13

hg init 

    14

echo 321 > b

    15

hg add b

    16

hg commit -m "b" -u b -d "0 0"

    17

    18

hg pull ../a

    19

hg heads