Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hg.py @ 7546:c7f48414f3ad
add a comment about the need of hg._update()
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sun, 28 Dec 2008 19:59:42 +0100 |
| parents | 810ca383da9c |
| children | 7197812e8d44 |
line wrap: on
line diff
--- a/mercurial/hg.py Sun Dec 28 20:21:20 2008 +0100 +++ b/mercurial/hg.py Sun Dec 28 19:59:42 2008 +0100 @@ -252,8 +252,6 @@ note = ", ".join([_("%d files %s") % s for s in stats]) repo.ui.status("%s\n" % note) -def _update(repo, node): return update(repo, node) - def update(repo, node): """update the working directory to node, merging linear changes""" stats = _merge.update(repo, node, False, False, None) @@ -262,6 +260,9 @@ repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) return stats[3] > 0 +# naming conflict in clone() +_update = update + def clean(repo, node, show_stats=True): """forcibly switch the working directory to node, clobbering changes""" stats = _merge.update(repo, node, False, True, None)