Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/hg.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 | fdc232d8a193 |
| children | 49988d9f0758 |
line wrap: on
line diff
--- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -211,9 +211,10 @@ def clone(ui, source, dest=None, pull=Fa # update/merge/revert def update(repo, node, allow=False, force=False, choose=None, - moddirstate=True, forcemerge=False, wlock=None, show_stats=True): + moddirstate=True, forcemerge=False, wlock=None, show_stats=True, + remind=True): return merge.update(repo, node, allow, force, choose, moddirstate, - forcemerge, wlock, show_stats) + forcemerge, wlock, show_stats, remind) def verify(repo): """verify the consistency of a repository"""