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

pulling from ../B1

     2

searching for changes

     3

adding changesets

     4

adding manifests

     5

adding file changes

     6

added 1 changesets with 1 changes to 1 files (+1 heads)

     7

(run 'hg update' to get a working copy)

     8

bar should remain deleted.

     9

f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo

    10

pulling from ../A2

    11

searching for changes

    12

adding changesets

    13

adding manifests

    14

adding file changes

    15

added 1 changesets with 0 changes to 0 files (+1 heads)

    16

(run 'hg update' to get a working copy)

    17

bar should remain deleted.

    18

f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo