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

hg init

     4

touch a

     5

hg add a

     6

hg commit -m "Added a" -d "0 0"

     7

     8

touch main

     9

hg add main

    10

hg commit -t "Added main" -d "0 0"

    11

hg checkout 0

    12

    13

echo Main should be gone

    14

ls

    15

    16

touch side1 

    17

hg add side1

    18

hg commit -m "Added side1" -d "0 0"

    19

touch side2

    20

hg add side2

    21

hg commit -m "Added side2" -d "0 0"

    22

    23

hg log

    24

    25

echo Should have two heads, side2 and main

    26

hg heads

    27

    28

echo Should show "a side1 side2"

    29

ls

    30

    31

hg update --debug -C 1

    32

echo Should only show "a main"

    33

ls

    34