diff -r 2e9e62242451 -r 278af66e6595 mercurial/scmutil.py
--- a/mercurial/scmutil.py	Tue Jul 23 19:14:16 2024 -0400
+++ b/mercurial/scmutil.py	Tue Jul 23 19:20:22 2024 -0400
@@ -13,6 +13,7 @@
 import posixpath
 import re
 import subprocess
+import typing
 import weakref
 
 from .i18n import _
@@ -24,6 +25,12 @@
     wdirrev,
 )
 from .thirdparty import attr
+
+# Force pytype to use the non-vendored package
+if typing.TYPE_CHECKING:
+    # noinspection PyPackageRequirements
+    import attr
+
 from . import (
     copies as copiesmod,
     encoding,