--- a/mercurial/dirstateutils/v2.py	Tue Jul 23 19:14:16 2024 -0400
+++ b/mercurial/dirstateutils/v2.py	Tue Jul 23 19:20:22 2024 -0400
@@ -7,8 +7,15 @@
 
 
 import struct
+import typing
 
 from ..thirdparty import attr
+
+# Force pytype to use the non-vendored package
+if typing.TYPE_CHECKING:
+    # noinspection PyPackageRequirements
+    import attr
+
 from .. import error, policy
 
 parsers = policy.importmod('parsers')