Subject: bug#11605: closed (Fixed on master)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 04 Mar 2025 04:01:02 +0000

Your bug report

#11605: 24.1.50; vc-ediff revert annoyance

which was filed against the emacs package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
11605: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=11605
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Fixed on master
From: Sean Whitton <[email-masked]>
To: [email-masked]
Date: Tue, 04 Mar 2025 12:00:19 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Version 31.1

I've installed a patch fixing this.

-- 
Sean Whitton

Subject: 24.1.50; vc-ediff revert annoyance
From: William Xu <[email-masked]>
To: [email-masked]
Date: Sat, 2 Jun 2012 12:31:10 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Steps to reproduce:

  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)

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?

-- 
William

http://xwl.appspot.com