support a text value

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 4d44237aa8a0b93e0b8acc9eab7be892239ac700..e42f2f9055fe8481aa4b94bb6c69663e75bc4de3 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -2075,7 +2075,7 @@ sub set_merged {
            # figure out the problems
            print {$transcript} "Unable to merge bugs because:\n";
            for my $change (@{$disallowed_changes}) {
-               print {$transcript} "$change->{field} of #$change->{bug} is '$change->{orig_value}' not '$change->{value}'\n";
+               print {$transcript} "$change->{field} of #$change->{bug} is '$change->{orig_value}' not '$change->{text_value}'\n";
            }
            if ($attempts > 0) {
                croak "Some bugs were altered while attempting to merge";
@@ -2410,6 +2410,7 @@ sub __calculate_merge_changes{
                 options  => $force_functions{$field}{options},
                 allowed  => exists $force_functions{$field}{allowed} ? 0 : $force_functions{$field}{allowed},
                };
+           $change->{text_value} = ref($change->{func_value}) eq 'ARRAY'?join(' ',@{$change->{func_value}}):$change->{func_value};
            if ($param->{force}) {
                if ($field ne 'package') {
                    push @{$changes{$data->{bug_num}}},$change;