Mercurial > hgrepos > Python > libs > ConfigMix

comparison CHANGES.txt @ 638:ef485419d723

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: Now the merge logic does not interpolate variables in any case. Previously it did sometimes.
author Franz Glasner <f.glasner@feldmann-mg.com>
date Fri, 04 Mar 2022 18:14:12 +0100
parents 4499e9b4855d
children 078ffa821af4
comparison
equal deleted inserted replaced
637:4499e9b4855d 638:ef485419d723
18 - **[bugfix]** 18 - **[bugfix]**
19 The ``{{::DEL::}}`` is not subject to interpolation any more. 19 The ``{{::DEL::}}`` is not subject to interpolation any more.
20 This fixes the handling of these deletion markers when merging 20 This fixes the handling of these deletion markers when merging
21 configurations: sometimes they were tried to be interpolated -- and 21 configurations: sometimes they were tried to be interpolated -- and
22 this failed. 22 this failed.
23
24 - **[bugfix]**
25 The merge login should never interpolate variables. But some parts
26 of the merge logic did this unintentionally.
23 27
24 28
25 0.20.4 (2022-01-17) 29 0.20.4 (2022-01-17)
26 ~~~~~~~~~~~~~~~~~~~ 30 ~~~~~~~~~~~~~~~~~~~
27 31