From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master 4e23cd0 4/5: * mail/rmail.el (rmail-show-message-1): When displaying a mime message, Date: Mon, 06 Apr 2015 00:00:38 +0300 Message-ID: <5521A276.5090603@yandex.ru> References: <20150405124321.362.95112@vcs.savannah.gnu.org> <552130FE.1010101@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1428267660 9614 80.91.229.3 (5 Apr 2015 21:01:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 21:01:00 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 23:00:53 2015 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 1Yerf2-0007Tu-9g for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 23:00:52 +0200 Original-Received: from localhost ([::1]:37601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yerf1-00033c-BM for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 17:00:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yerex-00033M-Tf for emacs-devel@gnu.org; Sun, 05 Apr 2015 17:00:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yeres-0003k3-Ho for emacs-devel@gnu.org; Sun, 05 Apr 2015 17:00:47 -0400 Original-Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]:35917) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeres-0003jx-AI; Sun, 05 Apr 2015 17:00:42 -0400 Original-Received: by wgra20 with SMTP id a20so13694570wgr.3; Sun, 05 Apr 2015 14:00:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=hytYkGjMyy6L1ru52ey/E3sbH/YajZspNbcqy08MVfI=; b=nAcgorRFZGWjxPkO4JadLPYMNPKOjnP8Et5gT4Y/yhpX/9LC3XN+vGuFqR+QaHsyWX L/v97ReB/OBEazdRawplQ1aZFWaZUXN7Crtbfe4hdcM8BV7Hgx7BrP8gEbaU4ZHqG3Bn WzyOvoy4XKspVLUbgNMpFhx72V0XZ4lyscFXX5WA3yDP1o7eUzCs84zoxgdTgdmtQrNa FAaBr7f2nF6ZjqtApGzCT5yIX45+X40xDV6+eLf1z6qpClknd/WRmt3/GP2urSOhwpdf ISyzWsuVWFK/Q8ykQxwiRUDYfIOZd/5CYRasCWLfWjOuOut/6gISZofqBGVCf1tuyUbu uWEg== X-Received: by 10.194.79.226 with SMTP id m2mr24930225wjx.60.1428267641552; Sun, 05 Apr 2015 14:00:41 -0700 (PDT) Original-Received: from [192.168.1.3] ([82.102.93.54]) by mx.google.com with ESMTPSA id w8sm3765665wja.4.2015.04.05.14.00.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Apr 2015 14:00:40 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22e 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:184981 Archived-At: On 04/05/2015 08:42 PM, Richard Stallman wrote: > I was told > > If I am right, you will see the changes you made, and nothing else. > If so, fix up your commit message to something more reasonable with git > commit --amend, and you're good to go. It's a merge commit. Usually, you can just go with the default message. There's definitely no need to remove the mention of this commit being a merge. Someone else might have figured that there's no need to duplicate information already present in the other commits, which are also being pushed. Depending on how change log generation handles merge commit (I'm not currently sure; does it just skip them?), someone might have to manually edit the resulting ChangeLog to straighten that out. It's not that this occasion by itself is a big problem, but I'm sure we'd prefer to see it repeated as rarely as possible. > I had to guess what a "more reasonable" message is, and this is what I > guessed. When you are given a vague instruction from some person you don't know very well, "guess at random and then perform an irreversible action" is usually not the only option. > If my guess was not what you like, it's Git's fault. Of course it is.