diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 2008-05-02 03:30:10 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 2008-05-02 03:30:10 +0000 |
| commit | 105cac2d47375f84c695a28e5dd816821f81cf3b (patch) | |
| tree | fb29c0d8ede47b5a2cb521f5a03485bfc18b2261 /lisp | |
| parent | cd49dc20d31357f5629f5cbba54186e2409a817f (diff) | |
| download | emacs-105cac2d47375f84c695a28e5dd816821f81cf3b.tar.gz emacs-105cac2d47375f84c695a28e5dd816821f81cf3b.tar.bz2 emacs-105cac2d47375f84c695a28e5dd816821f81cf3b.zip | |
Don't commit right after deletion.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc-cvs.el | 3 | ||||
| -rw-r--r-- | lisp/vc.el | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 769f3898ac9..7cd6ee7e3bf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -25,6 +25,8 @@ * vc.el (vc-default-dired-state): Change needs-patch state to needs-update, since the name now shows up in dir-status listings and was somewhat misleading. + * vc.el (vc-cvs-delete-file) Don't do a "cvs commit" immediately after + removing the file. 2008-05-01 Sam Steingold <sds@gnu.org> diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index bd92fab3326..f935bf9a486 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -416,8 +416,7 @@ REV is the revision to check out." (message "Checking out %s...done" file)) (defun vc-cvs-delete-file (file) - (vc-cvs-command nil 0 file "remove" "-f") - (vc-cvs-command nil 0 file "commit" "-mRemoved.")) + (vc-cvs-command nil 0 file "remove" "-f")) (defun vc-cvs-revert (file &optional contents-done) "Revert FILE to the working revision on which it was based." diff --git a/lisp/vc.el b/lisp/vc.el index 4aefc21530a..cdaecada65b 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -660,9 +660,6 @@ ;; - do not default to RCS anymore when the current directory is not ;; controlled by any VCS and the user does C-x v v ;; -;; - vc-cvs-delete-file should not do a "cvs commit" immediately after -;; removing the file. -;; ;; - vc-create-snapshot and vc-retrieve-snapshot should update the ;; buffers that might be visiting the affected files. ;; |