summaryrefslogtreecommitdiff
path: root/lisp/vc-cvs.el
diff options
context:
space:
mode:
authorEric S. Raymond <esr@snark.thyrsus.com>2007-07-19 14:26:08 +0000
committerEric S. Raymond <esr@snark.thyrsus.com>2007-07-19 14:26:08 +0000
commit7d8c433264b5d72624acc6b4cebc7620040730d3 (patch)
treef78d0e43193011d05198cc409b0427dddab8e91c /lisp/vc-cvs.el
parentea139d51c44bdab6a1a796c7866d01be090dfaef (diff)
downloademacs-7d8c433264b5d72624acc6b4cebc7620040730d3.tar.gz
vc-cvs-checkin had some reference problems, now fixed.
Diffstat (limited to 'lisp/vc-cvs.el')
-rw-r--r--lisp/vc-cvs.el3
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"))))