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: Tue, 07 Apr 2015 02:32:43 +0300 Message-ID: <5523179B.5070501@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> <5522760B.7020605@yandex.ru> <83zj6ljvg3.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 1428363186 19638 80.91.229.3 (6 Apr 2015 23:33:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 23:33:06 +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 Tue Apr 07 01:33:05 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 1YfGVr-0004qd-WA for ged-emacs-devel@m.gmane.org; Tue, 07 Apr 2015 01:33:04 +0200 Original-Received: from localhost ([::1]:42162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfGVr-0004GS-DH for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 19:33:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfGVe-0004Fv-0p for emacs-devel@gnu.org; Mon, 06 Apr 2015 19:32:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfGVa-0002Xy-KI for emacs-devel@gnu.org; Mon, 06 Apr 2015 19:32:49 -0400 Original-Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:37341) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfGVa-0002Xk-Cj; Mon, 06 Apr 2015 19:32:46 -0400 Original-Received: by wiaa2 with SMTP id a2so2142504wia.0; Mon, 06 Apr 2015 16:32:45 -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=XAxCxsCjtUc+mNYsXfS5oCpYxcEGjS7QXs1wJMecRgY=; b=rm3Gu7mYu7DNfEc7vfPjiUG0INsgUcFzlpNkPDjLGmqOsU9BWfMbsJPBsyW90dOYpk Sy8PXkBRbxQWevzdN5/6pVGN39HqqM8l45xhx/4URJPKLbXIxsspSm8+JDaBBdnoahBy OK6SFQNZL8BEPNiXTUhO8hmj9L9FDcd26duzx6kb+TCMH3yxth/TXUrFXs0/OEvblBuq 21hNMuYcHr+pKHkJJVxpnpNnhbwFEVWRn6x7244m+Sd9nOZswskicfDFvNU5v1Ll1o6F S13CQy5QtXhPdE+3/b0uHUToRwDodPzmnYfIbh2XkUPY3ZDniBYfgvTRYY5AG8JJDqfH 7InA== X-Received: by 10.180.80.40 with SMTP id o8mr1137702wix.22.1428363165802; Mon, 06 Apr 2015 16:32:45 -0700 (PDT) Original-Received: from [192.168.1.3] ([82.102.93.54]) by mx.google.com with ESMTPSA id ff4sm8454255wib.9.2015.04.06.16.32.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Apr 2015 16:32:45 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: <83zj6ljvg3.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::234 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:185056 Archived-At: On 04/06/2015 03:24 PM, Eli Zaretskii wrote: > That's exactly the issue: should we mention such techniques on that > page? Hard to say. But 'git commit --amend' is already a dangerous operation. Someone might forget that the current commit has already been pushed, and amend it anyway. What will they do then? Try to push the result, see a message about non-fast-forward pushes being not allowed, then go along the "If pushing fails" section (pull, resolve, commit, push), and we'll have two similar commits in the history. I don't really know how to proof the instructions against that. >> 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. > > I hope the instructions in their current form explain all that well > enough. They don't explain how to merge ChangeLogs, and the specialized merge driver is only mentioned in GitForEmacsDevs. Well, we should have no need for it soon.