--- a/mercurial/setdiscovery.py	Tue Jan 06 17:02:32 2015 -0800
+++ b/mercurial/setdiscovery.py	Wed Jan 07 12:09:51 2015 -0800
@@ -113,11 +113,11 @@
     # update from roots
     _updatesample(dag.inverse(), nodes, sample, always)
     assert sample
-    sample = _limitsample(sample, desiredlen)
-    if len(sample) < desiredlen:
-        more = desiredlen - len(sample)
-        sample.update(random.sample(list(nodes - sample - always), more))
     sample.update(always)
+    sample = _limitsample(sample, size)
+    if len(sample) < size:
+        more = size - len(sample)
+        sample.update(random.sample(list(nodes - sample), more))
     return sample
 
 def _limitsample(sample, desiredlen):