Mercurial > hg
comparison mercurial/hg.py @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Wed, 04 Mar 2009 13:06:16 -0600 |
| parents | 7197812e8d44 |
| children | a218ba5f60df |
comparison
equal
deleted
inserted
replaced
| 7820:346fafc144fc | 7821:9fe7e6acf525 |
|---|---|
| 272 def merge(repo, node, force=None, remind=True): | 272 def merge(repo, node, force=None, remind=True): |
| 273 """branch merge with node, resolving changes""" | 273 """branch merge with node, resolving changes""" |
| 274 stats = _merge.update(repo, node, True, force, False) | 274 stats = _merge.update(repo, node, True, force, False) |
| 275 _showstats(repo, stats) | 275 _showstats(repo, stats) |
| 276 if stats[3]: | 276 if stats[3]: |
| 277 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) | 277 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " |
| 278 "or 'hg up --clean' to abandon\n")) | |
| 278 elif remind: | 279 elif remind: |
| 279 repo.ui.status(_("(branch merge, don't forget to commit)\n")) | 280 repo.ui.status(_("(branch merge, don't forget to commit)\n")) |
| 280 return stats[3] > 0 | 281 return stats[3] > 0 |
| 281 | 282 |
| 282 def revert(repo, node, choose): | 283 def revert(repo, node, choose): |