# HG changeset patch
# User Eric S. Raymond <esr@snark.thyrsus.com>
# Date 1209699010 0
# Node ID 37fa7ba3820cc9d942b2c1a328ed976455ac7a43
# Parent  4bc924044f222b1ff0c8ee83646804afd762e283
Don't commit right after deletion.

diff -r 4bc924044f22 -r 37fa7ba3820c lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 02 03:23:53 2008 +0000
+++ b/lisp/ChangeLog	Fri May 02 03:30:10 2008 +0000
@@ -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 -r 4bc924044f22 -r 37fa7ba3820c lisp/vc-cvs.el
--- a/lisp/vc-cvs.el	Fri May 02 03:23:53 2008 +0000
+++ b/lisp/vc-cvs.el	Fri May 02 03:30:10 2008 +0000
@@ -416,8 +416,7 @@
   (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 -r 4bc924044f22 -r 37fa7ba3820c lisp/vc.el
--- a/lisp/vc.el	Fri May 02 03:23:53 2008 +0000
+++ b/lisp/vc.el	Fri May 02 03:30:10 2008 +0000
@@ -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.
 ;;