From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: VC needs a mechanism to turn on smerge-mode in case of conflics Date: Mon, 14 Jan 2008 00:44:02 -0800 Message-ID: <200801140844.m0E8i2Z1019889@oogie-boogie.ics.uci.edu> 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 1200300411 8970 80.91.229.12 (14 Jan 2008 08:46:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Jan 2008 08:46:51 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 14 09:47:12 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 1JEKyN-0002Cn-7q for ged-emacs-devel@m.gmane.org; Mon, 14 Jan 2008 09:47:11 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEKxz-0000uH-0x for ged-emacs-devel@m.gmane.org; Mon, 14 Jan 2008 03:46:47 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JEKxv-0000uC-0d for emacs-devel@gnu.org; Mon, 14 Jan 2008 03:46:43 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JEKxu-0000tv-5l for emacs-devel@gnu.org; Mon, 14 Jan 2008 03:46:42 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEKxu-0000to-2g for emacs-devel@gnu.org; Mon, 14 Jan 2008 03:46:42 -0500 Original-Received: from oogie-boogie.ics.uci.edu ([128.195.1.41]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JEKxu-0001Zg-0r for emacs-devel@gnu.org; Mon, 14 Jan 2008 03:46:42 -0500 Original-Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by oogie-boogie.ics.uci.edu (8.13.6/8.13.6) with ESMTP id m0E8i2Z1019889; Mon, 14 Jan 2008 00:44:02 -0800 (PST) In-Reply-To: (Stefan Monnier's message of "Sun, 13 Jan 2008 16:56:37 -0500") Original-Lines: 12 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-0.84, required 5, autolearn=disabled, ALL_TRUSTED -1.44, J_CHICKENPOX_22 0.60) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu X-detected-kernel: by monty-python.gnu.org: Solaris 9 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:86881 Archived-At: Stefan Monnier writes: > > 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. I created a Todo section in vc.el and added this there.