fileset: add kind:pat operator ":" isn't taken as a symbol character but an infix operator so we can write e.g. "path:'foo bar'" as well as "'path:foo bar'". An invalid pattern kind is rejected in the former form as we know a kind is specified explicitly. The binding strength is copied from "x:y" range operator of revset. Perhaps it can be adjusted later if we want to parse "foo:bar()" as "(foo:bar)()", not "foo:(bar())". We can also add "kind:" postfix operator if we want. One possible confusion is that the scope of the leading "set:" vs "kind:pat" operator. The former is consumed by a matcher so applies to the whole fileset expression: $ hg files 'set:foo() or kind:bar or baz' ^^^^^^^^^^^^^^^^^^^^^^^^ Whereas the scope of kind:pat operator is narrow: $ hg files 'set:foo() or kind:bar or baz' ^^^

     1

  $ hg init base

     2

     3

  $ cd base

     4

  $ echo 'alpha' > alpha

     5

  $ hg ci -A -m 'add alpha'

     6

  adding alpha

     7

  $ cd ..

     8

     9

  $ hg clone base work

    10

  updating to branch default

    11

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    12

    13

  $ cd work

    14

  $ echo 'beta' > beta

    15

  $ hg ci -A -m 'add beta'

    16

  adding beta

    17

  $ cd ..

    18

    19

  $ cd base

    20

  $ echo 'gamma' > gamma

    21

  $ hg ci -A -m 'add gamma'

    22

  adding gamma

    23

  $ cd ..

    24

    25

  $ cd work

    26

  $ hg pull -q

    27

  $ hg merge

    28

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    29

  (branch merge, don't forget to commit)

    30

    31

Update --clean to revision 1 to simulate a failed merge:

    32

    33

  $ rm alpha beta gamma

    34

  $ hg update --clean 1

    35

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    36

    37

  $ cd ..