Mercurial > hg

diff mercurial/merge.py @ 48746:18e69f224e4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
narrow: add support for merging add and remove outside of the tracked set This extend f1eb77dceb36 to test and support the remaining action. Or, at least, the simple incarnation of them. Differential Revision: https://phab.mercurial-scm.org/D12181
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 03 Feb 2022 18:14:25 +0100
parents f1eb77dceb36
children af9f2c64302e
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Jan 21 17:54:03 2022 +0100
+++ b/mercurial/merge.py	Thu Feb 03 18:14:25 2022 +0100
@@ -519,10 +519,7 @@
         elif action[0].no_op:
             mresult.removefile(f)  # merge does not affect file
         elif action[0].narrow_safe:
-            if (
-                not f.endswith(b'/')
-                and action[0].changes == mergestatemod.CHANGE_MODIFIED
-            ):
+            if not f.endswith(b'/'):
                 mresult.removefile(f)  # merge won't affect on-disk files
 
                 mresult.addcommitinfo(