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 48109 2c2788ce0257
parent 48108 d4e715d2be0b
child 48119 aec5b0981c26 
--- a/mercurial/dirstatemap.py	Thu Sep 30 18:00:39 2021 +0200
+++ b/mercurial/dirstatemap.py	Fri Oct 01 00:00:29 2021 +0200
@@ -212,15 +212,7 @@
             self.copymap.pop(filename, None)
             return
         elif merged:
-            # XXX might be merged and removed ?
-            entry = self.get(filename)
-            if entry is None or not entry.tracked:
-                # XXX mostly replicate dirstate.other parent.  We should get
-                # the higher layer to pass us more reliable data where `merged`
-                # actually mean merged. Dropping this clause will show failure
-                # in `test-graft.t`
-                merged = False
-                clean_p2 = True
+            pass
         elif not (p1_tracked or p2_tracked) and wc_tracked:
             pass  # file is added, nothing special to adjust
         elif (p1_tracked or p2_tracked) and not wc_tracked:
mercurial