# HG changeset patch
# User Eric S. Raymond <esr@snark.thyrsus.com>
# Date 1184855168 0
# Node ID ef9ebdaeea06798a20cb887ad74a8bf93d9c39c9
# Parent  69946487f7b517965ce2db8a4fff9a9383362dfd
vc-cvs-checkin had some reference problems, now fixed.

diff -r 69946487f7b5 -r ef9ebdaeea06 lisp/vc-cvs.el
--- a/lisp/vc-cvs.el	Thu Jul 19 14:18:33 2007 +0000
+++ b/lisp/vc-cvs.el	Thu Jul 19 14:26:08 2007 +0000
@@ -342,7 +342,8 @@
       ;; 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"))))