public inbox for gcc-cvs-wwwdocs@sourceware.org help / color / mirror / Atom feed
From: jsm28@gcc.gnu.org To: gcc-cvs-wwwdocs@gcc.gnu.org Subject: gcc-wwwdocs branch master updated. 7eba7f3bcff6b7c41474da9dd709294516903bd8 Date: Sat, 18 Jan 2020 01:41:00 -0000 [thread overview] Message-ID: <20200118014126.77201.qmail@sourceware.org> (raw) 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 <joseph@codesourcery.com> 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 @@ <li>Inform the gcc@gcc.gnu.org list that the branch is being closed.</li> -<li>On trunk, edit <code>IGNORE_BRANCHES</code> -in <code>maintainer-scripts/update_version_svn</code> to stop nightly +<li>On master, edit <code>IGNORE_BRANCHES</code> +in <code>maintainer-scripts/update_version_git</code> to stop nightly version updates from touching the branch. Remove the entry in <code>maintainer-scripts/crontab</code> that creates snapshots from the branch. Optionally, remove any code in <code>maintainer-scripts/gcc_release</code> 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 <code>svn update</code> in -the <code>scripts</code> directory of the gccadmin account, and then +branch). Check in and push those changes. Run <code>git pull</code> in +the <code>gcc-checkout</code> directory of the gccadmin account, and then actually install the updated crontab there.</li> <li><p>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 @@ <h2>Preparations</h2> <ol> -<li>Execute the following commands, substituting appropriate version +<li>Execute the following command, in a checkout of master, substituting appropriate version numbers: <blockquote> <pre> -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 </pre> </blockquote> </li> @@ -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".</li> <li>Update the file <code>gcc/BASE-VER</code> on the mainline, to use -the next major release number (e.g., 3.2 instead of 3.1).</li> - -<li>Update the GIT mirror by running on <code>gcc.gnu.org</code> 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: <blockquote> <pre> -$ 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 </pre> </blockquote> </li> @@ -64,7 +61,7 @@ release branch, the current release series, and active development <li>Update <code>maintainer-scripts/crontab</code> on the mainline by adding an entry to make snapshots of the new branch and adjusting the version number of the mainline snapshots. -Run <code>svn update</code> in the <code>scripts</code> directory of +Run <code>git pull</code> in the <code>gcc-checkout</code> directory of the gccadmin account, and then actually install the updated crontab there. <br /> ----------------------------------------------------------------------- Summary of changes: htdocs/branch-closing.html | 8 ++++---- htdocs/branching.html | 17 +++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) hooks/post-receive -- gcc-wwwdocs
reply other threads:[~2020-01-18 1:41 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200118014126.77201.qmail@sourceware.org \ --to=jsm28@gcc.gnu.org \ --cc=gcc-cvs-wwwdocs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).