Mercurial > hg
changeset 2805:90a4181ca9ed
Fix extensions for merge change
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 07 Aug 2006 17:26:09 -0500 |
| parents | 4b20daa25f15 |
| children | 0bf22c109cc3 |
| files | hgext/fetch.py hgext/hbisect.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/fetch.py Mon Aug 07 14:12:03 2006 -0700 +++ b/hgext/fetch.py Mon Aug 07 17:26:09 2006 -0500 @@ -36,7 +36,7 @@ if newheads: ui.status(_('merging with new head %d:%s\n') % (repo.changelog.rev(newheads[0]), short(newheads[0]))) - err = repo.update(newheads[0], allow=True, remind=False) + err = hg.update(repo, newheads[0], allow=True, remind=False) if not err and len(newheads) > 1: ui.status(_('not merging with %d other new heads ' '(use "hg heads" and "hg merge" to merge them)') %
--- a/hgext/hbisect.py Mon Aug 07 14:12:03 2006 -0700 +++ b/hgext/hbisect.py Mon Aug 07 17:26:09 2006 -0500 @@ -197,7 +197,7 @@ check_clean(self.ui, self.repo) rev = self.next() if rev is not None: - return self.repo.update(rev, force=True) + return hg.update(self.repo, rev, force=True) def good(self, rev): self.goodrevs.append(rev)