From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 20 Mar 2012 16:58:48 +0000 (-0700)
Subject: handle $change->{allowed}
X-Git-Tag: release/2.6.0~409^2
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=a60f1cac1e6f06f8a2a16aa604440f1d4b9f2f29

handle $change->{allowed}
---

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;
 		}