More informative message when a fileset is in a mixed state.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cd6ee7e3bf28dd50e7232b13910bdaaad6a2645..6bdf90308a5af1d9c2321611f9d91ad24250d8da 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -27,6 +27,8 @@
        and was somewhat misleading.
        * vc.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.
 
 2008-05-01  Sam Steingold  <sds@gnu.org>
 

diff --git a/lisp/vc.el b/lisp/vc.el
index cdaecada65b41a14388ed93102d1ad4fcff7eddf..8e3521b9e454750dbc794e37628af293da39950f 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1620,7 +1620,8 @@ merge in the changes into your working copy."
       ;; Ignore directories, they are compatible with anything.
       (unless (file-directory-p file)
        (unless (vc-compatible-state (vc-state file) state)
-         (error "Fileset is in a mixed-up state %s %s" state (vc-state file)))
+         (error "%s:%s clashes with %s:%s"
+                file (vc-state file) (car files) state))
        (unless (eq (vc-checkout-model backend file) model)
          (error "Fileset has mixed checkout models"))))
     ;; Check for buffers in the fileset not matching the on-disk contents.