Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 31175:7433b3bc55ee
update: for "noconflict" updates, print "conflicting changes" on conflict
With experimental.updatecheck=noconflict, if the update is aborted
because of conlicts, "uncommitted changes" is not quite
accurate. Let's use "conflicting changes" instead. Also fix the hint
to recomment --clean, not --merge, since that's what we do for other
failed updates.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 06 Mar 2017 23:21:27 -0800 |
| parents | 41a9edc5d00f |
| children | 11831d755b51 |
comparison
equal
deleted
inserted
replaced
| 31174:842489d18118 | 31175:7433b3bc55ee |
|---|---|
| 1600 followcopies, matcher=matcher, mergeforce=mergeforce) | 1600 followcopies, matcher=matcher, mergeforce=mergeforce) |
| 1601 | 1601 |
| 1602 if updatecheck == 'noconflict': | 1602 if updatecheck == 'noconflict': |
| 1603 for f, (m, args, msg) in actionbyfile.iteritems(): | 1603 for f, (m, args, msg) in actionbyfile.iteritems(): |
| 1604 if m not in ('g', 'k', 'r'): | 1604 if m not in ('g', 'k', 'r'): |
| 1605 msg = _("uncommitted changes") | 1605 msg = _("conflicting changes") |
| 1606 hint = _("commit or update --merge to allow merge") | 1606 hint = _("commit or update --clean to discard changes") |
| 1607 raise error.Abort(msg, hint=hint) | 1607 raise error.Abort(msg, hint=hint) |
| 1608 | 1608 |
| 1609 # Prompt and create actions. Most of this is in the resolve phase | 1609 # Prompt and create actions. Most of this is in the resolve phase |
| 1610 # already, but we can't handle .hgsubstate in filemerge or | 1610 # already, but we can't handle .hgsubstate in filemerge or |
| 1611 # subrepo.submerge yet so we have to keep prompting for it. | 1611 # subrepo.submerge yet so we have to keep prompting for it. |