From a60f1cac1e6f06f8a2a16aa604440f1d4b9f2f29 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Tue, 20 Mar 2012 09:58:48 -0700 Subject: [PATCH] handle $change->{allowed} --- Debbugs/Control.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm index 5e39018..a8a54c1 100644 --- a/Debbugs/Control.pm +++ b/Debbugs/Control.pm @@ -2412,8 +2412,8 @@ sub __calculate_merge_changes{ }; $change->{text_value} = ref($change->{func_value}) eq 'ARRAY'?join(' ',@{$change->{func_value}}):$change->{func_value}; $change->{text_orig_value} = ref($change->{orig_value}) eq 'ARRAY'?join(' ',@{$change->{orig_value}}):$change->{orig_value}; - if ($param->{force}) { - if ($field ne 'package') { + if ($param->{force} or $change->{allowed}) { + if ($field ne 'package' or $change->{allowed}) { push @{$changes{$data->{bug_num}}},$change; next; } -- 2.39.2