Mercurial > public > mercurial-scm > hg
comparison mercurial/hg.py @ 12314:f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
| author | Brodie Rao <brodie@bitheap.org> |
|---|---|
| date | Sun, 12 Sep 2010 18:05:53 -0500 |
| parents | e392d00ab5b0 |
| children | 40852b4b910c |
comparison
equal
deleted
inserted
replaced
| 12313:2912881c2a98 | 12314:f2daa6ab514a |
|---|---|
| 401 """branch merge with node, resolving changes""" | 401 """branch merge with node, resolving changes""" |
| 402 stats = mergemod.update(repo, node, True, force, False) | 402 stats = mergemod.update(repo, node, True, force, False) |
| 403 _showstats(repo, stats) | 403 _showstats(repo, stats) |
| 404 if stats[3]: | 404 if stats[3]: |
| 405 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " | 405 repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " |
| 406 "or 'hg update -C' to abandon\n")) | 406 "or 'hg update -C .' to abandon\n")) |
| 407 elif remind: | 407 elif remind: |
| 408 repo.ui.status(_("(branch merge, don't forget to commit)\n")) | 408 repo.ui.status(_("(branch merge, don't forget to commit)\n")) |
| 409 return stats[3] > 0 | 409 return stats[3] > 0 |
| 410 | 410 |
| 411 def incoming(ui, repo, source, opts): | 411 def incoming(ui, repo, source, opts): |