X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FControl.pm;h=39e6648bbe8478aea8e28b07e454007f0c8f4e3d;hb=b589eb07e8c620e6daa2ac0dcd65f7d68f242814;hp=74653b0a66e5d5d56210c60f0dbba16220d570f7;hpb=886176cce4eb1693d8430701d576ac9116c943e7;p=debbugs.git

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 74653b0..39e6648 100644
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -2319,6 +2319,17 @@ sub __calculate_merge_status{
 	    @{$merge_status{"${_}_versions"}}{@{$data->{"${_}_versions"}}} = (1) x @{$data->{"${_}_versions"}};
 	}
     }
+    # if there is a non-source qualified version with a corresponding
+    # source qualified version, we only want to merge the source
+    # qualified version(s)
+    for (qw(fixed found)) {
+	my @unqualified_versions = grep {m{/}?0:1} keys %{$merge_status{"${_}_versions"}};
+	for my $unqualified_version (@unqualified_versions) {
+	    if (grep {m{/\Q$unqualified_version\E}} keys %{$merge_status{"${_}_versions"}}) {
+		delete $merge_status{"${_}_versions"}{$unqualified_version};
+	    }
+	}
+    }
     return (\%merge_status,$bugs_to_merge);
 }