From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Thu, 28 May 2015 10:13:49 +0200 Message-ID: <87egm13yrm.fsf@gmx.de> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432800862 2631 80.91.229.3 (28 May 2015 08:14:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 08:14:22 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 10:14:14 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 1YxsxB-0002nH-0l for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 10:14:13 +0200 Original-Received: from localhost ([::1]:57088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxsxA-00025m-3M for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 04:14:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxswx-00025X-KM for emacs-devel@gnu.org; Thu, 28 May 2015 04:14:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxsws-0000u8-I0 for emacs-devel@gnu.org; Thu, 28 May 2015 04:13:59 -0400 Original-Received: from mout.gmx.net ([212.227.17.21]:53519) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxsws-0000ty-7U for emacs-devel@gnu.org; Thu, 28 May 2015 04:13:54 -0400 Original-Received: from detlef.gmx.de ([93.209.72.49]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0M0LtB-1ZGdql3AmT-00uZKL; Thu, 28 May 2015 10:13:50 +0200 In-Reply-To: (Stefan Monnier's message of "Wed, 27 May 2015 22:40:41 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:xXZCbLks8IvNs22NpqRkXLzrzrcyGqVjrRWzrY/+Wbb84wI9yw1 m6yuaJN2k9yEGkWT1uYC12FLeTsdWsmGaxBT8pCBs45G9pJCI8Q63BEKUHetL9JpFVPDlIW /jzdZ+PYputBU5PxDWlV8PKXl8VdK+u8uDOFXOvedhobAjgteOPEroUDMHE59lTkIoyVUyB qk27DgqjrQIElXMRWp5NA== X-UI-Out-Filterresults: notjunk:1;V01:K0:UCTtx3KQUS8=:ePnsIgfuBZDyNQxM4ddwbD 6qexJ+srayNX7TuoymDIGjETUjjQ4jxiqxtuKnuxbd49vmmComD5zbbOhxuZhIwsi1tBZcBTO SU2ArIjiQn5rGM9agMFURPD1e4ZZ3jbF0Ufo0oqsCQuq8VHUQq1rxvmgHHr3VExF10KbHBGd3 q1AxFXV6IlbsqkQxDQo0EpKyz5+OlKCCS6VYr3ZyFeFkwYyGa8lX0jtslKE0mFb4PdLzq34Bd 9FqHRnyB6QoUBVlByXVtV2vbGmCMfjy2wR2H5n0QKY+Oa0sqPyDDikLufRFKC8gzhImGhF/SV LfDmNR52kjcd9HYr9g0V2z45tUIboPQDnMpvbzgoIgrd4iV5x065CuxTPHoZiSfYIgXSLXA+3 fLM3cbnMVl7/ssAFjCUWuH8jqh37NNIvI9+MU+81/vhagvWCFLJQg7xOry/q6FmVHGOcsp0Lr KV9p7WJMVn7r1manZOt8IgDk4+qMZznwZR1ncvKTuLzAvMJz5qpIEmpHASxjap3gjKmb5ZzZb s+I5CdeSa8hj0Ow4FEdmhMp938D8Ztm8TP3BaBIgZy8I2lDgqlGIIW/VqSGcqHJc7Ot3Y41X4 7uS9HPRLFppGxwgj5Y/UMEapZsf1v6vh9Q+6U911Olh/wHQiTy9dJYFTNXqjm6/iiHSrpDlBx plUTYc7ncomPj5Z44bIupVIP3SP2XgqIIxnzxpUV0GtKeQNUi3Um/oXejEpq66EPzYdU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.17.21 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:186895 Archived-At: Stefan Monnier writes: >> branch: master >> commit f9fabb2bb099d944cc97a87933b86b9eae02d067 >> Merge: 570edf2 b0f3a49 >> Author: Michael Albinus >> Commit: Michael Albinus > >> Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs > > What happened, here? > > git diff 570edf2..f9fabb2bb099d944cc97a87933b86b9eae02d067 > > is empty (i.e. the "merge" just threw away all the changes from > b0f3a49, i.e. from "master"). And indeed: > > git diff b0f3a49..f9fabb2bb099d944cc97a87933b86b9eae02d067 > > shows that you reverted a bunch of the recent commits > applied to "master". How did this happen? Oh shit. Something like this: - I've seen the messages in emacs-devel that I did an error syncing tramp.el from the Tramp repository. Panic. - I've fixed this in the local Emacs repository, and committed it. - I've tried to push tramp.el, which failed (due to further commits in the remote Emacs repository). - I've pulled from the remote Emacs repository, getting a conflict in tramp.el. Glenn had fixed the problem already, but there are whitespace difference between his and my change. - I've fixed the conflict in tramp.el, and committed it. - I've tried to push, but I was said that it's not possible because the previous merge wasn't finished. - ERROR: I've reverted all open changes in my Emacs repository. - I've pushed. I must claim, that I'm still in fight with git. After a merge conflict, it let's *other* items edited I have never touched, and I often don't know what to do :-( Conclusion: I will try to implement a local pull-before-and-push-after commit policy. This shall minimize merge conflicts. I am very sorry that I have brought to you additional work, again. > Stefan Best regards, Michael.