fix for 70039: Mid-air collision page confusing, users think comments will be lost

diff --git a/process_bug.cgi b/process_bug.cgi
index 061dadc93bcae1e306ff0706b56a9a2a2d1a4827..e209dd5ebd2a22db61e8558345ebb7d6375af312 100755 (executable)
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -727,11 +727,9 @@ The changes made were:
             my $value = value_quote($::FORM{$i});
             print qq{<input type=hidden name="$i" value="$value">\n};
         }
+        my $conflictid = DBID_to_name($id);
         print qq{<input type=submit value="Submit my changes anyway">\n};
-        print " This will cause all of the above changes to be overwritten";
-        if ($longchanged) {
-            print ", except for the changes to the description";
-        }
+        print "<BR>Clicking this button will preserve " . DBID_to_name($id) . "'s additional comments, but will overwite any other changes made by " . DBID_to_name($id);
         print qq{.</form>\n<li><a href="show_bug.cgi?id=$id">Throw away my changes, and go revisit bug $id</a></ul>\n};
         PutFooter();
         exit;