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: Automatically marking conflicts are resolved (was: Move to git is imminent - awaiting Stefan's approval) Date: Tue, 07 Jan 2014 01:20:01 +0100 Message-ID: <87sit063ta.fsf_-_@wanadoo.es> References: <20140106165108.B6BF4380865@snark.thyrsus.com> <83zjn9rpaz.fsf@gnu.org> <871u0k7q9f.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1389054026 13193 80.91.229.3 (7 Jan 2014 00:20:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 7 Jan 2014 00:20:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 07 01:20:32 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 1W0KPH-0005Kh-As for ged-emacs-devel@m.gmane.org; Tue, 07 Jan 2014 01:20:31 +0100 Original-Received: from localhost ([::1]:38209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0KPG-00018x-A0 for ged-emacs-devel@m.gmane.org; Mon, 06 Jan 2014 19:20:30 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0KP5-00012B-OX for emacs-devel@gnu.org; Mon, 06 Jan 2014 19:20:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W0KOz-0006Xg-UY for emacs-devel@gnu.org; Mon, 06 Jan 2014 19:20:19 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:49473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W0KOz-0006Xa-Jd for emacs-devel@gnu.org; Mon, 06 Jan 2014 19:20:13 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W0KOy-0004eY-EJ for emacs-devel@gnu.org; Tue, 07 Jan 2014 01:20:12 +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 ; Tue, 07 Jan 2014 01:20:12 +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 ; Tue, 07 Jan 2014 01:20:12 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 21 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:GJFKfrReGGPG9U4x0c7BUptd4XM= 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:167554 Archived-At: Stefan Monnier writes: >> Here, conflict is considered solved only after testing the changes (does >> it compile? does it pass the regression tests?.) > > When Git resolves concurrent changes automatically, it doesn't mark the > file as "there was an unchecked change in here", Right, so you must consider everything as unchecked changes. > so for the same reason > I think the default behavior of vc-git + smerge-mode should be to remove > the "conflicted" mark on files after the user has removed all > diff3 markers. On the compile/test phase it is useful to know which problems comes from the automatic merge and which ones comes from the areas you edited while resolving the conflicts. I'm fine with the optional toggle, so there is no need to discuss this further.