Mercurial > emacs
changeset 102660:ab984696947f
(vc-dir-deduce-fileset): Make the error message more explicit.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 20 Mar 2009 13:56:42 +0000 |
| parents | ae4c4cf5b7eb |
| children | a2aaf6402fc7 |
| files | lisp/ChangeLog lisp/vc-dir.el |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Mar 20 09:41:19 2009 +0000 +++ b/lisp/ChangeLog Fri Mar 20 13:56:42 2009 +0000 @@ -1,3 +1,7 @@ +2009-03-20 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-dir.el (vc-dir-deduce-fileset): Make the error message more explicit. + 2009-03-19 Juanma Barranquero <lekktu@gmail.com> * subr.el (forward-point): Add obsolescence declaration.
--- a/lisp/vc-dir.el Fri Mar 20 09:41:19 2009 +0000 +++ b/lisp/vc-dir.el Fri Mar 20 13:56:42 2009 +0000 @@ -1101,7 +1101,7 @@ ;; state to decide which operation to perform. (dolist (crt (cdr only-files-list)) (unless (vc-compatible-state (cdr crt) state) - (error "%s:%s clashes with %s:%s" + (error "When applying VC operations to multiple files, the files are required\nto be in similar VC states.\n%s in state %s clashes with %s in state %s" (car crt) (cdr crt) (caar only-files-list) state))) (setq only-files-list (mapcar 'car only-files-list)) (when (and state (not (eq state 'unregistered)))