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 15:03:23 +0300 Message-ID: <5522760B.7020605@yandex.ru> References: <20150405124321.362.95112@vcs.savannah.gnu.org> <552130FE.1010101@yandex.ru> <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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1428321978 3477 80.91.229.3 (6 Apr 2015 12:06:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 12:06:18 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 14:06:18 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 1Yf5ke-0008S5-0t for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 14:03:36 +0200 Original-Received: from localhost ([::1]:39817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf5kd-00085y-Ah for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 08:03:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf5kZ-00085n-8w for emacs-devel@gnu.org; Mon, 06 Apr 2015 08:03:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yf5kW-0007Zx-4P for emacs-devel@gnu.org; Mon, 06 Apr 2015 08:03:31 -0400 Original-Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]:38385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf5kV-0007Zs-TE; Mon, 06 Apr 2015 08:03:28 -0400 Original-Received: by wiun10 with SMTP id n10so32470674wiu.1; Mon, 06 Apr 2015 05:03:27 -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=/WE0/zOOBgVMig9Zk58X44KiJaowdxvjgcN8neuyInU=; b=rv3nTWgQL+ANlYmX5BHGPpAVyFIMfuKi0LHJS5J4VC07mr2dqyAJTs+qRKl0xmtW+M uhi95nbrHICD6/t0PhWmbfwrkeq0YyQJ0atQjnx8+TwH6xve/dBNoAPTIl4u7aOXgAqx u3kdtb973ns6GwsCeymQwY+PQ4f+coH3G1InEEpNiJPrgO2axqfWMbZJhqvl9XUZW9/G wrPL7j/zYC/FUj7CdtQxmEZeOpQxPTWYWntuCpH/N2oK2TD9PHgUsNvLlWc41GhEgAUP WGb177gGibWwJX5eAUZ6G23fCIMy7nRBSMqEgqQOuuNhs4PHKoM4EDhDXmjSbDIhJ0lE vbVw== X-Received: by 10.194.222.135 with SMTP id qm7mr30861384wjc.14.1428321807261; Mon, 06 Apr 2015 05:03:27 -0700 (PDT) Original-Received: from [192.168.1.3] ([82.102.93.54]) by mx.google.com with ESMTPSA id bp1sm6196263wjb.31.2015.04.06.05.03.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Apr 2015 05:03:26 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: <83d23hlmia.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::232 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:185022 Archived-At: On 04/06/2015 10:54 AM, Eli Zaretskii wrote: > Then please tell what you had in mind, perhaps it would be good to > have that added. I use 'git rebase -i' for that. Not sure if we actually want to mention rebasing in the instructions. But if not, should they recommend reviewing each commit right away after it's made? > In my book it's an understandable position of a busy person who wants > a simple job of making an upstream change to "just work". Such people > _will_ learn with good help, but much slower. Well, here's hoping. IME, Git is better learned from fundamentals, but hopefully these careful instructions will make it easier for people to ignore the former, without major consequences. > I think you fail to understand how humiliating that would be. That's > okay, let's talk in, say, 30 years, and see where you stand then ;-) I'd call that delegating, and I'm sure many people would be okay with it. But of course, if there's a similar motivated individual 30 years from now to write a new guide, that would be great too. > When someone is in grave trouble, what do you expect? He can be > taught fishing after he's out of trouble, but not before. You don't > start teaching people how to avoid a fire before putting the fire out. Being hungry is the best motivation to learn fishing. And as we know now, his situation was fairly normal: a history containing two normal local commits and lagging behind the remote master otherwise. So what was needed is a pull, a merge resolving the conflicts, and then a push. The situation was complicated by the need to resolve ChangeLog conflicts manually (or else there may have been no conflicts at all), which is something that was a problem for me as well after Emacs's transition to Git. While I know how to merge, it wasn't obvious how exactly those kind of conflicts should be resolved, which ordering to use, dates, etc. And it's annoying to have to do it each time manually.