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-pull-corruption2.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-pull-corruption2.t')
-rw-r--r-- | tests/test-pull-pull-corruption2.t | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/tests/test-pull-pull-corruption2.t b/tests/test-pull-pull-corruption2.t new file mode 100644 index 0000000..ad4509c --- /dev/null +++ b/tests/test-pull-pull-corruption2.t @@ -0,0 +1,44 @@ +Corrupt an hg repo with two pulls. +create one repo with a long history + + $ hg init source1 + $ cd source1 + $ touch foo + $ hg add foo + $ for i in 1 2 3 4 5 6 7 8 9 10; do + > echo $i >> foo + > hg ci -m $i + > done + $ cd .. + +create a third repo to pull both other repos into it + + $ hg init version2 + $ hg -R version2 pull source1 & + $ sleep 1 + pulling from source1 + requesting all changes + adding changesets + adding manifests + adding file changes + added 10 changesets with 10 changes to 1 files + (run 'hg update' to get a working copy) + $ hg clone --pull -U version2 corrupted + requesting all changes + adding changesets + adding manifests + adding file changes + added 10 changesets with 10 changes to 1 files + $ wait + $ hg -R corrupted verify + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 1 files, 10 changesets, 10 total revisions + $ hg -R version2 verify + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + 1 files, 10 changesets, 10 total revisions |