Mercurial > public > mercurial-scm > hg

diff mercurial/dirstate.py @ 46794:e2f7b2695ba1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 18 Mar 2021 18:24:59 -0400
parents 6266d19556ad ca69e29a2a30
children d4ba4d51f85f
line wrap: on
line diff
--- a/mercurial/dirstate.py	Tue Mar 02 00:05:22 2021 +0100
+++ b/mercurial/dirstate.py	Thu Mar 18 18:24:59 2021 -0400
@@ -1284,7 +1284,12 @@
                     or size == -2  # other parent
                     or fn in copymap
                 ):
-                    madd(fn)
+                    if stat.S_ISLNK(st.st_mode) and size != st.st_size:
+                        # issue6456: Size returned may be longer due to
+                        # encryption on EXT-4 fscrypt, undecided.
+                        ladd(fn)
+                    else:
+                        madd(fn)
                 elif (
                     time != st[stat.ST_MTIME]
                     and time != st[stat.ST_MTIME] & _rangemask