Mercurial > hg
comparison mercurial/hg.py @ 13162:115a9760c382
merge: document some internal return values.
| author | Greg Ward <greg-hg@gerg.ca> |
|---|---|
| date | Mon, 13 Dec 2010 11:46:31 -0500 |
| parents | 6c375e07d673 |
| children | 3bbbde6f3e9f |
comparison
equal
deleted
inserted
replaced
| 13161:11eb53464e68 | 13162:115a9760c382 |
|---|---|
| 393 if show_stats: | 393 if show_stats: |
| 394 _showstats(repo, stats) | 394 _showstats(repo, stats) |
| 395 return stats[3] > 0 | 395 return stats[3] > 0 |
| 396 | 396 |
| 397 def merge(repo, node, force=None, remind=True): | 397 def merge(repo, node, force=None, remind=True): |
| 398 """branch merge with node, resolving changes""" | 398 """Branch merge with node, resolving changes. Return true if any |
| 399 unresolved conflicts.""" | |
| 399 stats = mergemod.update(repo, node, True, force, False) | 400 stats = mergemod.update(repo, node, True, force, False) |
| 400 _showstats(repo, stats) | 401 _showstats(repo, stats) |
| 401 if stats[3]: | 402 if stats[3]: |
| 402 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " | 403 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " |
| 403 "or 'hg update -C .' to abandon\n")) | 404 "or 'hg update -C .' to abandon\n")) |