diff mercurial/localrepo.py @ 47859:155a2ec8a9dc

merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 22 Aug 2021 16:32:06 -0400
parents 2813d406b036
children c094e829e848
line wrap: on
line diff
--- a/mercurial/localrepo.py	Tue Jul 20 17:20:19 2021 +0200
+++ b/mercurial/localrepo.py	Sun Aug 22 16:32:06 2021 -0400
@@ -1043,6 +1043,9 @@
     )
     options[b'deltabothparents'] = deltabothparents
 
+    issue6528 = ui.configbool(b'storage', b'revlog.issue6528.fix-incoming')
+    options[b'issue6528.fix-incoming'] = issue6528
+
     lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta')
     lazydeltabase = False
     if lazydelta: