# HG changeset patch # User Dan Nicolaescu # Date 1237557402 0 # Node ID ab984696947f6e81ee20db99655729daf885f580 # Parent ae4c4cf5b7ebb7977abc32118abfcc5e02e935bc (vc-dir-deduce-fileset): Make the error message more explicit. diff -r ae4c4cf5b7eb -r ab984696947f lisp/ChangeLog --- 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 + + * 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 -r ae4c4cf5b7eb -r ab984696947f lisp/vc-dir.el --- 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)))