Mercurial > hg-stable
changeset 28335:515018f64c41
tests: Solaris cp doesn't support the -T option
The treemanifest tests use the -T option to cp in order to ensure that the
two directories named on the commandline are treated as peers, rather than
the usual behavior when the final argument is a directory. GNU cp has this
option, but other implementations may not. Thankfully, there's no pressing
reason to use it. We can simply copy the contents of the first directory
into the target directory, since we know that the target directory already
exists.
| author | Danek Duvall <danek.duvall@oracle.com> |
|---|---|
| date | Wed, 02 Mar 2016 14:50:37 -0800 |
| parents | 9dc340f51e06 |
| children | a5a13eeffc59 |
| files | tests/test-treemanifest.t |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-treemanifest.t Sun Feb 14 13:36:50 2016 +0900 +++ b/tests/test-treemanifest.t Wed Mar 02 14:50:37 2016 -0800 @@ -541,7 +541,7 @@ 8 integrity errors encountered! (first damaged changeset appears to be 0) [1] - $ cp -rT .hg/store-newcopy .hg/store + $ cp -r .hg/store-newcopy/. .hg/store Verify reports missing dirlog entry $ mv -f .hg/store-copy/meta/b/00manifest.* .hg/store/meta/b/ @@ -566,7 +566,7 @@ 8 integrity errors encountered! (first damaged changeset appears to be 1) [1] - $ cp -rT .hg/store-newcopy .hg/store + $ cp -r .hg/store-newcopy/. .hg/store Test cloning a treemanifest repo over http. $ hg serve -p $HGPORT -d --pid-file=hg.pid --errorlog=errors.log