From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 19 Mar 2012 21:27:24 +0000 (-0700)
Subject: support a text_orig_value
X-Git-Tag: release/2.6.0~411^2
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=4aace6e07f80fe3f2ba0bca008d8d40fd6146a44

support a text_orig_value
---

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index e42f2f9..5e39018 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->{text_value}'\n";
+		print {$transcript} "$change->{field} of #$change->{bug} is '$change->{text_orig_value}' not '$change->{text_value}'\n";
 	    }
 	    if ($attempts > 0) {
 		croak "Some bugs were altered while attempting to merge";
@@ -2411,6 +2411,7 @@ sub __calculate_merge_changes{
 		 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};
+	    $change->{text_orig_value} = ref($change->{orig_value}) eq 'ARRAY'?join(' ',@{$change->{orig_value}}):$change->{orig_value};
 	    if ($param->{force}) {
 		if ($field ne 'package') {
 		    push @{$changes{$data->{bug_num}}},$change;