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: Sun, 05 Apr 2015 11:55:24 +0200 Message-ID: <5521068C.1000508@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> <837ftspcis.fsf@gnu.org> <87vbhbft9a.fsf@uwakimon.sk.tsukuba.ac.jp> <83619bnjsy.fsf@gnu.org> 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 1428227749 12128 80.91.229.3 (5 Apr 2015 09:55:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 09:55:49 +0000 (UTC) Cc: "Stephen J. Turnbull" , 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 11:55:48 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 1YehHP-0001Bb-Ql for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 11:55:47 +0200 Original-Received: from localhost ([::1]:35706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YehHP-0003lk-7e for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 05:55:47 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YehH9-0003lU-5O for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:55:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YehH8-0007rp-Bj for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:55:31 -0400 Original-Received: from hylle05.itea.ntnu.no ([2001:700:300:3::225]:48779) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YehH6-0007qm-Nh; Sun, 05 Apr 2015 05:55:28 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id C36929013D3; Sun, 5 Apr 2015 11:55:26 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::6c00:a298:a5fc:6f32] (unknown [IPv6:2001:4662:4ffb:0:6c00:a298:a5fc:6f32]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id 17E209011E3; Sun, 5 Apr 2015 11:55:26 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <83619bnjsy.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::225 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:184910 Archived-At: Eli Zaretskii wrote: > 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. > > It would be good if "C-x v v" tried to support this situation better. > I hope Eric Raymond is reading this. You need to detect the fact that a merge is underway. Is the existence=20 of .git/MERGE_HEAD a reliable indicator of this? =E2=80=93 Harald