From 8e48104da7b58c9e2bf898c2ec9653145bd86a8d Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mark@codesourcery.com>
Date: Mon, 19 Apr 2004 21:48:46 +0000
Subject: [PATCH] * gcc_release (build_sources): Do not use "-F" to tag
 sources.

From-SVN: r80867
---
 maintainer-scripts/ChangeLog   | 4 ++++
 maintainer-scripts/gcc_release | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 7b4f157029c..6f3dbd0ec2b 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-19  Mark Mitchell  <mark@codesourcery.com>
+
+	* gcc_release (build_sources): Do not use "-F" to tag sources.
+
 2004-04-07  Mark Mitchell  <mark@codesourcery.com>
 
 	* gcc_release (build_sources): Do not use "-r" and "-D" at the
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 3ac73da469f..313a37f8211 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -160,7 +160,10 @@ EOF
   EXPORTDATE=""
   if [ -n "${TAG}" ]; then
     inform "Tagging sources as ${TAG}"
-    ${CVS} rtag -r ${CVSBRANCH} -F ${TAG} gcc || \
+    # The -F option to CVS is intentionally not used below.  If you
+    # need to retry a release, you will have to manually remove any
+    # existing tag.
+    ${CVS} rtag -r ${CVSBRANCH} ${TAG} gcc || \
       error "Could not tag sources"
     EXPORTTAG="-r${TAG}"
   else