tests: remove (glob) annotations that were only for '\' matches # skip-blame because this was mechanically rewritten the following script. I ran it on both *.t and *.py, but none of the *.py changes were proper. All *.t ones appear to be, and they run without addition failures on both Windows and Linux. import argparse import os import re ap = argparse.ArgumentParser() ap.add_argument('path', nargs='+') opts = ap.parse_args() globre = re.compile(r'^(.*) \(glob\)(.*)$') for p in opts.path: tmp = p + '.tmp' with open(p, 'rb') as src, open(tmp, 'wb') as dst: for line in src: m = globre.match(line) if not m or '$LOCALIP' in line or '*' in line: dst.write(line) continue if '?' in line[:-3] or ('?' in line[:-3] and line[-3:] != '(?)'): dst.write(line) continue dst.write(m.group(1) + m.group(2) + '\n') os.unlink(p) os.rename(tmp, p)

     1

https://bz.mercurial-scm.org/612

     2

     3

  $ hg init

     4

  $ mkdir src

     5

  $ echo a > src/a.c

     6

  $ hg ci -Ama

     7

  adding src/a.c

     8

     9

  $ hg mv src source

    10

  moving src/a.c to source/a.c

    11

    12

  $ hg ci -Ammove

    13

    14

  $ hg co -C 0

    15

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

    16

    17

  $ echo new > src/a.c

    18

  $ echo compiled > src/a.o

    19

  $ hg ci -mupdate

    20

  created new head

    21

    22

  $ hg status

    23

  ? src/a.o

    24

    25

  $ hg merge

    26

  merging src/a.c and source/a.c to source/a.c

    27

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

    28

  (branch merge, don't forget to commit)

    29

    30

  $ hg status

    31

  M source/a.c

    32

  R src/a.c

    33

  ? src/a.o

    34