From: Eric S. Raymond <esr@snark.thyrsus.com>
Date: Thu, 19 Jul 2007 14:26:08 +0000 (+0000)
Subject: vc-cvs-checkin had some reference problems, now fixed.
X-Git-Tag: emacs-pretest-23.0.90~11837
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d8c433264b5d72624acc6b4cebc7620040730d3;p=emacs.git

vc-cvs-checkin had some reference problems, now fixed.
---

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index fab59b1710c..588ff4be6ba 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -342,7 +342,8 @@ its parents."
       ;; Check checkin problem.
       (cond
        ((re-search-forward "Up-to-date check failed" nil t)
-        (vc-file-setprop file 'vc-state 'needs-merge)
+	(mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge))
+	      files)
         (error (substitute-command-keys
                 (concat "Up-to-date check failed: "
                         "type \\[vc-next-action] to merge in changes"))))