dirstate.statwalk: explicitly test for ignored directories This removes a hack where we appended '/' to a dirname so that: - it would not appear on the "dc" dict - it would always be matched by the match function This was a contorted way of checking if the directory was matched by some hgignore pattern, and it would still fail with some uses of --include/--exclude patterns. Things would still work fine if we removed the check altogether and just appended things to "work" directly, but then we would end up walking ignored directories too, which could be quite a bit of work. This allows further simplification of the match function returned by util._matcher, and fixes walking the working directory with a --include pattern that matches only the end of a name.

     1

#!/bin/sh

     2

#

     3

# test for branch handling

     4

#

     5

# XXX: need more tests

     6

     7

hg init

     8

echo a > a

     9

echo b > b

    10

hg ci -A -m 0 -d "1000000 0"

    11

echo aa > a

    12

echo bb > b

    13

hg ci -m 1 -d "1000000 0"

    14

hg tag -l foo

    15

hg update 0

    16

hg parents -b 

    17

    18

# test update

    19

hg update -b foo

    20

hg parents

    21

    22

# test merge

    23

hg update 0

    24

echo c > c

    25

hg ci -A -m 0.0 -d "1000000 0"

    26

hg merge -b foo

    27

hg parents -b 

    28

    29

# re-test with more branches

    30

hg update -C 0

    31

echo d > d

    32

hg ci -A -m 0.0 -d "1000000 0"

    33

hg merge -b foo

    34

hg parents -b