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

     2

     3

hg init

     4

echo a > a

     5

hg add a

     6

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

     7

hg history

     8

hg tag -u test -d "0 0" "bleah" 

     9

hg history

    10

    11

echo foo >> .hgtags

    12

hg tag -u test -d "0 0" "bleah2" || echo "failed" 

    13