emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: 4 minor suggestions for files.el


From: Stefan Monnier
Subject: Re: 4 minor suggestions for files.el
Date: Tue, 06 May 2003 08:54:59 -0400

>     > 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 <foo.diff
    patch -R file <foo.diff

does not always return the original file.


        Stefan





reply via email to

[Prev in Thread] Current Thread [Next in Thread]