Mercurial > hg > mercurial-crew-with-dirclash
changeset 2819: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 +++ b/hgext/fetch.py @@ -36,7 +36,7 @@ def fetch(ui, repo, source='default', ** 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)') %