From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 19 Mar 2012 17:44:24 +0000 (-0700)
Subject: handle hash options to merge status
X-Git-Tag: release/2.6.0~413^2~5
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=45ae8c6838e057bf4d5ddd58cd83df47b183b837

handle hash options to merge status
---

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 78efdf1..c5d73d1 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -2402,7 +2402,7 @@ sub __calculate_merge_changes{
 		 (exists $force_functions{$field}{modify_value} ?
 		  $force_functions{$field}{modify_value}->($merge_status->{$field}):
 		  $merge_status->{$field}),
-		 value    => $merge_status->{$field},
+		 value    => ref($merge_status->{$field}) eq 'HASH'?[sort keys %{$merge_status->{$field}}]:$merge_status->{$field},
 		 function => $force_functions{$field}{func},
 		 key      => $force_functions{$field}{key},
 		 options  => $force_functions{$field}{options},