diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
| commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
| tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /tests/test-pull.t | |
| parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
| parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
| download | mercurial-tarball-baserock/morph.tar.gz | |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'tests/test-pull.t')
| -rw-r--r-- | tests/test-pull.t | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/test-pull.t b/tests/test-pull.t index b14d7f7..7d194f9 100644 --- a/tests/test-pull.t +++ b/tests/test-pull.t @@ -1,5 +1,3 @@ - $ "$TESTDIR/hghave" serve || exit 80 - $ hg init test $ cd test @@ -45,7 +43,7 @@ 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo $ hg pull - pulling from http://foo@localhost:$HGPORT/ + pulling from http://foo:***@localhost:$HGPORT/ searching for changes no changes found @@ -88,5 +86,3 @@ regular shell commands. $ URL=`python -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"` $ hg pull -q "$URL" - - $ cd .. |