346 _update = update |
346 _update = update |
347 |
347 |
348 def clean(repo, node, show_stats=True): |
348 def clean(repo, node, show_stats=True): |
349 """forcibly switch the working directory to node, clobbering changes""" |
349 """forcibly switch the working directory to node, clobbering changes""" |
350 stats = _merge.update(repo, node, False, True, None) |
350 stats = _merge.update(repo, node, False, True, None) |
351 if show_stats: _showstats(repo, stats) |
351 if show_stats: |
|
352 _showstats(repo, stats) |
352 return stats[3] > 0 |
353 return stats[3] > 0 |
353 |
354 |
354 def merge(repo, node, force=None, remind=True): |
355 def merge(repo, node, force=None, remind=True): |
355 """branch merge with node, resolving changes""" |
356 """branch merge with node, resolving changes""" |
356 stats = _merge.update(repo, node, True, force, False) |
357 stats = _merge.update(repo, node, True, force, False) |