From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Is it time to drop ChangeLogs? Date: Tue, 08 Mar 2016 18:16:38 +0100 Message-ID: <87k2lcdh55.fsf@engster.org> References: <83vb50wxhv.fsf@gnu.org> <87y49vz4cg.fsf@acer.localhost.com> <87vb4zb0i4.fsf@gnu.org> <837fheuu6a.fsf@gnu.org> <877fheb1rh.fsf@wanadoo.es> <87ziua9mwq.fsf@wanadoo.es> <83h9git36k.fsf@gnu.org> <87vb4y9ep9.fsf@wanadoo.es> <83a8mat2aa.fsf@gnu.org> <87r3fm9du0.fsf@wanadoo.es> <56DDF901.1080600@gmail.com> <87mvqa9bjc.fsf@wanadoo.es> <83ziu9skcz.fsf@gnu.org> <874mcha8ql.fsf@wanadoo.es> <87twkhcx5o.fsf@engster.org> <87ziu984ar.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1457457431 3218 80.91.229.3 (8 Mar 2016 17:17:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 8 Mar 2016 17:17:11 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 08 18:16:58 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1adLFh-0008Ew-3I for ged-emacs-devel@m.gmane.org; Tue, 08 Mar 2016 18:16:57 +0100 Original-Received: from localhost ([::1]:36184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adLFg-0000u1-FJ for ged-emacs-devel@m.gmane.org; Tue, 08 Mar 2016 12:16:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adLFZ-0000tS-1W for emacs-devel@gnu.org; Tue, 08 Mar 2016 12:16:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adLFU-0007Ua-2k for emacs-devel@gnu.org; Tue, 08 Mar 2016 12:16:48 -0500 Original-Received: from randomsample.de ([5.45.97.173]:60478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adLFT-0007U6-Pe for emacs-devel@gnu.org; Tue, 08 Mar 2016 12:16:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=vyh+mufdpUJlHEoxjerORPC+19+CLRC80DJjmNqmqt0=; b=A+J+wUtU4hzasQhy15MCFXCLUna9fPbPIJNGe5/3nV0b0w7ORUbOhRe75pYBMcBw1I07GFW+MEhH9E8iAqx2Ab4HoQxTn77q0qJM8cDF3er5X52XyxZYMucmWSiLWDcL; Original-Received: from ip4d1494ed.dynamic.kabel-deutschland.de ([77.20.148.237] helo=isaac) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1adLFS-0006HV-9f; Tue, 08 Mar 2016 18:16:42 +0100 In-Reply-To: <87ziu984ar.fsf@wanadoo.es> (=?iso-8859-1?Q?=22=D3scar?= Fuentes"'s message of "Tue, 08 Mar 2016 14:53:00 +0100") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:201179 Archived-At: =D3scar Fuentes writes: > David Engster writes: > >> =D3scar Fuentes writes: >>> `git notes' is a documented feature available since a long time ago. It >>> can turn the immutability of the commit log into a non-issue if you wish >>> to produce a proofread ChangeLog to include in the tarball. >> >> I can't imagine that you have ever really used 'git notes'. > > I didn't. Then please do. Just take one of your private repositories and add a note to the current commit. And then, just for fun, read the git-notes man page and figure out how to push that note to your server (seriously: the word 'push' is not mentioned once, but note that they *do* tell you how to create a binary note blob, which sure is nifty, even if you'll never figure out how to push it). >> It's a hack with terrible usability > > This is very vague. Is it good enough for solving our problem? > (providing a fixed commit message in case the original one is not > correct.) https://git-scm.com/blog/2010/08/25/notes.html See paragraphs "Sharing Notes" (which also includes the answer to the above), "Getting Notes" and "Collaborating on Notes", and decide for yourself. Yes, that page is from over 5 years ago, but note that there is still no 'git push --notes'. If you want to know why, see for instance http://permalink.gmane.org/gmane.comp.version-control.git/235597 >> and no merge support. > > What's wrong with `git notes merge' ? See the git-notes man page and read section "Notes on merge strategies" (the one that begins with 'The default notes merge strategy is "manual"'). The above gmane-link also has a script attached which shows how to resolve a conflict with 'git notes merge'. I strongly suggest to once go through it and see what it involves. 'git notes' is a quick hack that somehow survived until today, and now it's too late to remove it. It is barely OK for things like attaching test results from your CI server. It's pretty much useless for everything else. For correcting commit messages, it'd be much easier to cook up something for ourselves (like simply a file SHA1:NEW_COMMIT_MESSAGE). -David