##// END OF EJS Templates
add a comment about the need of hg._update()
Benoit Boissinot -
r7546:c7f48414 default
parent child Browse files
Show More
@@ -252,8 +252,6 b' def _showstats(repo, stats):'
252 note = ", ".join([_("%d files %s") % s for s in stats])
252 note = ", ".join([_("%d files %s") % s for s in stats])
253 repo.ui.status("%s\n" % note)
253 repo.ui.status("%s\n" % note)
254
254
255 def _update(repo, node): return update(repo, node)
256
257 def update(repo, node):
255 def update(repo, node):
258 """update the working directory to node, merging linear changes"""
256 """update the working directory to node, merging linear changes"""
259 stats = _merge.update(repo, node, False, False, None)
257 stats = _merge.update(repo, node, False, False, None)
@@ -262,6 +260,9 b' def update(repo, node):'
262 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
260 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
263 return stats[3] > 0
261 return stats[3] > 0
264
262
263 # naming conflict in clone()
264 _update = update
265
265 def clean(repo, node, show_stats=True):
266 def clean(repo, node, show_stats=True):
266 """forcibly switch the working directory to node, clobbering changes"""
267 """forcibly switch the working directory to node, clobbering changes"""
267 stats = _merge.update(repo, node, False, True, None)
268 stats = _merge.update(repo, node, False, True, None)
General Comments 0
You need to be logged in to leave comments. Login now