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-setdiscovery.t | |
| parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
| parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
| download | mercurial-tarball-4b0aa73b8c69bd5b7521337809f7bc4714209a5a.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-setdiscovery.t')
| -rw-r--r-- | tests/test-setdiscovery.t | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/test-setdiscovery.t b/tests/test-setdiscovery.t index cca197d..72d0d87 100644 --- a/tests/test-setdiscovery.t +++ b/tests/test-setdiscovery.t @@ -288,7 +288,7 @@ One with >200 heads, which used to use up all of the sample: reading DAG from stdin $ hg heads -t --template . | wc -c - \s*261 (re) + *261 (re) $ hg clone -b a . a adding changesets @@ -324,4 +324,3 @@ One with >200 heads, which used to use up all of the sample: 5 total queries common heads: 3ee37d65064a - $ cd .. |