# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1140371960 -3600
# Node ID 2428e6d66f069ecc2a53cbd8b221682b2e72b410
# Parent  91c56c427171638597aaf8680884c30debc8b545
bisect: fix for recent changes disallowing "false" merges


diff -r 91c56c427171 -r 2428e6d66f06 contrib/hbisect.py
--- a/contrib/hbisect.py	Sat Feb 18 07:37:59 2006 -0800
+++ b/contrib/hbisect.py	Sun Feb 19 18:59:20 2006 +0100
@@ -187,7 +187,7 @@
         check_clean(self.ui, self.repo)
         rev = self.next()
         self.ui.write("Now testing %s\n" % hg.hex(rev))
-        return self.repo.update(rev, allow=True, force=True)
+        return self.repo.update(rev, force=True)
 
     def good(self, rev):
         self.goodrevs.append(rev)
@@ -232,7 +232,7 @@
             b.good(new_rev)
             ui.write("it is good\n")
         anc = b.ancestors()
-        repo.update(new_rev, allow=True, force=True)
+        repo.update(new_rev, force=True)
     for v in anc:
         if v != rev:
             ui.warn("fail to found cset! :(\n")