Switch to new syntax for .hgignore files. Here is the new syntax, in summary. Trailing white space is dropped. The escape character is "\". Comments start with #. Empty lines are skipped. Lines can be of the following formats: syntax: regexp # defaults following lines to non-rooted regexps syntax: glob # defaults following lines to non-rooted globs re:pattern # non-rooted regular expression glob:pattern # non-rooted glob pattern # pattern of the current default type The default pattern type is regexp, which is completely backwards compatible with the old hgignore syntax. In the dirstate class, the ignore method has been reworked to be based on the util.matcher function, by way of a new dirstate.hgignore method.

     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 "0 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 "0 0"

    25

    26

cd ../B1

    27

echo This is file foo22 > foo

    28

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

    29

    30

cd ..

    31

hg clone A1 A2

    32

hg clone B1 B2

    33

    34

cd A1

    35

hg pull ../B1

    36

hg update -m

    37

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

    38

echo bar should remain deleted.

    39

hg manifest

    40

    41

cd ../B2

    42

hg pull ../A2

    43

hg update -m

    44

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

    45

echo bar should remain deleted.

    46

hg manifest