Mercurial Mercurial > mercurial / 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 47900 40cf4b278f8f
parent 47899 625b6ddb828c
child 47901 3429f48d486d 
--- a/mercurial/dirstatemap.py	Fri Jul 16 17:10:52 2021 +0200
+++ b/mercurial/dirstatemap.py	Fri Jul 16 17:14:56 2021 +0200
@@ -295,8 +295,7 @@
                 self.addfile(filename, from_p2=True)
                 return
         elif not p1_tracked and p2_tracked and wc_tracked:
-            self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)
-            return
+            clean_p2 = True
         elif possibly_dirty:
             pass
         elif wc_tracked:
mercurial