From 7c8a9cd6f350a94823fedde4dc6daa42f91b846d Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 20 Mar 2012 11:19:26 -0700
Subject: [PATCH] fix ordering of allowed; add merge versions test

---
 Debbugs/Control.pm |  2 +-
 t/12_merge.t       | 26 +++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index a8a54c1..829a453 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -2408,7 +2408,7 @@ sub __calculate_merge_changes{
 		 function => $force_functions{$field}{func},
 		 key      => $force_functions{$field}{key},
 		 options  => $force_functions{$field}{options},
-		 allowed  => exists $force_functions{$field}{allowed} ? 0 : $force_functions{$field}{allowed},
+		 allowed  => exists $force_functions{$field}{allowed} ? $force_functions{$field}{allowed} : 0,
 		};
 	    $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};
diff --git a/t/12_merge.t b/t/12_merge.t
index 2ae7833..f07b4e6 100644
--- a/t/12_merge.t
+++ b/t/12_merge.t
@@ -1,6 +1,6 @@
 # -*- mode: cperl;-*-
 
-use Test::More tests => 32;
+use Test::More tests => 35;
 
 use warnings;
 use strict;
@@ -126,7 +126,7 @@ ok($status->{severity} eq 'wishlist','bug 1 wishlisted');
 my @control_commands =
      (
       clone        => {command => 'clone',
-		       value   => '-1',
+		       value   => '1 -1',
 		       status_key => 'package',
 		       status_value => 'foo',
 		       bug          => '2',
@@ -137,7 +137,7 @@ my @control_commands =
 		       status_value => '2',
 		      },
       unmerge      => {command => 'unmerge',
-		       value   => '',
+		       value   => '1',
 		       status_key => 'mergedwith',
 		       status_value => '',
 		      },
@@ -152,7 +152,7 @@ send_message(to => 'control@bugs.something',
 			],
 	     body => <<'EOF') or fail 'message to control@bugs.something failed';
 debug 10
-clone 2 -1 -2 -3 -4
+clone 2 -1 -2 -3 -4 -5 -6
 retitle 2 foo
 owner 2 bar@baz.com
 submitter 2 fleb@bleh.com
@@ -167,6 +167,8 @@ close 2
 tag -3 wontfix
 fixed -4 1.2-3
 found -4 1.2-1
+found -5 1.2-5
+fixed -5 1.2-6
 thanks
 EOF
 	;
@@ -177,25 +179,31 @@ EOF
 
 
 test_control_commands(forcemerge   => {command => 'forcemerge',
-				       value   => '2',
+				       value   => '1 2',
 				       status_key => 'mergedwith',
 				       status_value => '2',
 				      },
 		      unmerge      => {command => 'unmerge',
-				       value   => '',
+				       value   => '1',
 				       status_key => 'mergedwith',
 				       status_value => '',
 				      },
 		      forcemerge   => {command => 'forcemerge',
-				       value   => '2 5',
+				       value   => '1 2 5',
 				       status_key => 'mergedwith',
 				       status_value => '2 5',
 				      },
 		      forcemerge   => {command => 'forcemerge',
-				       value   => '2 6',
+				       value   => '1 2 6',
 				       status_key => 'mergedwith',
 				       status_value => '2 5 6',
 				      },
+		      merge        => {command => 'merge',
+				       value   => '7 8',
+				       status_key => 'mergedwith',
+				       status_value => '8',
+				       bug => '7',
+				      },
 		     );
 
 
@@ -213,7 +221,7 @@ sub test_control_commands{
 				],
 		     body => <<EOF) or fail 'message to control@bugs.something failed';
 debug 10
-$control_command->{command} 1$control_command->{value}
+$control_command->{command} $control_command->{value}
 thanks
 EOF
 	;
-- 
2.39.2