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

set -ex

     4

     5

mkdir test

     6

cd test

     7

echo foo>foo

     8

hg init

     9

hg addremove

    10

hg commit -m "1"

    11

hg verify

    12

    13

hg clone . ../branch

    14

cd ../branch

    15

hg co

    16

echo bar>>foo

    17

hg commit -m "2"

    18

    19

cd ../test

    20

hg pull ../branch

    21

hg verify

    22

hg co

    23

cat foo

    24

hg manifest