[Updated] D11325: dirstatemap: use the default code to handle "p2-tracked" case

[marmoute (Pierre-Yves David)]

Closed by commit rHG40cf4b278f8f: dirstatemap: use the default code to handle "p2-tracked" case (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11325?vs=30051&id=30093

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11325/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11325

AFFECTED FILES
  mercurial/dirstatemap.py

CHANGE DETAILS

diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py
--- a/mercurial/dirstatemap.py
+++ b/mercurial/dirstatemap.py
@@ -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:



To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210827/cd22b349/attachment-0002.html>