From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sat, 04 Apr 2015 10:59:34 +0200 Message-ID: <551FA7F6.8060103@math.ntnu.no> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428138010 22258 80.91.229.3 (4 Apr 2015 09:00:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 09:00:10 +0000 (UTC) Cc: Eli Zaretskii , sorganov@gmail.com, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 10:59:58 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 1YeJvo-00008Y-LS for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 10:59:56 +0200 Original-Received: from localhost ([::1]:36683 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeJvn-0004Gm-FW for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 04:59:55 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeJvk-0004Gh-Ao for emacs-devel@gnu.org; Sat, 04 Apr 2015 04:59:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeJvj-0007Jl-F7 for emacs-devel@gnu.org; Sat, 04 Apr 2015 04:59:52 -0400 Original-Received: from hylle06.itea.ntnu.no ([129.241.56.235]:54906) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeJvf-0007HG-RL; Sat, 04 Apr 2015 04:59:47 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id 0990B66AAD0; Sat, 4 Apr 2015 10:59:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [10.0.0.106] (248.69.202.84.customer.cdi.no [84.202.69.248]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle06.itea.ntnu.no (Postfix) with ESMTPSA id 8B5B16685A2; Sat, 4 Apr 2015 10:59:36 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 129.241.56.235 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:184856 Archived-At: Stephen J. Turnbull wrote: > Eli Zaretskii writes: > > > What he did became clear, even to me, after he showed the informat= ion > > 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=20 explanation: They are the result of an incomplete merge operation, and=20 all come from origin/master at the time of his pull. This may not be the=20 *correct* explanation, but it is a *possible* explanation. > 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. It is true that on this list, if not in the world=20 at large, I am a nobody, but you don't have to rub it in. =E2=80=93 Harald