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

#require execbit

     2

     3

b51a8138292a introduced a regression where we would mention in the

     4

changelog executable files added by the second parent of a merge. Test

     5

that that doesn't happen anymore

     6

     7

  $ hg init repo

     8

  $ cd repo

     9

  $ echo foo > foo

    10

  $ hg ci -qAm 'add foo'

    11

    12

  $ echo bar > bar

    13

  $ chmod +x bar

    14

  $ hg ci -qAm 'add bar'

    15

    16

manifest of p2:

    17

    18

  $ hg manifest

    19

  bar

    20

  foo

    21

    22

  $ hg up -qC 0

    23

  $ echo >> foo

    24

  $ hg ci -m 'change foo'

    25

  created new head

    26

    27

manifest of p1:

    28

    29

  $ hg manifest

    30

  foo

    31

    32

  $ hg merge

    33

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

    34

  (branch merge, don't forget to commit)

    35

  $ chmod +x foo

    36

  $ hg ci -m 'merge'

    37

    38

this should not mention bar but should mention foo:

    39

    40

  $ hg tip -v

    41

  changeset:   3:c53d17ff3380

    42

  tag:         tip

    43

  parent:      2:ed1b79f46b9a

    44

  parent:      1:d394a8db219b

    45

  user:        test

    46

  date:        Thu Jan 01 00:00:00 1970 +0000

    47

  files:       foo

    48

  description:

    49

  merge

    50

    51

    52

    53

  $ hg debugindex bar

    54

     rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

    55

       0         0       5  .....       1 b004912a8510 000000000000 000000000000 (re)

    56

    57

  $ cd ..