From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 57223 invoked by alias); 7 Feb 2020 09:20:11 -0000 Mailing-List: contact gcc-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-owner@gcc.gnu.org Received: (qmail 56408 invoked by uid 89); 7 Feb 2020 09:20:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-lj1-f194.google.com Received: from mail-lj1-f194.google.com (HELO mail-lj1-f194.google.com) (209.85.208.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 07 Feb 2020 09:20:09 +0000 Received: by mail-lj1-f194.google.com with SMTP id x7so1368153ljc.1 for ; Fri, 07 Feb 2020 01:20:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=B2Kee3c5oPUHZ8ahkw4IgMsQcOI/Mylk2XexYNCLI2s=; b=SjBOeDq793y87nMSoSusJIwaIzT5pnGsifWQPK3l8FtA5pjAgusqBeUpbb/qAQaKWH yGzh67s74+XGcztXlRWLpGbAMTBR3Mhlk2OEOUktMNXFMC9JS3Ihy5CbGkd7GHAKelEs 03JNSe8CTyoNZ/Sv6kKCdJHhmM8ww3jCSDnOhW70yY1HBakKSNDlgQ+dSiNOGrP+u3Qm 4Qf2iz7l+v+15SbbxCxK06k2TsK7QkEifGdC6oZCGEIbWHw+1/5A0MQcUCQfeN4xekAu h4vVcixFmHVxrKEnX6QVuvy0ZcZkwpRm7coKqRT5Zlk/ftTSuHnEHKQScaBWAOCtiYZF I/Mg== MIME-Version: 1.0 References: <20200124214533.GB17695@tucnak> <6bc259050138912ea9b973ca4f43df72cb1bb7d8.camel@redhat.com> <20200205211801.GV22482@gate.crashing.org> <7743417118d2067cf0e9e1b840564f9f2d5e72dc.camel@redhat.com> <20200206135101.GY22482@gate.crashing.org> <20200206222548.GH22482@gate.crashing.org> In-Reply-To: <20200206222548.GH22482@gate.crashing.org> From: Richard Biener Date: Fri, 07 Feb 2020 09:20:00 -0000 Message-ID: Subject: Re: Git ChangeLog policy for GCC Testsuite inquiry To: Segher Boessenkool Cc: Jeff Law , Richard Sandiford , "H.J. Lu" , paul@mad-scientist.net, GCC Development Content-Type: text/plain; charset="UTF-8" X-IsSubscribed: yes X-SW-Source: 2020-02/txt/msg00079.txt.bz2 On Thu, Feb 6, 2020 at 11:25 PM Segher Boessenkool wrote: > > On Thu, Feb 06, 2020 at 03:01:20PM +0100, Richard Biener wrote: > > On Thu, Feb 6, 2020 at 2:51 PM Segher Boessenkool > > wrote: > > > If you rebase changelog files, then yes, it's a bloody pain ;-) > > > > So do you have a script that takes a commit with a ChangeLog at its end > > and populates the appropriate ChangeLog files? > > I develop my patches in Git, no changelog whatsoever. Then I "git > format-patch" it. I write the changelog in that file (also proper white > space, which "git commit" likes to destroy, I have a patch for that but > not installed everywhere). "git send-email", wait for ack if necessary, > "git am" and copy-and-paste the changelog parts, "git add" those > changelog files, "git commit --amend", final sanity checks, and "git > commit fsf master". I store the patch file to my archive, or I queue it > for backport directly. > > > I'm trying to come up with > > one to make the process less manual ... > > Yeah, don't look at me then :-) > > I *like* having most of those steps, most of this should only be done by > people who are awake. > > > it's definitely a part that requires > > more typing compared to svn. > > Instead of "git am" I had "patch -p1 <", distributing the changelog parts > I just did in vi (as with git), then "svn ci", which pick up all modified > files directly (sometimes an "svn add" first). It's pretty much the same > for me. I'm a believer on committing from the tree I actually tested, so it was with SVN: patch, test, svn up, edit changelogs (cut&paste from the patch header), svn diff | less (check wha'ts abotu to be committed), svn commit with GIT its now: patch, test, git add/commit, git pull --rebase, edit changelogs (cut&paste from the patch header), git commit --amend, git push -n -v, git show , git push So I wonder to "optimize" this somewhat. > > ChangeLog file populating could be even > > done on the server-side I guess (and not appropriately formatted logs > > for the extraction/moving process rejected). > > Yup. As long as it's fool-proof, and we have some way to correct small > disasters (both of those!) I'd definitely prefer server-side operation, and yes, that "script" looking at the commit would need to have a "extract changelog parts" part for a pre-accept hook and the actual part amending the commit with the changelog file changes (not sure if that's even possible in a hook?). Fixing mistakes in the ChangeLog files could be as easy as allowing changes to ChangeLog files without that magic. Anyway, I hope to put sth together with bash & [g]awk Richard. > > Segher