all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Uwe Brauer <oub@mat.ucm.es>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Uwe Brauer <oub@mat.ucm.es>, 23481@debbugs.gnu.org
Subject: bug#23481: 25.1.50; vc-next-action cannot commit for emacs master
Date: Sun, 08 May 2016 18:19:36 +0000	[thread overview]
Message-ID: <87y47kv2dj.fsf@mat.ucm.es> (raw)
In-Reply-To: <87k2j4qx2k.fsf@mat.ucm.es>



   > 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.

   > 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:

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.

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.







   > (It doesn't happen in your private repository because you didn't copy
   > there the Git hooks which enforce this and other rules.)





  reply	other threads:[~2016-05-08 18:19 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-08 17:27 bug#23481: 25.1.50; vc-next-action cannot commit for emacs master Uwe Brauer
2016-05-08 18:05 ` Eli Zaretskii
2016-05-08 18:19   ` Uwe Brauer [this message]
2016-05-08 18:47     ` Eli Zaretskii
2016-05-08 19:44       ` Uwe Brauer
2016-05-08 20:15         ` Stephen Berman
2016-05-09  2:25         ` Eli Zaretskii

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=87y47kv2dj.fsf@mat.ucm.es \
    --to=oub@mat.ucm.es \
    --cc=23481@debbugs.gnu.org \
    --cc=eliz@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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.