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: VC needs a mechanism to turn on smerge-mode in case of conflics Date: Sun, 13 Jan 2008 16:56:37 -0500 Message-ID: References: <200801132018.m0DKIZRN029597@oogie-boogie.ics.uci.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1200261790 16752 80.91.229.12 (13 Jan 2008 22:03:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 13 Jan 2008 22:03:10 +0000 (UTC) Cc: emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 13 23:03:32 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JEAvT-0007V3-R1 for ged-emacs-devel@m.gmane.org; Sun, 13 Jan 2008 23:03:32 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEAv5-0003cn-Se for ged-emacs-devel@m.gmane.org; Sun, 13 Jan 2008 17:03:07 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JEAv3-0003cA-7p for emacs-devel@gnu.org; Sun, 13 Jan 2008 17:03:05 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JEAv1-0003bx-H4 for emacs-devel@gnu.org; Sun, 13 Jan 2008 17:03:04 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEAv1-0003bu-EX for emacs-devel@gnu.org; Sun, 13 Jan 2008 17:03:03 -0500 Original-Received: from ironport2-out.pppoe.ca ([206.248.154.182]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JEAv1-0004wH-0l for emacs-devel@gnu.org; Sun, 13 Jan 2008 17:03:03 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ao8CANsZikfO+KVp/2dsb2JhbACmb30 X-IronPort-AV: E=Sophos;i="4.24,279,1196658000"; d="scan'208";a="12618223" Original-Received: from smtp.pppoe.ca ([65.39.196.238]) by ironport2-out.pppoe.ca with ESMTP; 13 Jan 2008 17:03:02 -0500 Original-Received: from ceviche.home ([206.248.165.105]) by smtp.pppoe.ca (Internet Mail Server v1.0) with ESMTP id TXQ28102 for ; Sun, 13 Jan 2008 17:03:02 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 36C69B4128; Sun, 13 Jan 2008 16:56:37 -0500 (EST) In-Reply-To: <200801132018.m0DKIZRN029597@oogie-boogie.ics.uci.edu> (Dan Nicolaescu's message of "Sun, 13 Jan 2008 12:18:35 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:86852 Archived-At: > Currently smerge-mode gets turned on if emacs detects a conflict when > doing a merge/update. But if the merge is done from the command line or > some other tool, the version control system might know there's conflict. > But VC does not turn on smerge-mode when doing C-x C-f on a file with > conflicts. > It would be nice if there was a way to do this. Indeed. It already does that in the Arch and SVN backends. Stefan