From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#23481: 25.1.50; vc-next-action cannot commit for emacs master Date: Sun, 08 May 2016 21:47:17 +0300 Message-ID: <837ff4e6a2.fsf@gnu.org> References: <87k2j4qx2k.fsf@mat.ucm.es> <83d1owe88i.fsf@gnu.org> <87y47kv2dj.fsf@mat.ucm.es> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1462733334 27170 80.91.229.3 (8 May 2016 18:48:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 8 May 2016 18:48:54 +0000 (UTC) Cc: 23481@debbugs.gnu.org To: Uwe Brauer Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun May 08 20:48:43 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1azTkU-0001jG-8q for geb-bug-gnu-emacs@m.gmane.org; Sun, 08 May 2016 20:48:15 +0200 Original-Received: from localhost ([::1]:37738 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azTkT-00008K-5o for geb-bug-gnu-emacs@m.gmane.org; Sun, 08 May 2016 14:48:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azTkO-0008TO-2U for bug-gnu-emacs@gnu.org; Sun, 08 May 2016 14:48:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azTkI-0003jU-RR for bug-gnu-emacs@gnu.org; Sun, 08 May 2016 14:48:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:59344) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azTkI-0003jQ-Nu for bug-gnu-emacs@gnu.org; Sun, 08 May 2016 14:48:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1azTkH-0006zg-VM for bug-gnu-emacs@gnu.org; Sun, 08 May 2016 14:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 08 May 2016 18:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23481 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23481-submit@debbugs.gnu.org id=B23481.146273325126849 (code B ref 23481); Sun, 08 May 2016 18:48:01 +0000 Original-Received: (at 23481) by debbugs.gnu.org; 8 May 2016 18:47:31 +0000 Original-Received: from localhost ([127.0.0.1]:43448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1azTjn-0006yx-Aq for submit@debbugs.gnu.org; Sun, 08 May 2016 14:47:31 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45953) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1azTjl-0006yh-RD for 23481@debbugs.gnu.org; Sun, 08 May 2016 14:47:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azTjc-0003KW-Eb for 23481@debbugs.gnu.org; Sun, 08 May 2016 14:47:24 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azTjc-0003K6-C3; Sun, 08 May 2016 14:47:20 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3200 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1azTja-00057q-EN; Sun, 08 May 2016 14:47:19 -0400 In-reply-to: <87y47kv2dj.fsf@mat.ucm.es> (message from Uwe Brauer on Sun, 08 May 2016 18:19:36 +0000) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:117989 Archived-At: > From: Uwe Brauer > Cc: Uwe Brauer , 23481@debbugs.gnu.org > Date: Sun, 08 May 2016 18:19:36 +0000 > > > Didn't it also display this message: > > > Nonempty second line in commit message > > Commit aborted; please see the file CONTRIBUTE > > Not that I can remember. That's strange. When I tried your recipe, I did see that message. > > IOW, this is a cockpit error: the Emacs repository enforces the above > > rule, and your commit didn't comply. If you modify the commit log > > entry so that the 2nd line is empty, everything will work as expected. > > But it is not clear to me what 2nd line means here: Your log message should have a one-line summary line, then an empty line, then the rest of the log. See CONTRIBUTE, where all this is explained in more detail. > This is what I after running vc-next-action and C-c Ca > > Summary: > Author: > ----------------------------------------------------- > * vc-hg.el (vc-hg-symbolic-revision-styles): > Add a phrase to the docstring, which explains how to obtain the > old behavior of the modeline. > > * vc-hg.el (vc-hg-symbolic-revision-styles): > Add a phrase to the docstring: When this variable is t, the > modeline contains revision information for the visited file, > however in order to obtain the old behavior of the modeline, > vc-hg-symbolic-revision-styles needs to be modified. > > > The line is only displayed it is not real (I presume you are using vc as > well). > So what, now? Shall I delete the line starting Author? That does not work. Put some summary text after "Summary:", then add an empty line after "Author:" (I think deleting "Author:" is also okay, but there should be an empty line after the "------" line. > I am really sorry that seems so trivial, but 2nd line is not clear to > me. > > >From the CONTRIBUTION file > > - If you use Emacs VC, one way to format ChangeLog entries is to create > a top-level ChangeLog file manually, and update it with 'C-x 4 a' as > usual. Do not register the ChangeLog file under git; instead, use > 'C-c C-a' to insert its contents into into your *vc-log* buffer. > Or if 'log-edit-hook' includes 'log-edit-insert-changelog' (which it > does by default), they will be filled in for you automatically. > > > So nothing said about an empty line in that paragraph. That's not all it says. It also says this: ** Commit messages Ordinarily, a change you commit should contain a log entry in its commit message and should not touch the repository's ChangeLog files. Here is an example commit message (indented): Deactivate shifted region Do not silently extend a region that is not highlighted; this can happen after a shift (Bug#19003). * doc/emacs/mark.texi (Shift Selection): Document the change. * lisp/window.el (handle-select-window): * src/frame.c (Fhandle_switch_frame, Fselected_frame): Deactivate the mark. Occasionally, commit messages are collected and prepended to a ChangeLog file, where they can be corrected. It saves time to get them right the first time, so here are guidelines for formatting them: - Start with a single unindented summary line explaining the change; do not end this line with a period. If that line starts with a semicolon and a space "; ", the commit message will be ignored when generating the ChangeLog file. Use this for minor commits that do not need separate ChangeLog entries, such as changes in etc/NEWS. - After the summary line, there should be an empty line, then unindented ChangeLog entries.