Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 26614:ef1eb6df7071

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: move conflict warning message to filemerge The current output for a failed merge with conflict markers looks something like: merging foo warning: conflicts during merge. merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') merging bar warning: conflicts during merge. merging bar incomplete! (edit conflicts, then use 'hg resolve --mark') We're going to change the way merges are done to perform all premerges before all merges, so that the output above would look like: merging foo merging bar warning: conflicts during merge. merging foo incomplete! (edit conflicts, then use 'hg resolve --mark') warning: conflicts during merge. merging bar incomplete! (edit conflicts, then use 'hg resolve --mark') The 'warning: conflicts during merge' line has no context, so is pretty confusing. This patch will change the future output to: merging foo merging bar warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') The hint on how to resolve the conflicts makes this a bit unwieldy, but solving that is tricky because we already hint that people run 'hg resolve' to retry unresolved merges. The 'hg resolve --mark' mostly applies to conflict marker based resolution.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 09 Oct 2015 13:54:52 -0700
parents abb5ec3eb6ce
children a1e43e85d294
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sun Oct 11 15:04:00 2015 -0700
+++ b/mercurial/filemerge.py	Fri Oct 09 13:54:52 2015 -0700
@@ -255,8 +255,8 @@
     return True, r
 
 @internaltool('union', fullmerge,
-              _("merging %s incomplete! "
-                "(edit conflicts, then use 'hg resolve --mark')\n"),
+              _("warning: conflicts while merging %s! "
+                "(edit, then use 'hg resolve --mark')\n"),
               precheck=_symlinkcheck)
 def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """
@@ -267,8 +267,8 @@
                   files, labels, 'union')
 
 @internaltool('merge', fullmerge,
-              _("merging %s incomplete! "
-                "(edit conflicts, then use 'hg resolve --mark')\n"),
+              _("warning: conflicts while merging %s! "
+                "(edit, then use 'hg resolve --mark')\n"),
               precheck=_symlinkcheck)
 def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """
@@ -280,8 +280,8 @@
                   files, labels, 'merge')
 
 @internaltool('merge3', fullmerge,
-              _("merging %s incomplete! "
-                "(edit conflicts, then use 'hg resolve --mark')\n"),
+              _("warning: conflicts while merging %s! "
+                "(edit, then use 'hg resolve --mark')\n"),
               precheck=_symlinkcheck)
 def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     """