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-fncache.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-fncache.t')
-rw-r--r-- | tests/test-fncache.t | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/test-fncache.t b/tests/test-fncache.t index 643088c..f8c476a 100644 --- a/tests/test-fncache.t +++ b/tests/test-fncache.t @@ -14,7 +14,7 @@ Testing a.i/b: $ mkdir a.i $ echo "some other text" > a.i/b $ hg add - adding a.i/b (glob) + adding a.i/b $ hg ci -m second $ cat .hg/store/fncache | sort data/a.i @@ -25,7 +25,7 @@ Testing a.i.hg/c: $ mkdir a.i.hg $ echo "yet another text" > a.i.hg/c $ hg add - adding a.i.hg/c (glob) + adding a.i.hg/c $ hg ci -m third $ cat .hg/store/fncache | sort data/a.i @@ -69,21 +69,17 @@ Non store repo: .hg .hg/00changelog.i .hg/00manifest.i - .hg/cache - .hg/cache/branchheads .hg/data .hg/data/tst.d.hg .hg/data/tst.d.hg/foo.i .hg/dirstate .hg/last-message.txt - .hg/phaseroots .hg/requires .hg/undo .hg/undo.bookmarks .hg/undo.branch .hg/undo.desc .hg/undo.dirstate - .hg/undo.phaseroots $ cd .. Non fncache repo: @@ -97,8 +93,6 @@ Non fncache repo: $ find .hg | sort .hg .hg/00changelog.i - .hg/cache - .hg/cache/branchheads .hg/dirstate .hg/last-message.txt .hg/requires @@ -108,9 +102,7 @@ Non fncache repo: .hg/store/data .hg/store/data/tst.d.hg .hg/store/data/tst.d.hg/_foo.i - .hg/store/phaseroots .hg/store/undo - .hg/store/undo.phaseroots .hg/undo.bookmarks .hg/undo.branch .hg/undo.desc |