Mercurial > hg > mercurial-crew-with-dirclash
diff hgext/fetch.py @ 2811:4f7abf341cd4
fetch: fix breakage from mpm.
add test so will not break again.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 08 Aug 2006 16:09:26 -0700 |
parents | df220d0974dd |
children | f362222cb8f8 30f59f4a327e |
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)') %