Mercurial > hg
changeset 1748:2428e6d66f06
bisect: fix for recent changes disallowing "false" merges
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sun, 19 Feb 2006 18:59:20 +0100 |
| parents | 91c56c427171 |
| children | d457fec76ab0 e9bf415a8ecb |
| files | contrib/hbisect.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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")