aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond2008-05-02 03:30:10 +0000
committerEric S. Raymond2008-05-02 03:30:10 +0000
commit105cac2d47375f84c695a28e5dd816821f81cf3b (patch)
treefb29c0d8ede47b5a2cb521f5a03485bfc18b2261
parentcd49dc20d31357f5629f5cbba54186e2409a817f (diff)
downloademacs-105cac2d47375f84c695a28e5dd816821f81cf3b.tar.gz
emacs-105cac2d47375f84c695a28e5dd816821f81cf3b.zip
Don't commit right after deletion.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-cvs.el3
-rw-r--r--lisp/vc.el3
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 @@
25 * vc.el (vc-default-dired-state): Change needs-patch state to 25 * vc.el (vc-default-dired-state): Change needs-patch state to
26 needs-update, since the name now shows up in dir-status listings 26 needs-update, since the name now shows up in dir-status listings
27 and was somewhat misleading. 27 and was somewhat misleading.
28 * vc.el (vc-cvs-delete-file) Don't do a "cvs commit" immediately after
29 removing the file.
28 30
292008-05-01 Sam Steingold <sds@gnu.org> 312008-05-01 Sam Steingold <sds@gnu.org>
30 32
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."
416 (message "Checking out %s...done" file)) 416 (message "Checking out %s...done" file))
417 417
418(defun vc-cvs-delete-file (file) 418(defun vc-cvs-delete-file (file)
419 (vc-cvs-command nil 0 file "remove" "-f") 419 (vc-cvs-command nil 0 file "remove" "-f"))
420 (vc-cvs-command nil 0 file "commit" "-mRemoved."))
421 420
422(defun vc-cvs-revert (file &optional contents-done) 421(defun vc-cvs-revert (file &optional contents-done)
423 "Revert FILE to the working revision on which it was based." 422 "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 @@
660;; - do not default to RCS anymore when the current directory is not 660;; - do not default to RCS anymore when the current directory is not
661;; controlled by any VCS and the user does C-x v v 661;; controlled by any VCS and the user does C-x v v
662;; 662;;
663;; - vc-cvs-delete-file should not do a "cvs commit" immediately after
664;; removing the file.
665;;
666;; - vc-create-snapshot and vc-retrieve-snapshot should update the 663;; - vc-create-snapshot and vc-retrieve-snapshot should update the
667;; buffers that might be visiting the affected files. 664;; buffers that might be visiting the affected files.
668;; 665;;