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

mkdir t

     4

cd t

     5

hg init

     6

echo This is file a1 > a

     7

echo This is file b1 > b

     8

hg add a b

     9

hg commit -m "commit #0" -d "0 0"

    10

echo This is file b22 > b

    11

hg commit -m"comment #1" -d "0 0"

    12

hg update 0

    13

rm b

    14

hg commit -A -m"comment #2" -d "0 0"

    15

# in theory, we shouldn't need the "yes k" below, but it prevents

    16

# this test from hanging when "hg update" erroneously prompts the

    17

# user for "keep or delete"

    18

yes k | hg update 1

    19

# we exit with 0 to avoid the unavoidable SIGPIPE from above causing

    20

# us to fail this test

    21

exit 0