From 2bc9f1df7d93fba9d2e62c0d35a428edd71bb248 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 20 Mar 2009 13:56:42 +0000 Subject: [PATCH] (vc-dir-deduce-fileset): Make the error message more explicit. --- lisp/ChangeLog | 4 ++++ lisp/vc-dir.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cbae73edfd..9cd895c4f3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-03-20 Dan Nicolaescu + + * vc-dir.el (vc-dir-deduce-fileset): Make the error message more explicit. + 2009-03-19 Juanma Barranquero * subr.el (forward-point): Add obsolescence declaration. diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el index d2414f9172..4ac5ed6852 100644 --- a/lisp/vc-dir.el +++ b/lisp/vc-dir.el @@ -1101,7 +1101,7 @@ outside of VC) and one wants to do some operation on it." ;; 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))) -- 2.39.2