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 11:57:07 +0300 Message-ID: <83zj6nlzq4.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428224295 27214 80.91.229.3 (5 Apr 2015 08:58:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 08:58:15 +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 10:58:06 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 1YegNZ-0003oR-JK for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 10:58:05 +0200 Original-Received: from localhost ([::1]:35563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegNY-0002PP-H9 for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 04:58:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegNM-0002P9-Gt for emacs-devel@gnu.org; Sun, 05 Apr 2015 04:57:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YegNI-0005Ch-A6 for emacs-devel@gnu.org; Sun, 05 Apr 2015 04:57:52 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:57683) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegNI-0005CP-1U for emacs-devel@gnu.org; Sun, 05 Apr 2015 04:57:48 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NMB00E00SPDQV00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sun, 05 Apr 2015 11:57:05 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NMB00EVBSV5N520@a-mtaout22.012.net.il>; Sun, 05 Apr 2015 11:57:05 +0300 (IDT) In-reply-to: <87mw2nf01y.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.172 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:184905 Archived-At: > From: "Stephen J. Turnbull" > Cc: sorganov@gmail.com, > emacs-devel@gnu.org > Date: Sun, 05 Apr 2015 17:31:53 +0900 > > > I committed some changes using C-x v v in vc-dir. > > 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'. > > OK, so I interpreted this as > > 1. Hack the "some changes" mentioned above. > 2. Git pull successfully, implying the files changed in Richard's > workspace but (I assume) not committed did not conflict. > 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. > > After this, I did 'git pull' again, and it said there was a merge > > conflict in lisp/ChangeLpg. A lot of text appears to be missing from > > the file. It said, "fix conflicts and then commit the result." > > 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. > > The second error message, viz.: > > > > fatal: cannot do a partial commit during a merge. > > > > is because "C-x v v" invokes "git commit --only lisp/ChangeLog", which > > AFAIR always fails in this situation, for the reason hinted by the > > error message. > > Aha! But "git commit --include lisp/ChangeLog" DTRTs in this case, > committing the staged changes from the files successfully merged as > well as the new changes from the files where conflicts were resolved. > (Tested in a toy repo.) > > 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. > > Yes, something like that. In fact, I think the root cause of the > > original problem was that "C-x v v", which tried to commit a single > > file in the middle of a merge. Instead, the correct action is either > > 'v' from vc-dir or "git commit" from the shell prompt. > > I don't think "git commit" will actually work. "git commit" alone > will either commit only the unconflicted staged files (I think this > unlikely) or will refuse to commit because it remembers that ChangeLog > was conflicted (more likely). You need to "git add lisp/ChangeLog", 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.