Mercurial > hg

diff mercurial/merge.py @ 52061:43e15277498e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-update: add a config item to disable the Rust update fastpath Explanations inline.
author Raphaël Gomès <rgomes@octobus.net>
date Wed, 16 Oct 2024 17:21:03 +0200
parents 8b7123c8947b
children
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Oct 01 13:49:11 2024 +0200
+++ b/mercurial/merge.py	Wed Oct 16 17:21:03 2024 +0200
@@ -35,7 +35,6 @@
     pathutil,
     policy,
     pycompat,
-    requirements,
     scmutil,
     subrepoutil,
     util,
@@ -2024,6 +2023,7 @@
         update_from_null_fallback = False
         if (
             MAYBE_USE_RUST_UPDATE
+            and repo.ui.configbool(b"rust", b"update-from-null")
             and rust_update_mod is not None
             and p1.rev() == nullrev
             and not branchmerge