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 changeset ba7c74081861

     4

# (update dirstate correctly for non-branchmerge updates)

     5

hg init a

     6

cd a

     7

echo a > a

     8

hg add a

     9

hg commit -m a

    10

cd ..

    11

hg clone a b

    12

cd a

    13

hg mv a b

    14

hg commit -m move

    15

echo b >> b

    16

hg commit -m b

    17

cd ../b

    18

hg pull ../a

    19

hg update