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 f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Thu, 28 May 2015 18:19:15 +0300 Message-ID: <83382gybkc.fsf@gnu.org> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> <83bnh4ydci.fsf@gnu.org> <87a8wo3fyk.fsf@gmx.de> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1432826393 18260 80.91.229.3 (28 May 2015 15:19:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 15:19:53 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 17:19:45 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 1Yxzax-00055l-3L for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 17:19:43 +0200 Original-Received: from localhost ([::1]:59545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxzaw-0000JB-ER for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 11:19:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxzaj-0000It-Cg for emacs-devel@gnu.org; Thu, 28 May 2015 11:19:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxzaf-0005Hm-1q for emacs-devel@gnu.org; Thu, 28 May 2015 11:19:29 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:41728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxzae-0005Hc-Q5 for emacs-devel@gnu.org; Thu, 28 May 2015 11:19:24 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NP200100FGU3400@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Thu, 28 May 2015 18:19:23 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NP20013WFW805A0@a-mtaout21.012.net.il>; Thu, 28 May 2015 18:19:23 +0300 (IDT) In-reply-to: <87a8wo3fyk.fsf@gmx.de> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.169 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:186910 Archived-At: > From: Michael Albinus > Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org > Date: Thu, 28 May 2015 17:00:03 +0200 > > 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. In this situation, it is better to invoke "git status" from the shell prompt, it would have probably explained the situation much better. IOW, I'm guessing you were tripped by some vc-dir bug or misfeature, and the files marked "edited" were actually successfully merged and staged for committing, which you should have done after resolving the conflicts. Btw, when you say you've committed tramp.el after resolving the conflicts, what exactly did you do? Did you commit only that file, or did you commit all the files that were ready to be committed?