tests: replace "cp -r" with "cp -R" The POSIX documentation about "cp" [1] says: .... RATIONALE .... Earlier versions of this standard included support for the -r option to copy file hierarchies. The -r option is historical practice on BSD and BSD-derived systems. This option is no longer specified by POSIX.1-2008 but may be present in some implementations. The -R option was added as a close synonym to the -r option, selected for consistency with all other options in this volume of POSIX.1-2008 that do recursive directory descent. The difference between -R and the removed -r option is in the treatment by cp of file types other than regular and directory. It was implementation-defined how the - option treated special files to allow both historical implementations and those that chose to support -r with the same abilities as -R defined by this volume of POSIX.1-2008. The original -r flag, for historic reasons, did not handle special files any differently from regular files, but always read the file and copied its contents. This had obvious problems in the presence of special file types; for example, character devices, FIFOs, and sockets. .... .... Issue 6 The -r option is marked obsolescent. .... Issue 7 .... The obsolescent -r option is removed. .... (No "Issue 8" yet) Therefore it's clear that "cp -R" is strictly better than "cp -r". The issue was discovered when running tests on OS X after 0d87b1caed92. [1]: pubs.opengroup.org/onlinepubs/9699919799/utilities/cp.html

     1

Failed qimport of patches from files should cleanup by recording successfully

     2

imported patches in series file.

     3

     4

  $ echo "[extensions]" >> $HGRCPATH

     5

  $ echo "mq=" >> $HGRCPATH

     6

  $ hg init repo

     7

  $ cd repo

     8

  $ echo a > a

     9

  $ hg ci -Am'add a'

    10

  adding a

    11

  $ cat >b.patch<<EOF

    12

  > diff --git a/a b/a

    13

  > --- a/a

    14

  > +++ b/a

    15

  > @@ -1,1 +1,2 @@

    16

  >  a

    17

  > +b

    18

  > EOF

    19

    20

empty series

    21

    22

  $ hg qseries

    23

    24

qimport valid patch followed by invalid patch

    25

    26

  $ hg qimport b.patch fakepatch

    27

  adding b.patch to series file

    28

  abort: unable to read file fakepatch

    29

  [255]

    30

    31

valid patches before fail added to series

    32

    33

  $ hg qseries

    34

  b.patch

    35

    36

  $ hg pull -q -r 0 . # update phase

    37

  $ hg qimport -r 0

    38

  abort: revision 0 is not mutable

    39

  (see 'hg help phases' for details)

    40

  [255]

    41

    42

  $ cd ..