From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: master 01db800: Merge from origin/emacs-26 Date: Mon, 11 Dec 2017 13:21:20 -0500 Message-ID: References: <20171209102340.2914.60218@vcs0.savannah.gnu.org> <20171209102341.B679C20404@vcs0.savannah.gnu.org> <5xpo7n4o07.fsf@fencepost.gnu.org> <877etv6imw.fsf@gmx.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1513016498 26872 195.159.176.226 (11 Dec 2017 18:21:38 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Dec 2017 18:21:38 +0000 (UTC) User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) Cc: emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 11 19:21:34 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOShp-0006Sf-OP for ged-emacs-devel@m.gmane.org; Mon, 11 Dec 2017 19:21:33 +0100 Original-Received: from localhost ([::1]:54945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOShq-0000Wg-RM for ged-emacs-devel@m.gmane.org; Mon, 11 Dec 2017 13:21:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOShh-0000WY-5B for emacs-devel@gnu.org; Mon, 11 Dec 2017 13:21:26 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOShg-0007VS-7M for emacs-devel@gnu.org; Mon, 11 Dec 2017 13:21:25 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:43101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOShc-0007QF-MU; Mon, 11 Dec 2017 13:21:20 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1eOShc-0002Rk-65; Mon, 11 Dec 2017 13:21:20 -0500 X-Spook: Arnett Saddam Hussein Spillover Suicide bomber Abu Ghraib X-Ran: dZ=]Wk08nmF3Ov/02`C83Ov<[%^"cctXFF;r*=$_h!5cXM:+\n.V;Xyf,l;?24hdsGW7:^ X-Hue: white X-Attribution: GM In-Reply-To: <877etv6imw.fsf@gmx.de> (Michael Albinus's message of "Sun, 10 Dec 2017 10:23:51 +0100") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:220896 Archived-At: Michael Albinus wrote: > I took your word that merging with gitmerge.el is pretty easy. It > started well. During the merge, I was asked whether I want to apply the > changes of NEWS to NEWS.26 in master. I confirmed. Oh dear. Sorry, it was my fault. I've successfully got gitmerge to send the changes from emacs-26 etc/NEWS to master etc/NEWS.26, but I'm missing a step in gitmerge that would do the equivalent of running M-x gitmerge again after having manually resolved the NEWS conflict. I don't see how to fix this right now. This lack of proper rename tracking is so annoying that I'm tempted to suggest etc/NEWS always be called etc/NEWS.MAJORVERSION right from the start, with etc/NEWS perhaps being just a symlink. (Cue complaints about platforms lacking symlinks.)