From bb46b87914001053794580cff36cf51f28198f5c Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Mon, 19 Mar 2012 14:26:19 -0700 Subject: [PATCH] support a text value --- Debbugs/Control.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm index 4d44237..e42f2f9 100644 --- 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; -- 2.39.2