From da326485e6dbe793e5941b9eea9e4faea1b5074a Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 23 Mar 2018 18:07:27 +0100 Subject: [PATCH] B #1777: When a RA is removed it is added to the tmp template to preserve it after merges/replaces (cherry picked from commit 7d56427061be51f014f07075eae62e9a3a72e049) --- src/template/Template.cc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/template/Template.cc b/src/template/Template.cc index c31790e02e..8807f9936b 100644 --- a/src/template/Template.cc +++ b/src/template/Template.cc @@ -730,10 +730,17 @@ bool Template::check_restricted(string& ra, const Template* base, } else { + // +---------+--------+--------------------+ + // | current | base | outcome | + // +---------+--------+--------------------+ + // | YES | YES/NO | Error if different | + // | NO | YES | Add to current | + // | NO | NO | Nop | + // +---------+--------+--------------------+ + string ra_b; + if ( get(rit->first, ra) ) { - string ra_b; - base->get(rit->first, ra_b); if ( ra_b != ra ) @@ -742,6 +749,10 @@ bool Template::check_restricted(string& ra, const Template* base, return true; } } + else if ( base->get(rit->first, ra_b) ) + { + add(rit->first, ra_b); + } } }