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.
--- a/mercurial/merge.py Mon Mar 06 23:19:57 2017 -0800
+++ b/mercurial/merge.py Mon Mar 06 23:21:27 2017 -0800
@@ -1602,8 +1602,8 @@
if updatecheck == 'noconflict':
for f, (m, args, msg) in actionbyfile.iteritems():
if m not in ('g', 'k', 'r'):
- msg = _("uncommitted changes")
- hint = _("commit or update --merge to allow merge")
+ msg = _("conflicting changes")
+ hint = _("commit or update --clean to discard changes")
raise error.Abort(msg, hint=hint)
# Prompt and create actions. Most of this is in the resolve phase
--- a/tests/test-update-branches.t Mon Mar 06 23:19:57 2017 -0800
+++ b/tests/test-update-branches.t Mon Mar 06 23:21:27 2017 -0800
@@ -295,8 +295,8 @@
$ hg up -qC 3
$ echo dirty >> a
$ hg up -q 4
- abort: uncommitted changes
- (commit or update --merge to allow merge)
+ abort: conflicting changes
+ (commit or update --clean to discard changes)
[255]
$ hg up -m 4
merging a