Better error message on missing files.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9d6ded2cd8a636dcab729609310a2c946b3f793..1611fec08b148edeeba62d24ab828dfcb105bcac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -35,8 +35,8 @@
        and was somewhat misleading.
        * vc-cvs.el (vc-cvs-delete-file) Don't do a "cvs commit"
        immediately after removing the file.
-       * vc.el (vc-next-action): More informative message when a fileset
-       is in a mixed state.
+       * vc.el (vc-next-action): More informative messages when a fileset
+       is in a mixed state or files are missing.
 
 2008-05-01  Sam Steingold  <sds@gnu.org>
 

diff --git a/lisp/vc.el b/lisp/vc.el
index 82d59c0f84d3f9157c2ed9612f2a498059ee2747..a56b281122b204b9fbab51d3117179b0afab813b 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -621,9 +621,6 @@
 ;;
 ;; - add a mechanism for ignoring files.
 ;;
-;; - vc-next-action should do something about 'missing files. Maybe
-;;   just warn, or offer to checkout.
-;;
 ;; - When vc-next-action calls vc-checkin it could pre-fill the
 ;;   *VC-log* buffer with some obvious items: the list of files that
 ;;   were added, the list of files that were removed.  If the diff is
@@ -1653,6 +1650,8 @@ merge in the changes into your working copy."
                  (error "Aborted")))))))
     ;; Do the right thing
     (cond
+     ((eq state 'missing)
+      (error "Fileset files are missing, so cannot be operated on."))
      ;; Files aren't registered
      ((or (eq state 'unregistered)
          (eq state 'ignored))