From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: 4 minor suggestions for files.el Date: Tue, 06 May 2003 06:14:45 -0400 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: References: <200304142022.h3EKMHRu026814@rum.cs.yale.edu> <200304172139.h3HLdBvK009948@rum.cs.yale.edu> <200304292107.h3TL7Kl9007427@rum.cs.yale.edu> <200305051457.h45EvYlA007032@rum.cs.yale.edu> Reply-To: rms@gnu.org NNTP-Posting-Host: main.gmane.org X-Trace: main.gmane.org 1052216522 1787 80.91.224.249 (6 May 2003 10:22:02 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Tue, 6 May 2003 10:22:02 +0000 (UTC) Cc: monnier+gnu/emacs@rum.cs.yale.edu Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Tue May 06 12:21:57 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 19CzZr-0000Ra-00 for ; Tue, 06 May 2003 12:21:39 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19CzdJ-00053O-00 for ; Tue, 06 May 2003 12:25:13 +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 19CzWG-000072-07 for emacs-devel@quimby.gnus.org; Tue, 06 May 2003 06:17:56 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 19CzTb-0007te-00 for emacs-devel@gnu.org; Tue, 06 May 2003 06:15:11 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 19CzTE-0007K5-00 for emacs-devel@gnu.org; Tue, 06 May 2003 06:14:49 -0400 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19CzTC-0007GD-00 for emacs-devel@gnu.org; Tue, 06 May 2003 06:14:46 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.10) id 19CzTB-0006Gx-00; Tue, 06 May 2003 06:14:45 -0400 Original-To: "Stefan Monnier" In-reply-to: <200305051457.h45EvYlA007032@rum.cs.yale.edu> (monnier+gnu/emacs@rum.cs.yale.edu) Original-cc: spiegel@gnu.org Original-cc: emacs-devel@gnu.org 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:13711 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:13711 > In order for undo in Emacs to operate in a predictable and reliable > way, it should undo the changes that you made with your editing. If > you want to undo the changes that came from CVS, that should be a > separate command, designed to coordinate with CVS. What I have in > mind is a command to take out the changes that were made between a > certain pair of versions. CVS generally doesn't know: the local file generally has local modifications (otherwise, there's generally no interesting undo log to worry about) so the merge done by `cvs update' is not the same as the change recorded in the repository. Are you saying vc-merge does not do this job?