Mercurial > hgrepos > Python > libs > ConfigMix

changeset 641:226aae226b8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: Remove last expanding lookup of a value when merging configurations
author Franz Glasner <fzglas.hg@dom66.de>
date Sat, 05 Mar 2022 14:31:30 +0100
parents d35f41e15404
children db3ff4fbb4ce
files configmix/__init__.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configmix/__init__.py	Sat Mar 05 14:17:37 2022 +0100
+++ b/configmix/__init__.py	Sat Mar 05 14:31:30 2022 +0100
@@ -516,7 +516,7 @@
                     ukv = user.getitem_ns(k)
                 else:
                     ukv = user[k]
-                if user[k] == constants.DEL_VALUE:
+                if ukv == constants.DEL_VALUE:
                     # do not copy
                     del user[k]
                 else: