Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 70F87D763 for ; Mon, 27 May 2013 17:14:47 +0000 (UTC) Received: (qmail 48867 invoked by uid 500); 27 May 2013 17:14:46 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 48752 invoked by uid 500); 27 May 2013 17:14:46 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 48708 invoked by uid 99); 27 May 2013 17:14:45 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 May 2013 17:14:45 +0000 Received: from localhost (HELO mail-la0-f43.google.com) (127.0.0.1) (smtp-auth username rnewson, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 May 2013 17:14:44 +0000 Received: by mail-la0-f43.google.com with SMTP id ez20so6694573lab.16 for ; Mon, 27 May 2013 10:14:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=htWWyz3PgO3CiClLA9G0nahLA0UtWAkxnzSRsnyLwMc=; b=TKZcj+tY7VMOUIFuIhK7igGPwpUhEeGWZZcrxMZ5PxPe6hjSS2TuA3IscMY6WdKslr I1cVsHBD62igP6EKeU5e8/+tON4cLSufnmhmd7huPy3DtogdTiopM3CERRy5WRNig1n4 xtqw+UdM+7s6IUu0a8e5QfbCOjBuzw2/oBQ585p0bl3SgkaMZ/0+pvf3QOmYKtmDTI5L IfRHE1NGj3e6upEycsKO5peHYcmDVPhUbXzrdk8QikMprVRNiod/7FopIH2d/ZoYedcD eHZ3ZxqisYHf9YY4sXgVYugn4WQYZo4c+CHcTyrQcEqrZj6HdraD9oLBcGtAMb5o7G1A 9QOg== MIME-Version: 1.0 X-Received: by 10.152.121.9 with SMTP id lg9mr7610442lab.39.1369674882406; Mon, 27 May 2013 10:14:42 -0700 (PDT) Received: by 10.112.148.42 with HTTP; Mon, 27 May 2013 10:14:42 -0700 (PDT) In-Reply-To: References: Date: Mon, 27 May 2013 18:14:42 +0100 Message-ID: Subject: Re: [VOTE] Git Commit Messages From: Robert Newson To: "dev@couchdb.apache.org" Content-Type: text/plain; charset=ISO-8859-1 If people want more than the one line summary, they can get the full details from the commit message, so I'm not keen on doing extra work (and commits) to generate redundant information. I'm -1 on adding the section and jira information into the summary. It's already quite short and these two items use precious characters. Since they can both be put in the commit message later, it seems unnecessary to put them in the summary (what's a summary if it contains every detail of the commit? :)). A big part of the motivation here is to avoid any release-time effort in generating a change log at all since this is administrivia that can delay releases. The idea being to do it piecemeal as we develop the software. I'm interested if anyone would find it valuable to include more than we've included in NEWS/CHANGES to date (and, more importantly, if those people are prepared to do the work). A final point, I'm not sure the subsystem breakdown from CHANGES is all that useful. It's certainly extra work for the author but does that translate into a benefit for the user? Does anyone need to be told that "Tolerate missing source and target fields in _replicator docs" applies to the Replicator subsystem or that "Fix bug in WARN level logging from 1.3.0" applies to the logging subsystem? It's clearly redundant to me, and a burden to us. In my opinion someone needs to make a strong case for continuing with that scheme, rather than the inverse. B. On 27 May 2013 17:05, Dirkjan Ochtman wrote: > On Mon, May 27, 2013 at 5:42 PM, Robert Newson wrote: >> Rather than manually maintaining the NEWS and CHANGES files I'd like >> to save us time by using the output of git log as our release notes >> after 1.3.1. >> >> To make this work we'll need to be better at commit messages. The de >> facto standard for git commit messages is described at >> http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html >> and I would like us all to commit to using these guidelines, with some >> clarifications: >> >> 1) The last line of the commit should mention the JIRA ticket. >> 2) The first line does *not* end with punctuation. >> >> Here's a good, albeit sarcastic, example; >> >> -- >> Report name of rejected attachment >> >> Some users make requests from inside a black box with a blindfold on >> and their eyes closed and are thus sometimes unaware of the names of >> their own attachments. Let's help these people. >> >> BugzID: 17669 >> -- >> >> The first line of each log between releases will form the release notes. > > Hmm, I don't fully agree. > > Most importantly, commit messages are a means to communicate to > developers (both other developers and ourselves in the future). Change > logs are used to communicate with users. Therefore, tone and contents > for those two pieces of text should often be different. Therefore, I > don't think we should rely on commit messages to generate change logs, > although they are definitely a good starting point and adding extra > stuff after the first line in the commit message is still very useful > while writing the change logs. > > I would also like to slightly change the proposed structure of the > commit messages, to include the ticket number in the first line and a > mandatory tag to indicate a subsystem that the commit is most relevant > to. E.g.: > > "Attachments: report name of rejected attachment (#17669)" > >> I'd like to vote on two questions; >> >> 1) That we adopt the git commit message guidelines above. >> 2) That we delete NEWS/CHANGES from master before the next release after 1.3.1. >> >> The voting rules are lazy consensus with a 72 hour waiting period. You >> do not have to vote if you agree, though you are welcome to do so. If >> you do vote against I encourage you to include a constructive reason >> or suggest an alternative. > > I vote +1 on deleting NEWS/CHANGES, but rather than generating these > from commit messages, we add change logs to the Sphinx-based docs. I > vote -1 on your git commit message guidelines, and propose my > suggested alternative instead. > > Cheers, > > Dirkjan