Binary file tests/bundles/darcs1.hg has changed
Binary file tests/bundles/legacy-encoding.hg has changed
Binary file tests/bundles/tampered.hg has changed
Binary file tests/bundles/test-keyword.hg has changed
Binary file tests/bundles/test-manifest.hg has changed
Binary file tests/bundles/test-merge-symlinks.hg has changed
Binary file tests/bundles/test-no-symlinks.hg has changed
Binary file tests/darcs1.hg has changed
Binary file tests/legacy-encoding.hg has changed
Binary file tests/tampered.hg has changed
--- a/tests/test-audit-path.t Sat Apr 30 17:38:06 2011 +0200
+++ b/tests/test-audit-path.t Sat Apr 30 17:38:06 2011 +0200
@@ -33,7 +33,7 @@
$ hg init target
$ cd target
- $ hg unbundle $TESTDIR/tampered.hg
+ $ hg unbundle $TESTDIR/bundles/tampered.hg
adding changesets
adding manifests
adding file changes
--- a/tests/test-convert-darcs.t Sat Apr 30 17:38:06 2011 +0200
+++ b/tests/test-convert-darcs.t Sat Apr 30 17:38:06 2011 +0200
@@ -16,7 +16,7 @@
try converting darcs1 repository
- $ hg clone -q "$TESTDIR/darcs1.hg" darcs
+ $ hg clone -q "$TESTDIR/bundles/darcs1.hg" darcs
$ hg convert -s darcs darcs/darcs1 2>&1 | grep darcs-1.0
darcs-1.0 repository format is unsupported, please upgrade
--- a/tests/test-encoding.t Sat Apr 30 17:38:06 2011 +0200
+++ b/tests/test-encoding.t Sat Apr 30 17:38:06 2011 +0200
@@ -5,7 +5,7 @@
we need a repo with some legacy latin-1 changesets
- $ hg unbundle $TESTDIR/legacy-encoding.hg
+ $ hg unbundle $TESTDIR/bundles/legacy-encoding.hg
adding changesets
adding manifests
adding file changes
Binary file tests/test-keyword.hg has changed
--- a/tests/test-keyword.t Sat Apr 30 17:38:06 2011 +0200
+++ b/tests/test-keyword.t Sat Apr 30 17:38:06 2011 +0200
@@ -78,7 +78,7 @@
hg ci -m addsym -u mercurial
hg bundle --base null ../test-keyword.hg
- $ hg pull -u "$TESTDIR"/test-keyword.hg
+ $ hg pull -u "$TESTDIR"/bundles/test-keyword.hg
pulling from *test-keyword.hg (glob)
requesting all changes
adding changesets
Binary file tests/test-manifest.hg has changed
--- a/tests/test-manifest.t Sat Apr 30 17:38:06 2011 +0200
+++ b/tests/test-manifest.t Sat Apr 30 17:38:06 2011 +0200
@@ -10,7 +10,7 @@
# hg ci -Amb -d'1 0'
$ hg init
- $ hg -q pull "$TESTDIR/test-manifest.hg"
+ $ hg -q pull "$TESTDIR/bundles/test-manifest.hg"
The next call is expected to return nothing:
Binary file tests/test-merge-symlinks.hg has changed
--- a/tests/test-merge-symlinks.t Sat Apr 30 17:38:06 2011 +0200
+++ b/tests/test-merge-symlinks.t Sat Apr 30 17:38:06 2011 +0200
@@ -30,7 +30,7 @@
$ hg init t
$ cd t
- $ hg -q pull "$TESTDIR/test-merge-symlinks.hg"
+ $ hg -q pull "$TESTDIR/bundles/test-merge-symlinks.hg"
$ hg up -C 3
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Binary file tests/test-no-symlinks.hg has changed
--- a/tests/test-no-symlinks.t Sat Apr 30 17:38:06 2011 +0200
+++ b/tests/test-no-symlinks.t Sat Apr 30 17:38:06 2011 +0200
@@ -16,7 +16,7 @@
$ hg init t
$ cd t
- $ hg pull -q "$TESTDIR/test-no-symlinks.hg"
+ $ hg pull -q "$TESTDIR/bundles/test-no-symlinks.hg"
$ hg update
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat a.lnk && echo
--- a/tests/test-symlink-os-yes-fs-no.py Sat Apr 30 17:38:06 2011 +0200
+++ b/tests/test-symlink-os-yes-fs-no.py Sat Apr 30 17:38:06 2011 +0200
@@ -2,6 +2,7 @@
from mercurial import hg, ui, commands
TESTDIR = os.environ["TESTDIR"]
+BUNDLEPATH = os.path.join(TESTDIR, 'bundles', 'test-no-symlinks.hg')
# only makes sense to test on os which supports symlinks
if not hasattr(os, "symlink"):
@@ -9,7 +10,7 @@
# clone with symlink support
u = ui.ui()
-hg.clone(u, os.path.join(TESTDIR, 'test-no-symlinks.hg'), 'test0')
+hg.clone(u, BUNDLEPATH, 'test0')
repo = hg.repository(u, 'test0')
@@ -38,4 +39,4 @@
# try cloning a repo which contains symlinks
u = ui.ui()
-hg.clone(u, os.path.join(TESTDIR, 'test-no-symlinks.hg'), 'test1')
+hg.clone(u, BUNDLEPATH, 'test1')