mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-02-07 20:54:32 +00:00
Better error message on missing files.
This commit is contained in:
parent
15ef1eaebb
commit
3c73c30e89
@ -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>
|
||||
|
||||
|
@ -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))
|
||||
|
Loading…
x
Reference in New Issue
Block a user