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 -x

     4

hg init

     5

echo a > a

     6

hg add a

     7

hg commit -t "1" -u test -d "0 0"

     8

hg status

     9

cp a b

    10

hg copy a b

    11

hg status

    12

hg -d commit -t "2" -u test -d "0 0"

    13

hg history

    14

hg log a

    15

hexdump -C .hg/data/b.d

    16

hg cat b | md5sum

    17

hg cat a | md5sum

    18

hg verify