# HG changeset patch
# User mpm@selenic.com
# Date 1120111764 28800
# Node ID aace5b681fe93a87fb2a89eb54eb9eb87a9cb000
# Parent  648386fabf9cca590dc27feab30f40c5c48d8222
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-----


diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1014,9 +1014,9 @@ class localrepository:
             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" +