Fix up test-merge1 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-merge1 The third test was wrong and showed up after fixing the typo in compare code manifest hash: 306ab9936457ad90e7c7a226d6407ca586262650 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuPH8ywK+sNU5EO8RAql+AJsH/bxFMTMbUiaEoLNhXS6wNkzLAgCfQxDJ 3j5pZ3MzrtPD0y4wC3vIAA4= =VKEy -----END PGP SIGNATURE-----

     1

#!/bin/bash

     2

     3

set -ex

     4

     5

mkdir test

     6

cd test

     7

echo foo>foo

     8

hg init

     9

hg addremove

    10

hg commit -t "1"

    11

hg verify

    12

cd ..

    13

    14

mkdir branch

    15

cd branch

    16

hg init ../test

    17

hg co

    18

echo bar>>foo

    19

hg commit -t "2"

    20

    21

cd ../test

    22

hg pull ../branch

    23

hg verify

    24

hg co

    25

cat foo

    26

hg manifest