Fix hg import fix -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix hg import fix Spotted by TAH. manifest hash: f8d648c43c090537d3af1a79cc53784357a2f057 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp9umywK+sNU5EO8RAkovAKCwRyUN7HOEFTnqK8OJ3zVY+CYEHACgtj5f naeGpDbq0haT628rPDbtAB0= =W8Zf -----END PGP SIGNATURE-----

     1

set -ex

     2

export EDITOR=true

     3

rm -rf test branch

     4

     5

mkdir test

     6

cd test

     7

echo foo>foo

     8

hg init

     9

hg addremove

    10

hg commit

    11

hg verify

    12

cd ..

    13

    14

cp -a test branch

    15

cd branch

    16

echo bar>>foo

    17

hg commit

    18

    19

cd ../test

    20

hg merge ../branch

    21

hg verify

    22