--- a/tests/test-strip-cross.t Wed Jul 04 17:29:49 2012 +0200
+++ b/tests/test-strip-cross.t Wed Jul 11 15:03:10 2012 -0700
@@ -34,12 +34,12 @@
$ hg clone -q -U -r -1 -r -2 -r -3 -r -4 -r -6 orig crossed
$ cd crossed
$ hg debugindex --manifest
- rev offset length base linkrev nodeid p1 p2
- 0 0 112 0 0 6f105cbb914d 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
+ rev offset length ..... linkrev nodeid p1 p2 (re)
+ 0 0 112 ..... 0 6f105cbb914d 000000000000 000000000000 (re)
+ 1 112 56 ..... 3 1b55917b3699 000000000000 000000000000 (re)
+ 2 168 123 ..... 1 8f3d04e263e5 000000000000 000000000000 (re)
+ 3 291 122 ..... 2 f0ef8726ac4f 000000000000 000000000000 (re)
+ 4 413 87 ..... 4 0b76e38b4070 000000000000 000000000000 (re)
$ for i in 012 021 102 120 201 210 manifest-file; do
> echo $i
@@ -47,45 +47,45 @@
> echo
> done
012
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 b8e02f643373 000000000000 000000000000
- 1 3 3 1 1 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 2 2661d26c6496 000000000000 000000000000
+ rev offset length ..... linkrev nodeid p1 p2 (re)
+ 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re)
+ 1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re)
+ 2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re)
021
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 b8e02f643373 000000000000 000000000000
- 1 3 3 1 2 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 1 2661d26c6496 000000000000 000000000000
+ rev offset length ..... linkrev nodeid p1 p2 (re)
+ 0 0 3 ..... 0 b8e02f643373 000000000000 000000000000 (re)
+ 1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re)
+ 2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re)
102
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 1 b8e02f643373 000000000000 000000000000
- 1 3 3 1 0 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 2 2661d26c6496 000000000000 000000000000
+ rev offset length ..... linkrev nodeid p1 p2 (re)
+ 0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re)
+ 1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re)
+ 2 6 3 ..... 2 2661d26c6496 000000000000 000000000000 (re)
120
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 1 b8e02f643373 000000000000 000000000000
- 1 3 3 1 2 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 0 2661d26c6496 000000000000 000000000000
+ rev offset length ..... linkrev nodeid p1 p2 (re)
+ 0 0 3 ..... 1 b8e02f643373 000000000000 000000000000 (re)
+ 1 3 3 ..... 2 5d9299349fc0 000000000000 000000000000 (re)
+ 2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re)
201
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 2 b8e02f643373 000000000000 000000000000
- 1 3 3 1 0 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 1 2661d26c6496 000000000000 000000000000
+ rev offset length ..... linkrev nodeid p1 p2 (re)
+ 0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re)
+ 1 3 3 ..... 0 5d9299349fc0 000000000000 000000000000 (re)
+ 2 6 3 ..... 1 2661d26c6496 000000000000 000000000000 (re)
210
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 2 b8e02f643373 000000000000 000000000000
- 1 3 3 1 1 5d9299349fc0 000000000000 000000000000
- 2 6 3 2 0 2661d26c6496 000000000000 000000000000
+ rev offset length ..... linkrev nodeid p1 p2 (re)
+ 0 0 3 ..... 2 b8e02f643373 000000000000 000000000000 (re)
+ 1 3 3 ..... 1 5d9299349fc0 000000000000 000000000000 (re)
+ 2 6 3 ..... 0 2661d26c6496 000000000000 000000000000 (re)
manifest-file
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 3 b8e02f643373 000000000000 000000000000
- 1 3 3 1 4 5d9299349fc0 000000000000 000000000000
+ rev offset length ..... linkrev nodeid p1 p2 (re)
+ 0 0 3 ..... 3 b8e02f643373 000000000000 000000000000 (re)
+ 1 3 3 ..... 4 5d9299349fc0 000000000000 000000000000 (re)
$ cd ..
$ for i in 0 1 2 3 4; do