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 17:00:03 +0200 Message-ID: <87a8wo3fyk.fsf@gmx.de> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> <83bnh4ydci.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432825225 29973 80.91.229.3 (28 May 2015 15:00:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 15:00:25 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 17:00:18 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 1YxzI9-0000Yj-Hj for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 17:00:17 +0200 Original-Received: from localhost ([::1]:59445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxzI9-0003d5-4o for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 11:00:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxzI5-0003bw-HB for emacs-devel@gnu.org; Thu, 28 May 2015 11:00:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxzI0-0006qj-GH for emacs-devel@gnu.org; Thu, 28 May 2015 11:00:13 -0400 Original-Received: from mout.gmx.net ([212.227.15.15]:52169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxzHz-0006pU-W0; Thu, 28 May 2015 11:00:08 -0400 Original-Received: from detlef.gmx.de ([93.209.72.49]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0MX1hk-1Yaw532EYG-00VuRm; Thu, 28 May 2015 17:00:05 +0200 In-Reply-To: <83bnh4ydci.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 28 May 2015 17:40:45 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:D9VOycT3enX/bbvoOHbHhuzs2NKtsNCV9grLu3S5xKW2BHzTwsH BV1xJI1oEuGF04rfxfuGL5px9oiQw00qcHrQjDGLEV/OCZWYLHUVn2COP/+Eoyf/xIcCOYT M1DUkKQqN4qhB3Ij/acBnVnA4lco72XEZhA3Esx3iRAGQc1FvIGGNNQeq873qfdUaR/DF8N lKMCz5F0x3TEK1Cf29qXA== X-UI-Out-Filterresults: notjunk:1;V01:K0:XtkzQR9WHaU=:iTODyKYvMLYFrqGPXNE7en sPBoL0+22KRYP/4r/APCUZL/5TL3Eq0wawmpej3CXVWgs/AGUzrJ7tpziYMfj6eBl5Jdt7t3f 1BA4cfqMbwRMpssXp9AK8LqTq/9UqpOnzz+fvfLcES2RnbeANswujeHhTQ2VoONIGsreuDlXV RbCEQnPkTDUCDsklreVTC6G61T3IidtnP/oVLlpaEOnTqi0TA6L6WpaCyCxU1/CBZ4Wj34QLc oLmRpNbXWL/GJ0hCqrn57BGYYYwieTBEquscTvZ71whi+0fEPkjewSEfeb4f1E8j3WuROGAqV lWV5c4sgEBONd+WhzX5ipOH+kYpWKnx3d7L0jBnnNCmXEkNtyFXX78K22nT2Meo4FudQCsUx+ o2Q78atSaaQvuKmJ7RE96+arOAL8XRXCzU3zAclXF30tRxwIy6w4o4bhvCKWGYJYVO+29IYV5 ZPxP4bJ+9P6teMX9E93s16HVqkXaHEnghf9V5zMf8ScEpuarypys76mtqR4zWKIuLenYUTGqz K4lP+A95ioSJadzNnabrpy3r93F8TgbrK34NZ6R5uVkxSR3QPf8jD63hYTeadV1YvbWRTbNJd ULz06y85kR6XnvXJxse6Fz1nhHonEv28/Ls3n8R1abNCGPXfUvPZClJ7+QeWNSITvRr9i1x0H bdDwHrGg6xs0tRziLD4KpsJUcVTr/Jm/PRtcQfB/C+ldAqtbrV5i6caOPv/Yre3lrNjI= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.15 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:186906 Archived-At: Eli Zaretskii writes: >> - ERROR: I've reverted all open changes in my Emacs repository. >> >> - I've pushed. > > Not sure how it is possible, nor what "all open changes in my > repository" means here. I think it's important to analyze and > understand what happened, in order for you to make sure you don't make > such mistakes in the future. I try to use vc-dir as much as possible. At this step, several files were marked as "edited", surprisingly. IIRC all files which were reported between my two previous pull requests, while I did commit tramp.el locally. That's to say the files, Stefan has repaired with f655987d63e181deb5e6fef1f93b409d96184fae. Since I didn't know it better, I've reverted all the local changes of them. >> 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 :-( > > What exactly do you mean by "it let's *other* items edited I have > never touched"? Can you show an example? The files I've mentioned above. Best regards, Michael.