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

echo "nothing" > a

     5

hg add a

     6

hg commit -m ancestor -d "0 0"

     7

echo "something" > a

     8

hg commit -m branch1 -d "0 0"

     9

hg co 0

    10

echo "something else" > a

    11

hg commit -m branch2 -d "0 0"

    12

HGMERGE=merge; export HGMERGE

    13

hg up -m 1

    14

hg id

    15

grep -Ev ">>>|<<<" a

    16

hg status