Attempt to fix negative revision count from pull
authormpm@selenic.com
Wed, 29 Jun 2005 22:09:24 -0800
changeset 529 aace5b681fe9
parent 528 648386fabf9c
child 530 c5b8ed036433
Attempt to fix negative revision count from pull -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Attempt to fix negative revision count from pull manifest hash: 4e8881037d545f4bf76d2c1b06f685b2467cd3a8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCw4yUywK+sNU5EO8RApUkAKCCYTpBG3Wpu15aVeG0iBWE612S5wCgnSBi PEfXF4NI2O9AqWijOMBq6aM= =AyGw -----END PGP SIGNATURE-----
mercurial/hg.py
--- a/mercurial/hg.py	Wed Jun 29 21:55:25 2005 -0800
+++ b/mercurial/hg.py	Wed Jun 29 22:09:24 2005 -0800
@@ -1014,9 +1014,9 @@
             if not f: break
             self.ui.debug("adding %s revisions\n" % f)
             fl = self.file(f)
-            o = fl.tip()
+            o = fl.count()
             n = fl.addgroup(getgroup(), revmap, tr)
-            revisions += fl.rev(n) - fl.rev(o)
+            revisions += fl.count() - o
             files += 1
 
         self.ui.status(("modified %d files, added %d changesets" +