From patchwork Sat Jan 18 01:42:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 1225101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-517639-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=hJ8pX7jA; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48010D6L8mz9sR0 for ; Sat, 18 Jan 2020 12:42:50 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=XGW6WpphYG32Q53yQfAuXz22nXMt01XoMd+c2/GPFsyaZNuB6G3zV MX8FWMF5SKX1cN3s6xRcfqbV2MTByBXMcUque4wcmwC6QY1xzsLnSlmh1CDp3R+F Fg2/Q9vod1DzHSS5MXjo4QsL/ui7oaXw8g+1e1AeZUdtZO0ZFdCy6s= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=dr/AfBdihGUIsHqGKYEyccX2c8w=; b=hJ8pX7jAyv4SdzD+asuc vOLI4j/6DPqajHGK+Nd7KcI0Yjb0DuHnQzNqhaihEsPEaLIgdgW/C6/BuyCEbscJ yq47l9ybGTczyoJw9BBzX1sMvGtlHZB+9enR6mZroEIGG4pExIOsvl7D8KSmQ+P9 1w0ijJaUc5Tt3bDScljIGqU= Received: (qmail 78050 invoked by alias); 18 Jan 2020 01:42:43 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 78042 invoked by uid 89); 18 Jan 2020 01:42:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: esa4.mentor.iphmx.com Received: from esa4.mentor.iphmx.com (HELO esa4.mentor.iphmx.com) (68.232.137.252) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 18 Jan 2020 01:42:41 +0000 IronPort-SDR: 6K8Wsin7k+0pphyTk9rtyXVBc5ssmoSTh1tMLHyRZIBVEPt0cvAO8i4KY3zC4R8uGltx7aAhbc UmT4MXmoTN75BW7WCd9GNUatca0VwQ/Pd+h1L5Vpo/PVLfMoVBPkHv4azQMgoR0Ii4Wa6xfohx UOK9vP2atMEi1Z0bGia6esnHNeMiCOwVNP6I2XBmZHX9NgYpiY11U0pWA4gAUqv3fhN3eL+oO2 Byy/9EyYkNFVDNU4lg+xRnC0p83cyJUrmQPkIvYMDYXSbp3B9hDVLE6go2LecEV5KAf6j7aU3g hNE= Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 17 Jan 2020 17:42:39 -0800 IronPort-SDR: bhXHaq56kprxHCygnCTCMUzK2n1QSxgl4WbwVVI5MKXpcKP4ZmC0A7DVq3mAcUc/FQXd8d/8Tm UQwOYxRTb9/A== Date: Sat, 18 Jan 2020 01:42:34 +0000 From: Joseph Myers To: Subject: Update branching and branch closing instructions for move to git. Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 update_version_svn has been replaced by update_version_git. The scripts directory in ~gccadmin is now a symlink into a gcc-checkout directory. Various commands using SVN are replaced by git commands and instructions for updating the old git mirror are removed. Instructions for adding a new basepoint tag are added. Committed. diff --git a/htdocs/branch-closing.html b/htdocs/branch-closing.html index f8a3ddfa..80e81ecd 100644 --- a/htdocs/branch-closing.html +++ b/htdocs/branch-closing.html @@ -16,16 +16,16 @@
  • Inform the gcc@gcc.gnu.org list that the branch is being closed.
    • -
  • On trunk, edit IGNORE_BRANCHES -in maintainer-scripts/update_version_svn to stop nightly +
  • On master, edit IGNORE_BRANCHES +in maintainer-scripts/update_version_git to stop nightly version updates from touching the branch. Remove the entry in maintainer-scripts/crontab that creates snapshots from the branch. Optionally, remove any code in maintainer-scripts/gcc_release that is only relevant to snapshots from that branch or older branches (for example, if directories listed in the script were removed or renamed after that -branch). Check in those changes. Run svn update in -the scripts directory of the gccadmin account, and then +branch). Check in and push those changes. Run git pull in +the gcc-checkout directory of the gccadmin account, and then actually install the updated crontab there.

  • For every open bug whose summary contains the version number of diff --git a/htdocs/branching.html b/htdocs/branching.html index 5eb6e73a..a9dafdd3 100644 --- a/htdocs/branching.html +++ b/htdocs/branching.html @@ -13,11 +13,11 @@

    Preparations

      -
    1. Execute the following commands, substituting appropriate version +
    2. Execute the following command, in a checkout of master, substituting appropriate version numbers: 
      -svn cp svn+ssh://gcc.gnu.org/svn/gcc/trunk svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-3_5-branch
+git push origin master:releases/gcc-10
      3. @@ -26,15 +26,12 @@ svn cp svn+ssh://gcc.gnu.org/svn/gcc/trunk svn+ssh://gcc.gnu.org/svn/gcc/branche "prerelease" instead of "experimental".
    3. Update the file gcc/BASE-VER on the mainline, to use -the next major release number (e.g., 3.2 instead of 3.1).
      4. - -
    4. Update the GIT mirror by running on gcc.gnu.org the -following command, substituting appropriate version -numbers: +the next major release number (e.g., 11 instead of 10). Immediately +after pushing that change, create the basepoint tag for the next release: 
      -$ cd /git/gcc.git/.git
-$ git symbolic-ref refs/heads/gcc-4_7-branch refs/remotes/gcc-4_7-branch
+git tag -a -m "GCC 11 basepoint" basepoints/gcc-11
+git push origin tag basepoints/gcc-11
      5. @@ -64,7 +61,7 @@ release branch, the current release series, and active development
    5. Update maintainer-scripts/crontab on the mainline by adding an entry to make snapshots of the new branch and adjusting the version number of the mainline snapshots. -Run svn update in the scripts directory of +Run git pull in the gcc-checkout directory of the gccadmin account, and then actually install the updated crontab there.