Mercurial Mercurial > hg-stable / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/dirstatemap.py
changeset 47932 3429f48d486d
parent 47931 40cf4b278f8f
child 47933 4cade5e944c2 
--- a/mercurial/dirstatemap.py	Fri Jul 16 17:14:56 2021 +0200
+++ b/mercurial/dirstatemap.py	Fri Jul 16 17:20:17 2021 +0200
@@ -289,11 +289,8 @@
                 # In addition, this seems to be a case where the file is marked
                 # as merged without actually being the result of a merge
                 # action. So thing are not ideal here.
-                self.addfile(filename, merged=True)
-                return
-            else:
-                self.addfile(filename, from_p2=True)
-                return
+                merged = True
+                clean_p2 = False
         elif not p1_tracked and p2_tracked and wc_tracked:
             clean_p2 = True
         elif possibly_dirty:
hg-stable