[Commented On] D11324: dirstatemap: use the default code to handle "possibly_dirty" case

baymax (Baymax, Your Personal Patch-care Companion) phabricator at mercurial-scm.org
Thu Aug 26 13:01:15 UTC 2021


baymax added a comment.
baymax updated this revision to Diff 30050.


  ✅ refresh by Heptapod after a successful CI run (🐙 💚)

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11324?vs=29973&id=30050

BRANCH
  default

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

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

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
@@ -298,8 +298,7 @@
             self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty)
             return
         elif possibly_dirty:
-            self.addfile(filename, possibly_dirty=possibly_dirty)
-            return
+            pass
         elif wc_tracked:
             # this is a "normal" file
             if parentfiledata is None:



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


More information about the Mercurial-patches mailing list