--- a/tests/test-strip-cross Sat Jan 19 22:16:15 2008 -0500
+++ b/tests/test-strip-cross Sun Jan 20 08:12:07 2008 -0200
@@ -37,12 +37,18 @@
commit '012 021' '102 201' '120 210'
+commit 'manifest-file'
+
commit '102 120' '012 210' '021 201'
commit '201 210' '021 120' '012 102'
+HGUSER=another-user commit 'manifest-file'
+
+commit '012' 'manifest-file'
+
cd ..
-hg clone -q -U -r -1 -r -2 -r -3 orig crossed
+hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed
for i in crossed/.hg/store/00manifest.i crossed/.hg/store/data/*.i; do
echo $i
@@ -50,7 +56,7 @@
echo
done
-for i in 0 1 2; do
+for i in 0 1 2 3 4; do
hg clone -q -U --pull crossed $i
echo "% Trying to strip revision $i"
hg --cwd $i strip $i 2>&1 | hidefilename
--- a/tests/test-strip-cross.out Sat Jan 19 22:16:15 2008 -0500
+++ b/tests/test-strip-cross.out Sun Jan 20 08:12:07 2008 -0200
@@ -1,8 +1,10 @@
crossed/.hg/store/00manifest.i
rev offset length base linkrev nodeid p1 p2
0 0 112 0 0 6f105cbb914d 000000000000 000000000000
- 1 112 123 0 1 8f3d04e263e5 000000000000 000000000000
- 2 235 122 0 2 f0ef8726ac4f 000000000000 000000000000
+ 1 112 56 1 3 1b55917b3699 000000000000 000000000000
+ 2 168 123 1 1 8f3d04e263e5 000000000000 000000000000
+ 3 291 122 1 2 f0ef8726ac4f 000000000000 000000000000
+ 4 413 87 4 4 0b76e38b4070 000000000000 000000000000
crossed/.hg/store/data/012.i
rev offset length base linkrev nodeid p1 p2
@@ -40,6 +42,11 @@
1 3 3 1 1 5d9299349fc0 000000000000 000000000000
2 6 3 2 0 2661d26c6496 000000000000 000000000000
+crossed/.hg/store/data/manifest-file.i
+ rev offset length base linkrev nodeid p1 p2
+ 0 0 3 0 3 b8e02f643373 000000000000 000000000000
+ 1 3 3 1 4 5d9299349fc0 000000000000 000000000000
+
% Trying to strip revision 0
saving bundle to strip-backup/cbb8c2f0a2e3-backup
saving bundle to strip-backup/cbb8c2f0a2e3-temp
@@ -47,13 +54,13 @@
adding changesets
adding manifests
adding file changes
-added 2 changesets with 12 changes to 6 files (+1 heads)
+added 4 changesets with 15 changes to 7 files (+3 heads)
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
-6 files, 2 changesets, 12 total revisions
+7 files, 4 changesets, 15 total revisions
% Trying to strip revision 1
saving bundle to strip-backup/124ecc0cbec9-backup
@@ -62,13 +69,13 @@
adding changesets
adding manifests
adding file changes
-added 1 changesets with 10 changes to 6 files (+1 heads)
+added 3 changesets with 12 changes to 7 files (+3 heads)
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
-6 files, 2 changesets, 12 total revisions
+7 files, 4 changesets, 14 total revisions
% Trying to strip revision 2
saving bundle to strip-backup/f6439b304a1a-backup
@@ -77,11 +84,35 @@
adding changesets
adding manifests
adding file changes
-added 0 changesets with 6 changes to 4 files
+added 2 changesets with 8 changes to 6 files (+2 heads)
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
-6 files, 2 changesets, 12 total revisions
+7 files, 4 changesets, 14 total revisions
+% Trying to strip revision 3
+saving bundle to strip-backup/6e54ec5db740-backup
+saving bundle to strip-backup/6e54ec5db740-temp
+adding branch
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 2 files (+1 heads)
+% Verifying
+checking changesets
+checking manifests
+crosschecking files in changesets and manifests
+checking files
+7 files, 4 changesets, 19 total revisions
+
+% Trying to strip revision 4
+saving bundle to strip-backup/9147ea23c156-backup
+% Verifying
+checking changesets
+checking manifests
+crosschecking files in changesets and manifests
+checking files
+7 files, 4 changesets, 19 total revisions
+