# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1254605890 -7200
# Node ID 75d290db2df6060c160153eb788dcb7249e932f3
# Parent  8e202431d620ce54792dafe8270c9dfb61bd3c10# Parent  d932dc6558812678bb374d66a364212d54503744
merge with mpm

diff -r d932dc655881 -r 75d290db2df6 mercurial/bdiff.c
--- a/mercurial/bdiff.c	Sat Oct 03 14:39:57 2009 -0500
+++ b/mercurial/bdiff.c	Sat Oct 03 23:38:10 2009 +0200
@@ -151,7 +151,7 @@
 	}
 
 	/* compute popularity threshold */
-	t = (bn >= 4000) ? bn / 1000 : bn + 1;
+	t = (bn >= 31000) ? bn / 1000 : 1000000 / (bn + 1);
 
 	/* match items in a to their equivalence class in b */
 	for (i = 0; i < an; i++) {