Don't commit right after deletion.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 769f3898ac9966d1f26e9e4c674bd15cd6a05fd2..7cd6ee7e3bf28dd50e7232b13910bdaaad6a2645 100644 (file)
--- 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 bd92fab33268c227248dfe74d048df382c2587f1..f935bf9a4862e5be4800fd63373c7de2d8f17b96 100644 (file)
--- 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 4aefc21530a6d1883721adafa23fdf83b236400c..cdaecada65b41a14388ed93102d1ad4fcff7eddf 100644 (file)
--- 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.
 ;;