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 47903 6816ae362ddd
parent 47902 4cade5e944c2
child 47904 822c67420c77 
--- a/mercurial/dirstatemap.py	Fri Jul 16 17:23:40 2021 +0200
+++ b/mercurial/dirstatemap.py	Fri Jul 16 17:29:16 2021 +0200
@@ -271,8 +271,7 @@
                 self.addfile(filename, from_p2=True)
                 return
         elif not (p1_tracked or p2_tracked) and wc_tracked:
-            self.addfile(filename, added=True, possibly_dirty=possibly_dirty)
-            return
+            pass  # file is added, nothing special to adjust
         elif (p1_tracked or p2_tracked) and not wc_tracked:
             pass
         elif clean_p2 and wc_tracked:
mercurial