From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii 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: Wed, 08 Apr 2015 09:36:00 +0300 Message-ID: <83oamzgm9b.fsf@gnu.org> References: <83mw2mn2no.fsf@gnu.org> <5521359D.2000509@yandex.ru> <83fv8emvgq.fsf@gnu.org> <55219139.8040507@yandex.ru> <83oan2l4pk.fsf@gnu.org> <5521B811.8070603@yandex.ru> <83d23hlmia.fsf@gnu.org> <20150407165131.GA2600@acm.fritz.box> <836197j20b.fsf@gnu.org> <20150407201114.GB2600@acm.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428474983 755 80.91.229.3 (8 Apr 2015 06:36:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Apr 2015 06:36:23 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 08 08:36:14 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 1Yfjaw-0004oK-Ji for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 08:36:14 +0200 Original-Received: from localhost ([::1]:50861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfjav-0004eB-VJ for ged-emacs-devel@m.gmane.org; Wed, 08 Apr 2015 02:36:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfjap-0004aF-QX for emacs-devel@gnu.org; Wed, 08 Apr 2015 02:36:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yfjaj-0004h5-G6 for emacs-devel@gnu.org; Wed, 08 Apr 2015 02:36:07 -0400 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:39524) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yfjaj-0004gq-7Y; Wed, 08 Apr 2015 02:36:01 -0400 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NMH004005PV0H00@mtaout24.012.net.il>; Wed, 08 Apr 2015 09:27:20 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMH0044H5XK1410@mtaout24.012.net.il>; Wed, 08 Apr 2015 09:27:20 +0300 (IDT) In-reply-to: <20150407201114.GB2600@acm.fritz.box> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.180 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:185136 Archived-At: > Date: Tue, 7 Apr 2015 20:11:14 +0000 > Cc: rms@gnu.org, emacs-devel@gnu.org > From: Alan Mackenzie > > Small point: one of the examples commits a ChangeLog, which as from > today, we don't do any more. Fixed. > Bigger point: the workflow depicted implicitly assumes that _all_ > changes made to files are to be committed in one commit action. I think > it would be better if this was stated explicitly, with a sentence like > "The following commands assume _all_ the changes you have made to any > files will be committed together." immediately under the heading "Daily > Work". Added a note to that effect. > I actually use git stash rather than commits with messages like "Commit > to allow pull from upstream."; I find it the lesser of two evils - I > don't think one should have to commit unnaturally because of constraints > in the tools. I think the sub-workflow git stash; git pull; git stash > pop might be worth mentioning. Added. > It might be useful to mention "git checkout foo.el" as doing what we > used to know as "bzr revert foo.el", perhaps under the "If you made a > mistake" section. I remember I had to ask for this command on > emacs-devel, once. Done. Thanks.