[project @ 2005-07-17 19:18:58 by cjwatson]

[debbugs.git] / migrate / debbugs-makeversions

diff --git a/migrate/debbugs-makeversions b/migrate/debbugs-makeversions
index de34d0f05a77609e6efabd3ad3539167b776fc51..ed5acee3ba8dbaebe5407797c91bc8a4e44e9d9c 100755 (executable)
--- a/migrate/debbugs-makeversions
+++ b/migrate/debbugs-makeversions
@@ -161,15 +161,24 @@ while (defined(my $dir = readdir DB)) {
            next;
        }
 
-       my ($found_versions, $fixed_versions) = getbuginfo("$db/$dir/$file");
+       if (@{$status->{found_versions}} or @{$status->{fixed_versions}}) {
+           unlockreadbugmerge($locks);
+           next;
+       }
 
+       my @merges = ();
+       # Only process the lowest of each set of merged bugs.
        if (length $status->{mergedwith}) {
            @merges = sort { $a <=> $b } split ' ', $status->{mergedwith};
            if ($merges[0] < $bug) {
-               # already processed
                unlockreadbugmerge($locks);
                next;
            }
+       }
+
+       my ($found_versions, $fixed_versions) = getbuginfo("$db/$dir/$file");
+
+       if (length $status->{mergedwith}) {
            for my $merge (@merges) {
                $merge =~ /(..)$/;
                my $mergehash = $1;
@@ -182,14 +191,14 @@ while (defined(my $dir = readdir DB)) {
 
        @$fixed_versions = () unless length $status->{done};
 
-       for my $out ($bug, (split ' ', $status->{mergedwith})) {
+       for my $out ($bug, @merges) {
            if ($out != $bug) {
                filelock("lock/$out");
            }
            my $outstatus = readbug($out, $db);
            $outstatus->{found_versions} = [@$found_versions];
            $outstatus->{fixed_versions} = [@$fixed_versions];
-           writebug($out, $outstatus);
+           writebug($out, $outstatus, $db, 2, 'disable bughook');
            if ($out != $bug) {
                unfilelock();
            }