diff -r b999edb15f8c -r 5b65721a75eb mercurial/filelog.py
--- a/mercurial/filelog.py	Fri Mar 18 12:23:47 2022 -0700
+++ b/mercurial/filelog.py	Tue Jul 20 15:07:10 2021 +0200
@@ -32,6 +32,7 @@
             target=(revlog_constants.KIND_FILELOG, path),
             radix=b'/'.join((b'data', path)),
             censorable=True,
+            canonical_parent_order=False,  # see comment in revlog.py
         )
         # Full name of the user visible file, relative to the repository root.
         # Used by LFS.
@@ -207,6 +208,7 @@
             return 0
 
         # XXX if self.read(node).startswith("\1\n"), this returns (size+4)
+        # XXX See also basefilectx.cmp.
         return self._revlog.size(rev)
 
     def cmp(self, node, text):