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-relink.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-relink.t')
-rw-r--r-- | tests/test-relink.t | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/test-relink.t b/tests/test-relink.t index 2b0bc2b..1c07911 100644 --- a/tests/test-relink.t +++ b/tests/test-relink.t @@ -1,5 +1,3 @@ - $ "$TESTDIR/hghave" hardlink || exit 80 - $ echo "[extensions]" >> $HGRCPATH $ echo "relink=" >> $HGRCPATH @@ -27,21 +25,21 @@ create source repository $ hg ci -Am addfile adding a adding b - $ cat "$TESTDIR/binfile.bin" >> a - $ cat "$TESTDIR/binfile.bin" >> b + $ cat $TESTDIR/binfile.bin >> a + $ cat $TESTDIR/binfile.bin >> b $ hg ci -Am changefiles make another commit to create files larger than 1 KB to test formatting of final byte count - $ cat "$TESTDIR/binfile.bin" >> a - $ cat "$TESTDIR/binfile.bin" >> b + $ cat $TESTDIR/binfile.bin >> a + $ cat $TESTDIR/binfile.bin >> b $ hg ci -m anotherchange don't sit forever trying to double-lock the source repo $ hg relink . - relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store (glob) + relinking $TESTTMP/repo/.hg/store to $TESTTMP/repo/.hg/store there is nothing to relink |