[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   08/05/02 03:38:16

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.606
retrieving revision 1.607
diff -u -b -r1.606 -r1.607
--- vc.el       2 May 2008 03:30:10 -0000       1.606
+++ vc.el       2 May 2008 03:38:16 -0000       1.607
@@ -1620,7 +1620,8 @@
       ;; 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.