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/sh +ex

     2

     3

mkdir test1

     4

cd test1

     5

     6

hg init

     7

touch a b

     8

hg add a b

     9

hg ci -t "added a b" -u test -d "0 0"

    10

    11

cd ..

    12

mkdir test2

    13

cd test2

    14

    15

hg init

    16

hg merge ../test1

    17

hg co

    18

chmod +x a

    19

hg ci -t "chmod +x a" -u test -d "0 0"

    20

    21

cd ../test1

    22

echo 123 >>a

    23

hg ci -t "a updated" -u test -d "0 0"

    24

    25

hg merge ../test2

    26

hg heads

    27

hg history

    28

    29

hg -dv co -m

    30

    31

ls -l ../test[12]/a > foo

    32

cut -b 0-10 < foo

    33