From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 17 Nov 2016 00:46:30 +0000 (-0800)
Subject: Fix clone removing all other blocks instead of add
X-Git-Tag: release/2.6.0~157
X-Git-Url: https://git.donarmstrong.com/?p=debbugs.git;a=commitdiff_plain;h=b24bd1b5c8d818b64aa745e3fa60196692619ed7

Fix clone removing all other blocks instead of add

  + (Closes: #820044). Thanks to James Clarke.
---

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 6f74206..8903dde 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -2936,7 +2936,8 @@ sub clone_bug {
     for my $bug (split ' ', $data->{blocks}) {
 	for my $new_bug (@new_bugs) {
 	    set_blocks(bug => $bug,
-                   block => $new_bug,
+		       block => $new_bug,
+		       add => 1,
 		       hash_slice(%param,
 				  keys %common_options,
 				  keys %append_action_options),
@@ -2947,7 +2948,8 @@ sub clone_bug {
     for my $bug (split ' ', $data->{blockedby}) {
 	for my $new_bug (@new_bugs) {
 	    set_blocks(bug => $new_bug,
-                   block => $bug,
+		       block => $bug,
+		       add => 1,
 		       hash_slice(%param,
 				  keys %common_options,
 				  keys %append_action_options),
diff --git a/debian/changelog b/debian/changelog
index 24c3335..6cdffa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ debbugs (2.6.0~exp1) UNRELEASED; urgency=low
     (Closes: #790716)
   * Fix (and test) setting summary/outlook in Control: messages (Closes:
     #836613).
+  * Fix clone removing all other blocks instead of adding them (Closes:
+    #820044). Thanks to James Clarke.
 
   [ Niels Thykier ]
   * quitcgi() now returns 400/500 status codes instead of 200 (Closes: #584922)