Mercurial > emacs
changeset 81977:ef9ebdaeea06
vc-cvs-checkin had some reference problems, now fixed.
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Thu, 19 Jul 2007 14:26:08 +0000 |
| parents | 69946487f7b5 |
| children | ac7b97499a4b |
| files | lisp/vc-cvs.el |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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"))))