aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2008-06-08 15:18:28 +0000
committerAndreas Schwab2008-06-08 15:18:28 +0000
commit77003b236b92a337fd9403764f5e56f7fa743fed (patch)
tree69e16fe6941072cddf99b2793ad9dcdacc9477d1
parentc99657a5587beecba9039b5540e927abaf4a9720 (diff)
downloademacs-77003b236b92a337fd9403764f5e56f7fa743fed.tar.gz
emacs-77003b236b92a337fd9403764f5e56f7fa743fed.zip
(vc-cvs-dir-status): Pass -f to cvs.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-cvs.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea99adb5dc4..c5241a74839 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12008-06-08 Andreas Schwab <schwab@suse.de> 12008-06-08 Andreas Schwab <schwab@suse.de>
2 2
3 * vc-cvs.el (vc-cvs-dir-status): Pass -f to cvs.
4
3 * vc-dispatcher.el (vc-dir-move-to-goal-column): Don't move in an 5 * vc-dispatcher.el (vc-dir-move-to-goal-column): Don't move in an
4 empty line. 6 empty line.
5 7
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 5fc9206dec0..6c3d4fe5c18 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -909,7 +909,7 @@ state."
909 909
910(defun vc-cvs-dir-status (dir update-function) 910(defun vc-cvs-dir-status (dir update-function)
911 "Create a list of conses (file . state) for DIR." 911 "Create a list of conses (file . state) for DIR."
912 (vc-cvs-command (current-buffer) 'async dir "status") 912 (vc-cvs-command (current-buffer) 'async dir "-f" "status")
913 ;; Alternative implementation: use the "update" command instead of 913 ;; Alternative implementation: use the "update" command instead of
914 ;; the "status" command. 914 ;; the "status" command.
915 ;; (vc-cvs-command (current-buffer) 'async 915 ;; (vc-cvs-command (current-buffer) 'async