[PATCH] treemanifest: don't use cp -T, not supported on OS X

Martijn Pieters mj at zopatista.com
Thu Feb 11 13:50:47 UTC 2016


# HG changeset patch
# User Martijn Pieters <mjpieters at fb.com>
# Date 1455198638 0
#      Thu Feb 11 13:50:38 2016 +0000
# Node ID 1005b7af928c450646d71b41da02af3b72933367
# Parent  fb91a65f102ca34d69961142ad84955080ada1fc
treemanifest: don't use cp -T, not supported on OS X

The OS X cp implementation has no -T switch. Copy directory contents using a
glob instead.

diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -418,7 +418,7 @@
   b/bar/orange/fly/gnat.py (glob)
   b/bar/orange/fly/housefly.txt (glob)
   b/foo/apple/bees/flower.py (glob)
-  $ cp -rT .hg/store-copy .hg/store
+  $ cp -r .hg/store-copy/* .hg/store
 
 Test files with just includes and excludes.
 
@@ -427,7 +427,7 @@
   $ rm -r .hg/store/meta/b/foo/apple/bees
   $ hg files -r . -I path:b/bar -X path:b/bar/orange/fly -I path:b/foo -X path:b/foo/apple/bees
   b/bar/fruits.txt (glob)
-  $ cp -rT .hg/store-copy .hg/store
+  $ cp -r .hg/store-copy/* .hg/store
 
 Test files for a subdirectory, excluding a directory within it.
 
@@ -437,7 +437,7 @@
   b/bar/fruits.txt (glob)
   b/bar/orange/fly/gnat.py (glob)
   b/bar/orange/fly/housefly.txt (glob)
-  $ cp -rT .hg/store-copy .hg/store
+  $ cp -r .hg/store-copy/* .hg/store
 
 Test files for a sub directory, including only a directory within it, and
 including an unrelated directory.
@@ -447,7 +447,7 @@
   $ hg files -r . -I path:b/bar/orange -I path:a b
   b/bar/orange/fly/gnat.py (glob)
   b/bar/orange/fly/housefly.txt (glob)
-  $ cp -rT .hg/store-copy .hg/store
+  $ cp -r .hg/store-copy/* .hg/store
 
 Test files for a pattern, including a directory, and excluding a directory
 within that.
@@ -457,7 +457,7 @@
   $ rm -r .hg/store/meta/b/bar/orange
   $ hg files -r . glob:**.txt -I path:b/bar -X path:b/bar/orange
   b/bar/fruits.txt (glob)
-  $ cp -rT .hg/store-copy .hg/store
+  $ cp -r .hg/store-copy/* .hg/store
 
 Add some more changes to the deep repo
   $ echo narf >> b/bar/fruits.txt


More information about the Mercurial-devel mailing list