From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: "Stefan Monnier" Newsgroups: gmane.emacs.devel Subject: Re: 4 minor suggestions for files.el Date: Tue, 06 May 2003 08:54:59 -0400 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <200305061255.h46Ct0D3011198@rum.cs.yale.edu> 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> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1052225798 8686 80.91.224.249 (6 May 2003 12:56:38 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Tue, 6 May 2003 12:56:38 +0000 (UTC) Cc: Stefan Monnier Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Tue May 06 14:56:36 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 19D1zo-0002Fp-00 for ; Tue, 06 May 2003 14:56:36 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19D23J-0006Xy-00 for ; Tue, 06 May 2003 15:00: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 19D1zQ-0002WH-04 for emacs-devel@quimby.gnus.org; Tue, 06 May 2003 08:56:12 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 19D1yq-0002BY-00 for emacs-devel@gnu.org; Tue, 06 May 2003 08:55:36 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 19D1ym-0001zI-00 for emacs-devel@gnu.org; Tue, 06 May 2003 08:55:33 -0400 Original-Received: from rum.cs.yale.edu ([128.36.229.169]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19D1yG-0001V2-00; Tue, 06 May 2003 08:55:00 -0400 Original-Received: from rum.cs.yale.edu (localhost [127.0.0.1]) by rum.cs.yale.edu (8.12.8/8.12.8) with ESMTP id h46Ct0x6011200; Tue, 6 May 2003 08:55:00 -0400 Original-Received: (from monnier@localhost) by rum.cs.yale.edu (8.12.8/8.12.8/Submit) id h46Ct0D3011198; Tue, 6 May 2003 08:55:00 -0400 X-Mailer: exmh version 2.4 06/23/2000 with nmh-1.0.4 Original-To: Richard Stallman 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:13719 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:13719 > > 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? Not quite. Just like patch file