From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 06:04:26 +0900 Message-ID: <87wq1rfvvp.fsf@uwakimon.sk.tsukuba.ac.jp> References: <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <551FA7F6.8060103@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1428181500 17821 80.91.229.3 (4 Apr 2015 21:05:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 21:05:00 +0000 (UTC) Cc: Eli Zaretskii , sorganov@gmail.com, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 23:04:51 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 1YeVFL-0008CD-2d for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 23:04:51 +0200 Original-Received: from localhost ([::1]:34334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeVFK-0000vw-2M for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 17:04:50 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeVF7-0000vY-Mh for emacs-devel@gnu.org; Sat, 04 Apr 2015 17:04:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeVF6-000155-NM for emacs-devel@gnu.org; Sat, 04 Apr 2015 17:04:37 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:44989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeVF1-00010g-1S; Sat, 04 Apr 2015 17:04:31 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id 441991C386A; Sun, 5 Apr 2015 06:04:27 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 19D96120EC9; Sun, 5 Apr 2015 06:04:27 +0900 (JST) In-Reply-To: <551FA7F6.8060103@math.ntnu.no> X-Mailer: VM undefined under 21.5 (beta34) "kale" 83e5c3cd6be6 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:184885 Archived-At: Harald Hanche-Olsen writes: > Stephen J. Turnbull wrote: > > Eli Zaretskii writes: > > > > > What he did became clear, even to me, after he showed the information > > > we requested. > > > > It did? It's not clear to me. I still haven't seen an explanation of > > how he ended up with a ton of modified files that he didn't touch, or > > how he's going to get past that safely. > > Then you must have been missing some messages. Short summary of such an > explanation: They are the result of an incomplete merge operation, and > all come from origin/master at the time of his pull. This may not be the > *correct* explanation, but it is a *possible* explanation. Yes, and I've posted three times mentioning those posts (by Eli as well as you) and explaining the I have tried to reproduce this in a toy repo and have been unable to. It's no longer a possible explanation that he pulled and these were left over *as far as I can tell*. I worry that it may matter in getting his repo fixed up properly. > > Nobody has mentioned him doing a diff against a public reference > > commit that *should* be where he started, in order to confirm > > that when he pushes he can succeed (preferably without making the > > DAG too ugly, as well). > > I have mentioned this. You have my apologies then. Make that "very few have mentioned this, and not recently." When I said nobody, I was mostly referring to the recent spate of posts saying "fix, commit, pull, push should do it." > It is true that on this list, if not in the world at large, I am a > nobody, but you don't have to rub it in. I assure you I have been taking your posts seriously.