From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Andre Spiegel Newsgroups: gmane.emacs.devel Subject: Re: 4 minor suggestions for files.el Date: 07 May 2003 14:31:19 +0200 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <1052310679.6399.34.camel@localhost> References: <200304142022.h3EKMHRu026814@rum.cs.yale.edu> <200304172139.h3HLdBvK009948@rum.cs.yale.edu> <200304292107.h3TL7Kl9007427@rum.cs.yale.edu> <1052218614.509.109.camel@localhost> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Trace: main.gmane.org 1052310930 18450 80.91.224.249 (7 May 2003 12:35:30 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 7 May 2003 12:35:30 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Wed May 07 14:35:26 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19DO8s-0004n5-00 for ; Wed, 07 May 2003 14:35:26 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19DOCr-0003GS-00 for ; Wed, 07 May 2003 14:39:33 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19DO5g-0002u5-07 for emacs-devel@quimby.gnus.org; Wed, 07 May 2003 08:32:08 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 19DO5O-0002t2-00 for emacs-devel@gnu.org; Wed, 07 May 2003 08:31:50 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 19DO5N-0002rj-00 for emacs-devel@gnu.org; Wed, 07 May 2003 08:31:49 -0400 Original-Received: from [194.73.242.4] (helo=wmpmta02-app.mail-store.com) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19DO4w-0002iQ-00; Wed, 07 May 2003 08:31:22 -0400 Original-Received: from [10.0.1.2] ([217.81.126.83]) by wmpmta02-app.mail-store.com with ESMTP id <20030507123120.DIQA8904.wmpmta02-app.mail-store.com@[10.0.1.2]>; Wed, 7 May 2003 13:31:20 +0100 Original-To: rms@gnu.org In-Reply-To: X-Mailer: Ximian Evolution 1.2.4 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Emacs development discussions. List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:13739 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:13739 On Wed, 2003-05-07 at 13:51, Richard Stallman wrote: > I don't think it's wise to make this available through the general undo > mechanism. For example, vc-merge may also detect conflicts with your > own changes, and you need to resolve them before the merge operation is > actually finished. How would you undo that? > > I presume you would resolve them through editing, so I guess you > could undo those editing operations. Would that be unreasonable? Conflict resolution works by invoking smerge-mode or ediff after the merge operation, automatically. If we follow the undo path, we ought to make sure what the interactions will be with these mechanisms. Stefan?