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: Mon, 06 Apr 2015 02:36:37 +0900 Message-ID: <87h9sufpei.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> <837ftspcis.fsf@gnu.org> <87vbhbft9a.fsf@uwakimon.sk.tsukuba.ac.jp> <83619bnjsy.fsf@gnu.org> <87mw2nf01y.fsf@uwakimon.sk.tsukuba.ac.jp> <83zj6nlzq4.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1428255431 21373 80.91.229.3 (5 Apr 2015 17:37:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 17:37:11 +0000 (UTC) Cc: sorganov@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 19:37:02 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 1YeoTk-0008OE-TZ for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 19:37:01 +0200 Original-Received: from localhost ([::1]:37148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoTk-0006gU-9B for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 13:37:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoTV-0006cs-CH for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:36:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeoTU-0008NN-AY for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:36:45 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:60609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeoTQ-0008Lk-Gz; Sun, 05 Apr 2015 13:36:40 -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 0B0E31C3879; Mon, 6 Apr 2015 02:36:38 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id DC500120EC9; Mon, 6 Apr 2015 02:36:37 +0900 (JST) In-Reply-To: <83zj6nlzq4.fsf@gnu.org> 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:184939 Archived-At: Eli Zaretskii writes: > > From: "Stephen J. Turnbull" > > OK, so I interpreted this as [...] > > > > 3. Edit ChangeLog and C-x v v to commit, successfully. > > > > But some log messages were missing. > > Which ones? I'm afraid I'm not following you in this part. Richard wrote: > > > Something went wrong with lisp/ChangeLog. > > > > > > It appears that my change log entries went into an old > > > version of that file; I don't know why this happened, > > > since I wrote them today after doing 'git pull'. >From "old version", I assume he recognized that because logs were missing from the file. > > If the previous pull succeeded, does this mean that he lost a > > race in a handful of minutes? And lost "a lot" of text? Weird. > > One possibility is a merge from emacs-24, which can potentially bring > quite a few commits from the release branch, and is done by a program, > so it can be very fast. Look at the long list of the modified files > that are staged, which the pull succeeded to merge -- they do suggest > a lot of changes were fetched. You think Richard pulled from emacs-24? We'd have to ask him, but I would think he would have reported that if he had done it. Otherwise I don't understand what you're talking about. > > In other words, *Emacs* screwed Richard, not git. > > Yes, basically. More accurately, too rudimentary support in VC for > Git and the "popular" problems that need to be resolved with it. Certainly. And I'll grant that Glenn hammered on the issue of proper support for Emacs-for-git workflows for months while the transition was in progress. > Saving a file after resolving all of its conflicts automatically > runs "git add" for that file in Emacs's VC, so it is already > staged. > > So yes, "git commit" should have worked. OK. If vc does that, I don't understand the intended workflow in vc, then. Maybe it's just adapted to what ESR does.