From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 77249 invoked by alias); 18 Jan 2020 01:41:26 -0000 Mailing-List: contact gcc-cvs-wwwdocs-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-cvs-wwwdocs-owner@gcc.gnu.org Received: (qmail 77205 invoked by uid 9119); 18 Jan 2020 01:41:26 -0000 Date: Sat, 18 Jan 2020 01:41:00 -0000 Message-ID: <20200118014126.77201.qmail@sourceware.org> From: jsm28@gcc.gnu.org To: gcc-cvs-wwwdocs@gcc.gnu.org Subject: gcc-wwwdocs branch master updated. 7eba7f3bcff6b7c41474da9dd709294516903bd8 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f5f2d7b9e9f2415a06face5990bc9f45afd3cb70 X-Git-Newrev: 7eba7f3bcff6b7c41474da9dd709294516903bd8 X-SW-Source: 2020/txt/msg00044.txt This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "gcc-wwwdocs". The branch, master has been updated via 7eba7f3bcff6b7c41474da9dd709294516903bd8 (commit) from f5f2d7b9e9f2415a06face5990bc9f45afd3cb70 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7eba7f3bcff6b7c41474da9dd709294516903bd8 Author: Joseph Myers Date: Sat Jan 18 01:39:33 2020 +0000 Update branching and branch closing instructions for move to git. 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. diff --git a/htdocs/branch-closing.html b/htdocs/branch-closing.html index f8a3ddf..80e81ec 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 5eb6e73..a9dafdd 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.
      ----------------------------------------------------------------------- Summary of changes: htdocs/branch-closing.html | 8 ++++---- htdocs/branching.html | 17 +++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) hooks/post-receive -- gcc-wwwdocs