Mark the usual things executable -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Mark the usual things executable manifest hash: e55dde46fd1a97ce338c1ac71278b67ca9d96bf7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpz5RywK+sNU5EO8RAnypAJwLpjrQ09nMSJUELtCondHI0fvuVACfQu2J mFi9D3L9ULGO457NWB4h3kY= =3bcD -----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