Mercurial > hg
comparison contrib/hbisect.py @ 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 | 1ba0d7041ac4 |
| children | 638b1bc6c6c9 |
comparison
equal
deleted
inserted
replaced
| 1747:91c56c427171 | 1748:2428e6d66f06 |
|---|---|
| 185 def autonext(self): | 185 def autonext(self): |
| 186 """find and update to the next revision to test""" | 186 """find and update to the next revision to test""" |
| 187 check_clean(self.ui, self.repo) | 187 check_clean(self.ui, self.repo) |
| 188 rev = self.next() | 188 rev = self.next() |
| 189 self.ui.write("Now testing %s\n" % hg.hex(rev)) | 189 self.ui.write("Now testing %s\n" % hg.hex(rev)) |
| 190 return self.repo.update(rev, allow=True, force=True) | 190 return self.repo.update(rev, force=True) |
| 191 | 191 |
| 192 def good(self, rev): | 192 def good(self, rev): |
| 193 self.goodrevs.append(rev) | 193 self.goodrevs.append(rev) |
| 194 | 194 |
| 195 def autogood(self, rev=None): | 195 def autogood(self, rev=None): |
| 230 ui.write("it is bad\n") | 230 ui.write("it is bad\n") |
| 231 else: | 231 else: |
| 232 b.good(new_rev) | 232 b.good(new_rev) |
| 233 ui.write("it is good\n") | 233 ui.write("it is good\n") |
| 234 anc = b.ancestors() | 234 anc = b.ancestors() |
| 235 repo.update(new_rev, allow=True, force=True) | 235 repo.update(new_rev, force=True) |
| 236 for v in anc: | 236 for v in anc: |
| 237 if v != rev: | 237 if v != rev: |
| 238 ui.warn("fail to found cset! :(\n") | 238 ui.warn("fail to found cset! :(\n") |
| 239 return 1 | 239 return 1 |
| 240 ui.write("Found bad cset: %s\n" % hg.hex(b.badrev)) | 240 ui.write("Found bad cset: %s\n" % hg.hex(b.badrev)) |