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

[debbugs.git] / Debbugs / Control.pm

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 237bcd63736fb563abdbb77c92a71e453fe0ccd9..74653b0a66e5d5d56210c60f0dbba16220d570f7 100644 (file)
--- 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";