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

1 files changed, 2 insertions, 1 deletions

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"))))