From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Git conflict VC state detection Date: Sun, 10 Nov 2013 19:16:56 -0500 Message-ID: References: <527BCD00.9090105@openmailbox.org> <87d2mcdrgu.fsf@yandex.ru> <877gcia4c5.fsf@web.de> <87fvr61f4d.fsf@wanadoo.es> <877gch1uul.fsf@wanadoo.es> <87wqkgyp7z.fsf_-_@wanadoo.es> <527FFA0B.1080805@yandex.ru> <87ppq7zyqx.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1384129032 21993 80.91.229.3 (11 Nov 2013 00:17:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Nov 2013 00:17:12 +0000 (UTC) Cc: emacs-devel@gnu.org, Dmitry Gutov To: =?windows-1252?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 11 01:17:16 2013 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 1VffBr-0002nf-SA for ged-emacs-devel@m.gmane.org; Mon, 11 Nov 2013 01:17:15 +0100 Original-Received: from localhost ([::1]:34156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VffBr-0008Qf-7A for ged-emacs-devel@m.gmane.org; Sun, 10 Nov 2013 19:17:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VffBi-0008QV-6i for emacs-devel@gnu.org; Sun, 10 Nov 2013 19:17:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VffBY-0005W3-7c for emacs-devel@gnu.org; Sun, 10 Nov 2013 19:17:06 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:38081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VffBY-0005Vr-3I for emacs-devel@gnu.org; Sun, 10 Nov 2013 19:16:56 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av4EABK/CFFsoX7o/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNBIUGA0kLodwBsEtkQoDiGGcGYFegxU X-IPAS-Result: Av4EABK/CFFsoX7o/2dsb2JhbABEvw4Xc4IeAQEEAVYjBQsLNBIUGA0kLodwBsEtkQoDiGGcGYFegxU X-IronPort-AV: E=Sophos;i="4.84,565,1355115600"; d="scan'208";a="37529538" Original-Received: from 108-161-126-232.dsl.teksavvy.com (HELO fmsmemgm.homelinux.net) ([108.161.126.232]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 10 Nov 2013 19:16:54 -0500 Original-Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id A1E44AE09A; Sun, 10 Nov 2013 19:16:56 -0500 (EST) In-Reply-To: <87ppq7zyqx.fsf@wanadoo.es> (=?windows-1252?Q?=22=D3scar?= Fuentes"'s message of "Sun, 10 Nov 2013 23:19:02 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 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:165131 Archived-At: > I'm not myself happy with the solution. It all depends on how important > it is to know the `conflict' status. Maybe other features on Emacs VC > depends on it. The feature that depends on this information is to automatically enable smerge-mode when there's a conflict and to automatically mark the conflicts as resolved when there are no more diff3 markers (see how it's done is vc-svn.el and vc-bzr.el). So, an alternative to fixing vc-state is to add a vc-git-conflict-p called from the find-file-hook. Another useful feature along those lines is to add support for vc-find-conflicted-file. Stefan