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

hg --debug init

     3

echo this is a1 > a

     4

hg add a

     5

hg commit -m0 -d "0 0" 

     6

echo this is b1 > b

     7

hg add b

     8

hg commit -m1 -d "0 0" 

     9

hg manifest 1

    10

echo this is c1 > c

    11

hg rawcommit -p 1 -d "0 0" -m2 c

    12

hg manifest 2

    13

hg parents

    14

rm b

    15

hg rawcommit -p 2 -d "0 0" -m3 b

    16

hg manifest 3

    17

hg parents

    18

echo this is a22 > a

    19

hg rawcommit -p 3 -d "0 0" -m4 a

    20

hg manifest 4

    21

hg parents

    22

echo this is c22 > c

    23

hg rawcommit -p 1 -d "0 0" -m5 c

    24

hg manifest 5

    25

hg parents

    26

# merge, but no files changed

    27

hg rawcommit -p 4 -p 5 -d "0 0" -m6

    28

hg manifest 6

    29

hg parents

    30

# no changes what-so-ever

    31

hg rawcommit -p 6 -d "0 0" -m7

    32

hg manifest 7

    33

hg parents