fix parsing of tags. make parse errors useful. add new tag tests. old code read every head of .hgtags. delete and recreate of .hgtags gave new head, but if error in deleted rev, .hgtags had error messages every time it was parsed. this was very hard to fix, because deleted revs hard to get back and update, needed merges too. new code reads .hgtags on every head. advantage is if parse error happens with new code, is possible to fix them by editing .hgtags on a head and committing. NOTE: new code uses binary search of manifest of each head to be fast, but still much slower than old code. best thing would be to have delete record stored in filelog so we never touch manifest. could find live heads directly from filelog. this is more work than i want now. new tests check for parse of tags on different heads, and inaccessible heads created by delete and recreate of .hgtags.

     1

#!/bin/sh

     2

     3

cat <<'EOF' > merge

     4

#!/bin/sh

     5

echo merging for `basename $1`

     6

EOF

     7

chmod +x merge

     8

HGMERGE=./merge; export HGMERGE

     9

    10

mkdir A1

    11

cd A1

    12

hg init

    13

echo This is file foo1 > foo

    14

echo This is file bar1 > bar

    15

hg add foo bar

    16

hg commit -m "commit text" -d "1000000 0"

    17

    18

cd ..

    19

hg clone A1 B1

    20

    21

cd A1

    22

rm bar

    23

hg remove bar

    24

hg commit -m "commit test" -d "1000000 0"

    25

    26

cd ../B1

    27

echo This is file foo22 > foo

    28

hg commit -m "commit test" -d "1000000 0"

    29

    30

cd ..

    31

hg clone A1 A2

    32

hg clone B1 B2

    33

    34

cd A1

    35

hg pull ../B1

    36

hg merge

    37

hg commit -m "commit test" -d "1000000 0"

    38

echo bar should remain deleted.

    39

hg manifest

    40

    41

cd ../B2

    42

hg pull ../A2

    43

hg merge

    44

hg commit -m "commit test" -d "1000000 0"

    45

echo bar should remain deleted.

    46

hg manifest