Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 27599:ad5966de3c9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: default change/delete conflicts to 'leave unresolved' (BC) It makes far more sense to leave these conflicts unresolved and kick back to the user than to just assume that the local version be chosen. There are almost certainly buggy scripts and applications using Mercurial in the wild that do merges or rebases non-interactively, and then assume that if the operation succeeded there's nothing the user needs to pay attention to. (This wasn't possible earlier because there was no way to re-resolve change/delete conflicts -- but now it is.)
author Siddharth Agarwal <sid0@fb.com>
date Wed, 23 Dec 2015 12:51:45 -0800
parents 88d5db4b155c
children 07fc2f2134ba
line wrap: on
line diff
--- a/mercurial/filemerge.py	Wed Dec 23 12:41:20 2015 -0800
+++ b/mercurial/filemerge.py	Wed Dec 23 12:51:45 2015 -0800
@@ -240,14 +240,14 @@
             index = ui.promptchoice(
                 _("local changed %s which remote deleted\n"
                   "use (c)hanged version, (d)elete, or leave (u)nresolved?"
-                  "$$ &Changed $$ &Delete $$ &Unresolved") % fd, 0)
+                  "$$ &Changed $$ &Delete $$ &Unresolved") % fd, 2)
             choice = ['local', 'other', 'unresolved'][index]
         elif fcd.isabsent():
             index = ui.promptchoice(
                 _("remote changed %s which local deleted\n"
                   "use (c)hanged version, leave (d)eleted, or "
                   "leave (u)nresolved?"
-                  "$$ &Changed $$ &Deleted $$ &Unresolved") % fd, 0)
+                  "$$ &Changed $$ &Deleted $$ &Unresolved") % fd, 2)
             choice = ['other', 'local', 'unresolved'][index]
         else:
             index = ui.promptchoice(