[Commented On] D11326: dirstatemap: use the default code to handle "clean-p2" case
baymax (Baymax, Your Personal Patch-care Companion)
phabricator at mercurial-scm.org
Thu Aug 26 13:01:25 UTC 2021
baymax added a comment.
baymax updated this revision to Diff 30052.
✅ refresh by Heptapod after a successful CI run (🐙 💚)
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11326?vs=29975&id=30052
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11326/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11326
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
@@ -289,11 +289,8 @@
# In addition, this seems to be a case where the file is marked
# as merged without actually being the result of a merge
# action. So thing are not ideal here.
- self.addfile(filename, merged=True)
- return
- else:
- self.addfile(filename, from_p2=True)
- return
+ merged = True
+ clean_p2 = False
elif not p1_tracked and p2_tracked and wc_tracked:
clean_p2 = True
elif possibly_dirty:
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/500d93a9/attachment-0002.html>
More information about the Mercurial-patches
mailing list