Mercurial > hg

changeset 30161:339f9d93daa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: only show "cannot merge flags for %s" warning if flags are different
author Mads Kiilerich <madski@unity3d.com>
date Wed, 12 Oct 2016 12:22:18 +0200
parents 008c4ce64e3f
children 5cb830801855
files mercurial/merge.py tests/test-merge-types.t
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Oct 12 12:22:18 2016 +0200
+++ b/mercurial/merge.py	Wed Oct 12 12:22:18 2016 +0200
@@ -475,7 +475,7 @@
         flo = fco.flags()
         fla = fca.flags()
         if 'x' in flags + flo + fla and 'l' not in flags + flo + fla:
-            if fca.node() == nullid:
+            if fca.node() == nullid and flags != flo:
                 if preresolve:
                     self._repo.ui.warn(
                         _('warning: cannot merge flags for %s\n') % afile)
--- a/tests/test-merge-types.t	Wed Oct 12 12:22:18 2016 +0200
+++ b/tests/test-merge-types.t	Wed Oct 12 12:22:18 2016 +0200
@@ -337,7 +337,6 @@
   merging a
   warning: cannot merge flags for b
   merging b
-  warning: cannot merge flags for bx
   merging bx
   warning: cannot merge flags for c
   merging d
@@ -400,7 +399,6 @@
   merging a
   warning: cannot merge flags for b
   merging b
-  warning: cannot merge flags for bx
   merging bx
   warning: cannot merge flags for c
   merging d