Mercurial > emacs
changeset 94538:dc1cd59ce955
Better error message on missing files.
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Fri, 02 May 2008 03:52:08 +0000 |
| parents | e158200330c2 |
| children | fee32a11924d |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri May 02 03:48:17 2008 +0000 +++ b/lisp/ChangeLog Fri May 02 03:52:08 2008 +0000 @@ -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>
--- a/lisp/vc.el Fri May 02 03:48:17 2008 +0000 +++ b/lisp/vc.el Fri May 02 03:52:08 2008 +0000 @@ -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 @@ (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))