From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 8 Nov 2012 22:14:59 +0000 (-0800)
Subject: changes is a hash of arrayrefs; properly handle it when merge fails
X-Git-Tag: release/2.6.0~328
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=886176cce4eb1693d8430701d576ac9116c943e7

changes is a hash of arrayrefs; properly handle it when merge fails
---

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 237bcd6..74653b0 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -2168,7 +2168,7 @@ sub set_merged {
 	    $locks--;
 	}
 	__end_control(%info);
-	for my $change (values %{$changes}, @{$disallowed_changes}) {
+	for my $change ((map {@{$_}} values %{$changes}), @{$disallowed_changes}) {
 	    print {$transcript} "$change->{field} of #$change->{bug} is '$change->{text_orig_value}' not '$change->{text_value}'\n";
 	}
 	die "Unable to modify bugs so they could be merged";