From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Move to git is imminent - awaiting Stefan's approval Date: Mon, 06 Jan 2014 22:29:48 +0100 Message-ID: <871u0k7q9f.fsf@wanadoo.es> References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389043820 26961 80.91.229.3 (6 Jan 2014 21:30:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Jan 2014 21:30:20 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 06 22:30:26 2014 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 1W0Hkb-0005CF-1e for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 22:30:21 +0100 Original-Received: from localhost ([::1]:37670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0Hka-0000kN-M0 for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 16:30:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0HkS-0000iB-N4 for emacs-devel@gnu.org; Mon, 06 Jan 2014 16:30:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0HkL-000889-EY for emacs-devel@gnu.org; Mon, 06 Jan 2014 16:30:12 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:53400) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0HkL-00084J-8n for emacs-devel@gnu.org; Mon, 06 Jan 2014 16:30:05 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0HkH-0004RJ-2q for emacs-devel@gnu.org; Mon, 06 Jan 2014 22:30:01 +0100 Original-Received: from 222.red-83-41-58.dynamicip.rima-tde.net ([83.41.58.222]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 06 Jan 2014 22:30:01 +0100 Original-Received: from ofv by 222.red-83-41-58.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 06 Jan 2014 22:30:01 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 24 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 222.red-83-41-58.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) Cancel-Lock: sha1:CEult7nWLWOLv4oxqO/O+Or/BHA= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:167528 Archived-At: Stefan Monnier writes: [snip] > I'd also like: > > - Improve vc-git.el so that it can automatically enable smerge-mode when > opening a conflicted file We discussed a patch for this. IIRC it had the inconvenience of requiring two git calls for each file, although in theory it was possible to cache the results for the entire tree. > and (probably conditional on a config var) > mark the file as "not conflicted any more" when saving with no > remaining diff3 markers. > This currently works in vc-bzr.el (and vc-svn.el as well, IIRC). The config var is important. Here, conflict is considered solved only after testing the changes (does it compile? does it pass the regression tests?.) [snip]