mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/vc/vc.el (vc-pull): Clear cached incoming revisions.

Browse source
This commit is contained in:
Sean Whitton 2025-12-03 11:20:00 +00:00
parent 34331ae6f9
commit b8cefd6c43
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/vc/vc.el
View file

@ -4236,10 +4236,14 @@ tip revision are merged into the working file."
(cond (cond
;; If a pull operation is defined, use it. ;; If a pull operation is defined, use it.
((vc-find-backend-function backend 'pull) ((vc-find-backend-function backend 'pull)
(vc-call-backend backend 'pull arg)) (vc-call-backend backend 'pull arg)
;; FIXME: Ideally we would only clear out the stored value for the
;; REMOTE-LOCATION from which we are pulling.
(vc-run-delayed
(vc--repo-setprop backend 'vc-incoming-revision nil)))
;; If VCS has `merge-news' functionality (CVS and SVN), use it. ;; If VCS has `merge-news' functionality (CVS and SVN), use it.
((vc-find-backend-function backend 'merge-news) ((vc-find-backend-function backend 'merge-news)
(save-some-buffers ; save buffers visiting files (save-some-buffers ; save buffers visiting files
nil (lambda () nil (lambda ()
(and (buffer-modified-p) (and (buffer-modified-p)
(let ((file (buffer-file-name))) (let ((file (buffer-file-name)))