[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#11605: 24.1.50; vc-ediff revert annoyance
From: |
Lars Ingebrigtsen |
Subject: |
bug#11605: 24.1.50; vc-ediff revert annoyance |
Date: |
Wed, 24 Feb 2016 17:33:44 +1100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) |
William Xu <william.xwl@gmail.com> writes:
> 1. emacs -Q
> 2. visit a version controlled file, say `foo'.
> 3. M-x vc-ediff, run it couple of times.
>
> You will see this annoying message many times:
>
> File foo.~master~ changed on disk. Reread from disk? (yes or no)
I can confirm that this bug is still present in the Emacs trunk.
> The reason is the ~master~ file is checked out everytime we run
> vc-ediff, and after ediff session, the ~master~ buffer is always left
> there, hence, when running vc-ediff multiple times it constantly asks
> you whether you want to revert. Why not let it revert automatically?
>
> How about this patch?
[...]
I think the patch sounds reasonable, but the vc machinery is something
with which I'm not overly familiar.
Could somebody take a peek at this patch?
> From d2af0f4dcc81b39d9360135244d6870388a264a3 Mon Sep 17 00:00:00 2001
> From: William Xu <william.xwl@gmail.com>
> Date: Sat, 2 Jun 2012 12:16:45 +0800
> Subject: [PATCH] (vc-find-revision): Auto revert file revision buffer
> quietly.
>
> ---
> lisp/vc/vc.el | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
> index 87e4e1c..bd337d0 100644
> --- a/lisp/vc/vc.el
> +++ b/lisp/vc/vc.el
> @@ -1815,11 +1815,13 @@ Use BACKEND as the VC backend if specified."
> (delete-file filename))))
> (vc-mode-line file))
> (message "Checking out %s...done" filename)))
> - (let ((result-buf (find-file-noselect filename)))
> + (let ((result-buf (or (get-file-buffer filename)
> + (find-file-noselect filename))))
> (with-current-buffer result-buf
> ;; Set the parent buffer so that things like
> ;; C-x v g, C-x v l, ... etc work.
> - (set (make-local-variable 'vc-parent-buffer) filebuf))
> + (set (make-local-variable 'vc-parent-buffer) filebuf)
> + (revert-buffer nil t))
> result-buf)))
>
> ;; Header-insertion code
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
- bug#11605: 24.1.50; vc-ediff revert annoyance,
Lars Ingebrigtsen <=