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: Tue, 07 Apr 2015 09:12:21 +0300 Message-ID: <836198jwl6.fsf@gnu.org> 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> <5523179B.5070501@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428387156 21590 80.91.229.3 (7 Apr 2015 06:12:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Apr 2015 06:12:36 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 07 08:12:27 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 1YfMkM-0003aM-Cc for ged-emacs-devel@m.gmane.org; Tue, 07 Apr 2015 08:12:26 +0200 Original-Received: from localhost ([::1]:43402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfMkL-0006gp-Gi for ged-emacs-devel@m.gmane.org; Tue, 07 Apr 2015 02:12:25 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfMkI-0006gg-07 for emacs-devel@gnu.org; Tue, 07 Apr 2015 02:12:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfMkC-0006nU-Sd for emacs-devel@gnu.org; Tue, 07 Apr 2015 02:12:21 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:47001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfMkC-0006nQ-K0; Tue, 07 Apr 2015 02:12:16 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NMF00A00A8UC900@a-mtaout22.012.net.il>; Tue, 07 Apr 2015 09:12:14 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMF00AP4AKE0D90@a-mtaout22.012.net.il>; Tue, 07 Apr 2015 09:12:14 +0300 (IDT) In-reply-to: <5523179B.5070501@yandex.ru> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:185061 Archived-At: > Date: Tue, 07 Apr 2015 02:32:43 +0300 > From: Dmitry Gutov > CC: rms@gnu.org, emacs-devel@gnu.org > > 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. Neither do I, so I guess they will ask here. > >> 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. Indeed, and that's why I didn't add that to the instructions.