From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 23 Mar 2012 02:18:16 +0000 (-0700)
Subject: output more information when forcemerge fails; don't worry about different done values
X-Git-Tag: release/2.6.0~404^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=47e56d5ee3ad54c39820b3401d1b96641c55ccdc;p=debbugs.git

output more information when forcemerge fails; don't worry about different done values
---

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 0ef0259..7e56223 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -2156,12 +2156,16 @@ sub set_merged {
 	}
     }
     if (keys %{$changes} or @{$disallowed_changes}) {
-	print {$transcript} "Unable to modify bugs so that they could be merged\n";
+	print {$transcript} "After four attempts, the following changes were unable to be made:\n";
 	for (1..$new_locks) {
 	    unfilelock($param{locks});
 	    $locks--;
 	}
 	__end_control(%info);
+	for my $change (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";
 	return;
     }
 
@@ -2398,6 +2402,19 @@ sub __calculate_merge_changes{
 		next if join(' ', sort @{$data->{$field}}) eq
 		    join(' ',sort keys %{$merge_status->{$field}});
 	    }
+	    elsif ($field eq 'done') {
+		# for done, we only care if the bug is done or not
+		# done, not the value it's set to.
+		if (defined $merge_status->{$field} and length $merge_status->{$field} and
+		    defined $data->{$field}         and length $data->{$field}) {
+		    next;
+		}
+		elsif ((not defined $merge_status->{$field} or not length $merge_status->{$field}) and
+		       (not defined $data->{$field}         or not length $data->{$field})
+		      ) {
+		    next;
+		}
+	    }
 	    elsif ($merge_status->{$field} eq $data->{$field}) {
 		next;
 	    }