Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 411:9e9f7ab43ce2 | 412:40cfa2d0c088 |
|---|---|
| 1005 m1 = self.manifest.read(m1n) | 1005 m1 = self.manifest.read(m1n) |
| 1006 mf1 = self.manifest.readflags(m1n) | 1006 mf1 = self.manifest.readflags(m1n) |
| 1007 m2 = self.manifest.read(m2n) | 1007 m2 = self.manifest.read(m2n) |
| 1008 mf2 = self.manifest.readflags(m2n) | 1008 mf2 = self.manifest.readflags(m2n) |
| 1009 ma = self.manifest.read(man) | 1009 ma = self.manifest.read(man) |
| 1010 mfa = self.manifest.readflags(m2n) | 1010 mfa = self.manifest.readflags(man) |
| 1011 | 1011 |
| 1012 (c, a, d, u) = self.diffdir(self.root) | 1012 (c, a, d, u) = self.diffdir(self.root) |
| 1013 | 1013 |
| 1014 # is this a jump, or a merge? i.e. is there a linear path | 1014 # is this a jump, or a merge? i.e. is there a linear path |
| 1015 # from p1 to p2? | 1015 # from p1 to p2? |