From: Eric S. Raymond <esr@snark.thyrsus.com>
Date: Fri, 2 May 2008 03:38:16 +0000 (+0000)
Subject: More informative message when a fileset is in a mixed state.
X-Git-Tag: emacs-pretest-23.0.90~5894
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a094fe434f1322399cd9b9a9eeb3f2c67b226e28;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cd6ee7e3bf..6bdf90308a5 100644
--- 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 cdaecada65b..8e3521b9e45 100644
--- 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.