X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FStatus.pm;h=b28ff5355658e4a24dc17bc29bc06da172334e39;hb=397be7768575470a679026ae274cbd22e39fd091;hp=bf3d2ab7cdbdfa27d25b4d0b7eac3831445af3ef;hpb=10838229c1f0f9cb1b5ba5328513e58dffe3ebdf;p=debbugs.git

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index bf3d2ab..b28ff53 100644
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -512,12 +512,14 @@ sub lock_read_all_merged_bugs {
 	    push @data,$newdata;
 	    # perform a sanity check to make sure that the merged bugs
 	    # are all merged with eachother
-	    my $expectmerge= join(' ',grep {$_ != $bug } sort { $a <=> $b } @bugs);
+        # We do a cmp sort instead of an <=> sort here, because that's
+        # what merge does
+	    my $expectmerge= join(' ',grep {$_ != $bug } sort @bugs);
 	    if ($newdata->{mergedwith} ne $expectmerge) {
 		for (1..$locks) {
 		    unfilelock(exists $param{locks}?$param{locks}:());
 		}
-		die "Bug $param{bug} differs from bug $bug: ($newdata->{bug_num}: '$newdata->{mergedwith}') vs. ('$expectmerge') (".join(' ',@bugs).")";
+		die "Bug $param{bug} mergedwith differs from bug $bug: ($newdata->{bug_num}: '$newdata->{mergedwith}') vs. ('$expectmerge') (".join(' ',@bugs).")";
 	    }
 	}
     }