mercurial/setdiscovery.py

--- a/mercurial/setdiscovery.py	Mon Nov 03 12:08:03 2014 -0500
+++ b/mercurial/setdiscovery.py	Wed Nov 05 13:05:29 2014 +0100
@@ -165,7 +165,7 @@
         ui.debug("all remote heads known locally\n")
         return (srvheadhashes, False, srvheadhashes,)
 
-    if sample and util.all(yesno):
+    if sample and len(ownheads) <= initialsamplesize and util.all(yesno):
         ui.note(_("all local heads known remotely\n"))
         ownheadhashes = dag.externalizeall(ownheads)
         return (ownheadhashes, True, srvheadhashes,)