emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: D. Goel
Subject: [Emacs-diffs] Changes to emacs/lisp/vc.el,v
Date: Thu, 06 Dec 2007 19:48:31 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     D. Goel <deego> 07/12/06 19:48:30

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -b -r1.489 -r1.490
--- vc.el       6 Dec 2007 17:56:42 -0000       1.489
+++ vc.el       6 Dec 2007 19:48:29 -0000       1.490
@@ -2622,10 +2622,10 @@
              (error "%s"
               (substitute-command-keys
                "File is locked--type \\[vc-revert] to discard changes"))
-           (error "%s"
+           (error "Unexpected file state (%s) -- type %s"
+            (vc-state file)
             (substitute-command-keys
-             "Unexpected file state (%s)--type \\[vc-next-action] to correct")
-            (vc-state file)))
+             "\\[vc-next-action] to correct"))
        (if (not (vc-find-backend-function (vc-backend file) 'merge-news))
            (error "Sorry, merging news is not implemented for %s"
                   (vc-backend file))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]