From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: master 01db800: Merge from origin/emacs-26 Date: Sun, 10 Dec 2017 10:23:51 +0100 Message-ID: <877etv6imw.fsf@gmx.de> References: <20171209102340.2914.60218@vcs0.savannah.gnu.org> <20171209102341.B679C20404@vcs0.savannah.gnu.org> <5xpo7n4o07.fsf@fencepost.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1512897888 25166 195.159.176.226 (10 Dec 2017 09:24:48 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 10 Dec 2017 09:24:48 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.90 (gnu/linux) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 10 10:24:44 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 1eNxqk-0006GU-Hu for ged-emacs-devel@m.gmane.org; Sun, 10 Dec 2017 10:24:42 +0100 Original-Received: from localhost ([::1]:43932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNxqr-00039O-IJ for ged-emacs-devel@m.gmane.org; Sun, 10 Dec 2017 04:24:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNxq7-00039D-SB for emacs-devel@gnu.org; Sun, 10 Dec 2017 04:24:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNxq4-0000dP-Oe for emacs-devel@gnu.org; Sun, 10 Dec 2017 04:24:03 -0500 Original-Received: from mout.gmx.net ([212.227.15.18]:64628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eNxq4-0000co-EA; Sun, 10 Dec 2017 04:24:00 -0500 Original-Received: from detlef.gmx.de ([212.86.60.132]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MQhyf-1eTcbw36QX-00U3hj; Sun, 10 Dec 2017 10:23:57 +0100 In-Reply-To: <5xpo7n4o07.fsf@fencepost.gnu.org> (Glenn Morris's message of "Sat, 09 Dec 2017 15:58:32 -0500") X-Provags-ID: V03:K0:N9lcdF9/F9i9puaC9ZrjDQckXKekm3L5XpTbR2K9l6Tl3wi6dQ6 iAkfldKrxd+FXZaqUqZUdWUfid8nHNfzYpIl1BYD61jypNvuCfXvOZbwyz3cm7+zBTS/dYM wvzKQEjzQF/k7mVZc1HS48CAHxxBPyhP3CZ+YZqUfw8axiRHQIGpjhOqoGrYb3fcLSO9iI2 3dB0/84JjvcrDiWCHlkVw== X-UI-Out-Filterresults: notjunk:1;V01:K0:/0NQxQKUZhs=:vdCO059yCSbUxNzIMqSpWB cjQvUQItp6Hhr1R3uFfFbjYnIGhlVXG4h1Q5n6VubCRXqqte8wKC81bSD6eEh9fddywwz0S1g 98ETK9HtFJCLdpjrHAVO3T/kY4NNHRTxFVXlhUZUOOJAAKBaNsNsF/HYQOLYB7r06IlLza7uY 8zCE+INFPsEMUBPxCDk7ykufjNk5asxKH6hoEGOdHlFgVZFEPtVxWMoWS4gsJ6QDbHUEFqvMP 5k5BXBZM5psabA0otVOgtb/Q6e6AMbnUt2F7Jv3Iw5PIhwCQrpkumeAgzmROdslYIEK8EHBml obwqOjFnoB+AmNuZ4QuqNQ1P+HDwJdKWkIksGJLe7HsWzF3q18vJge2yDE6LAvXvgxYbPii8t NVT2wZcO7bnZSihG1hXt7c5uDkhdEDmfEI4Wo1c4yAdUm1YaQV0qkjcuJUv9KNg3jydD9fViL lDTpZeHhFTmkFV0BTPEeY3fZNWoZ3DvdjtUdwp2xzDWTC7fEQOL9rdt10QkEYTygk7NhM7Jft I2G2XaWWSoYLB59Gb/B8zPEmVqoui6anXO64cE8KC07q8/dq0S0n1joV8WOVVRtCJGhazzMy1 agtN6kWg0MQ770kJYUFTWzGBBmZWTJ27rMPAA25qBCgFD25lw3XymrbGBaBcb3oC0POizDF7s B50StWmALegITG01SvoxsCORD7TST25Ecic+ir75z33lel5pLYn+C9k5jU0PWh418k/tqFeBL uUbcSStv/83pa8IPE7PsWpiIUqKJj+mTbXOok84gYo4umzdDSJf1Ll/mS3oe51qDq5Q3gvlL X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.18 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:220847 Archived-At: Glenn Morris writes: Hi Glenn, > The NEWS change from cb3d979b74 seems to have gotten lost. > Any idea why? > It should have been applied to etc/NEWS.26 in master. > > I tried to make gitmerge.el handled this automatically in master > 0b6f4f2c60, so if you used that version of gitmerge, it may be my fault. 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. After that, the master branch was somehow broken. Further attempts to run gitmerge told me "fatal: You have not concluded your merge (MERGE_HEAD exists).". Perfect, I'm a git n00b. I've tried to fix this with "git merge --abort", and indeed, gitmerge didn't show any error next call. It also didn't show me further commits to be merged. Likely, in its books the merge was finished, and it regards everything merged fine. Looking at the status at the master branch, I've seen that several commits in emacs-26 didn't arrive master. I've tried to fix this by several calls of "git cherry-pick ...". I hoped I have covered all missing commits, but it seems that I've missed at least the commit for NEWS. Maybe it would help if somebody is checking, whether I have overseen other commits. Summary: If everything goes well, gitmerge is great. In case of problems, git n00bs like me are lost. It will take some time, until I have enough courage to try it, again. Best regards, Michael.