Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hg.py @ 412:40cfa2d0c088
[PATCH]: Typo in localrepository.update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH]: Typo in localrepository.update
From: Goffredo Baroncelli <kreijack@libero.it>
I think that there is an error in the method update() of the class
localrepository. The variable 'm2n' was used instead of 'man'; so the
parent2 flags is computed instead of the ancestor flags.
manifest hash: dc11810367615245c4b39660d135ab3c0e71b85d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCuNWpywK+sNU5EO8RAv9ZAKCxwbd242xZQ1CCrW2WDdQ4gclKtACghXYl
7j1YTRpINItwdXzak3cBS60=
=+Tf8
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Tue, 21 Jun 2005 19:06:17 -0800 |
| parents | 3695fbd2c33b |
| children | a3b5347c22cd |
line wrap: on
line diff
--- a/mercurial/hg.py Tue Jun 21 18:54:44 2005 -0800 +++ b/mercurial/hg.py Tue Jun 21 19:06:17 2005 -0800 @@ -1007,7 +1007,7 @@ m2 = self.manifest.read(m2n) mf2 = self.manifest.readflags(m2n) ma = self.manifest.read(man) - mfa = self.manifest.readflags(m2n) + mfa = self.manifest.readflags(man) (c, a, d, u) = self.diffdir(self.root)