changeset 2822 | 4f7abf341cd4 |
parent 2802 | df220d0974dd |
child 2808 | 30f59f4a327e |
child 2824 | f362222cb8f8 |
--- a/hgext/fetch.py Tue Aug 08 21:42:50 2006 -0700 +++ b/hgext/fetch.py Tue Aug 08 16:09:26 2006 -0700 @@ -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)') %