Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-up-local-change.out @ 655:b3bba126b04a
Fix out of range regression
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix out of range regression
From: Filip Brcic <brcha@users.sourceforge.net>
The old revlog.py issued "index out of range" error when cloning the repository
Now I have reverted the parts of revlog.py to the old state when prev was
initialized as -1 and later assigned self.tip() only if that is possible.
Previously prev was always initialized as self.tip() and that is where the
out of range error was.
manifest hash: c94c9aee8b6d382ef52c3981f306a6e7e5f4c4d1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCzzIxywK+sNU5EO8RAtlcAJ0TX9FXuC2c3YHuYXNwqZhdzPWUlgCggq+a
yJzUKDKH/gvnD3Tx3jcmCn8=
=euPi
-----END PGP SIGNATURE-----
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 08 Jul 2005 18:10:57 -0800 |
parents | 5d6177b72fcc |
children | 32f7dc81c07e |
line wrap: on
line source
+ mkdir r1 + cd r1 + hg init + echo a + hg addremove + hg commit -t 1 -u test -d '0 0' + hg clone . ../r2 cloning by hardlink + cd ../r2 + hg up + echo abc + hg diff + sed 's/\(\(---\|+++\).*\)\t.*/\1/' diff -r c19d34741b0a a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a +abc + cd ../r1 + echo b + echo a2 + hg addremove + hg commit -t 2 -u test -d '0 0' + cd ../r2 + hg -q pull ../r1 + hg status C a + hg --debug up resolving manifests ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e a versions differ, resolve remote created b getting b merging a resolving a file a: other d730145abbf9 ancestor b789fdd96dc2 + hg --debug up -m resolving manifests ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e + hg parents changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 tag: tip user: test date: Thu Jan 1 00:00:00 1970 summary: 2 + hg -v history changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 tag: tip manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 user: test date: Thu Jan 1 00:00:00 1970 files: a b description: 2 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 user: test date: Thu Jan 1 00:00:00 1970 files: a description: 1 + hg diff + sed 's/\(\(---\|+++\).*\)\t.*/\1/' diff -r 1e71731e6fbb a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a2 +abc