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: VC mode and git Date: Sun, 05 Apr 2015 20:50:49 +0300 Message-ID: <837ftqmpl2.fsf@gnu.org> 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> <87h9sufpei.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428256266 1835 80.91.229.3 (5 Apr 2015 17:51:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 17:51:06 +0000 (UTC) Cc: 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 Sun Apr 05 19:50:57 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 1YeohD-0000V8-NU for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 19:50:55 +0200 Original-Received: from localhost ([::1]:37203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeohC-00040C-Pq for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 13:50:54 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeoh9-000407-K5 for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:50:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yeoh6-0004sz-Dy for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:50:51 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:50083) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yeoh6-0004st-5w for emacs-devel@gnu.org; Sun, 05 Apr 2015 13:50:48 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NMC00B00H6DTU00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sun, 05 Apr 2015 20:50:46 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMC00BW2HKMHK70@a-mtaout20.012.net.il>; Sun, 05 Apr 2015 20:50:46 +0300 (IDT) In-reply-to: <87h9sufpei.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:184948 Archived-At: > From: "Stephen J. Turnbull" > Cc: sorganov@gmail.com, > emacs-devel@gnu.org > Date: Mon, 06 Apr 2015 02:36:37 +0900 > > > > 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? No, I think someone else merged from emacs-24 onto master, and pushed the result between Richard's 2 pulls. > > 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. I think VC's support of the intended workflow "needs work" (TM).