--- a/mercurial/revlogutils/__init__.py	Tue Jul 23 19:14:16 2024 -0400
+++ b/mercurial/revlogutils/__init__.py	Tue Jul 23 19:20:22 2024 -0400
@@ -6,7 +6,15 @@
 # GNU General Public License version 2 or any later version.
 
 
+import typing
+
 from ..thirdparty import attr
+
+# Force pytype to use the non-vendored package
+if typing.TYPE_CHECKING:
+    # noinspection PyPackageRequirements
+    import attr
+
 from ..interfaces import repository
 
 # See mercurial.revlogutils.constants for doc