From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: William Xu Newsgroups: gmane.emacs.bugs Subject: bug#11605: 24.1.50; vc-ediff revert annoyance Date: Sat, 2 Jun 2012 12:31:10 +0800 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=f46d043d67ef353afd04c175c546 X-Trace: dough.gmane.org 1338611550 32518 80.91.229.3 (2 Jun 2012 04:32:30 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 2 Jun 2012 04:32:30 +0000 (UTC) To: 11605@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jun 02 06:32:30 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Sag0n-0007Xs-41 for geb-bug-gnu-emacs@m.gmane.org; Sat, 02 Jun 2012 06:32:25 +0200 Original-Received: from localhost ([::1]:37075 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sag0m-0006uM-T0 for geb-bug-gnu-emacs@m.gmane.org; Sat, 02 Jun 2012 00:32:24 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:53583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sag0j-0006tj-Dd for bug-gnu-emacs@gnu.org; Sat, 02 Jun 2012 00:32:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sag0h-00023p-OY for bug-gnu-emacs@gnu.org; Sat, 02 Jun 2012 00:32:20 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44177) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sag0h-00023l-IW for bug-gnu-emacs@gnu.org; Sat, 02 Jun 2012 00:32:19 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Sag2M-0006k5-Cj for bug-gnu-emacs@gnu.org; Sat, 02 Jun 2012 00:34:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: William Xu Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 02 Jun 2012 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11605 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.133861159025855 (code B ref -1); Sat, 02 Jun 2012 04:34:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 2 Jun 2012 04:33:10 +0000 Original-Received: from localhost ([127.0.0.1]:53723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sag1V-0006ix-Jh for submit@debbugs.gnu.org; Sat, 02 Jun 2012 00:33:09 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:49493) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Sag1T-0006ic-96 for submit@debbugs.gnu.org; Sat, 02 Jun 2012 00:33:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Safzh-0001l1-0S for submit@debbugs.gnu.org; Sat, 02 Jun 2012 00:31:18 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:46589) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Safzg-0001ku-Qv for submit@debbugs.gnu.org; Sat, 02 Jun 2012 00:31:16 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:53438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Safzf-0006na-9v for bug-gnu-emacs@gnu.org; Sat, 02 Jun 2012 00:31:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Safzd-0001kb-DR for bug-gnu-emacs@gnu.org; Sat, 02 Jun 2012 00:31:14 -0400 Original-Received: from mail-vb0-f41.google.com ([209.85.212.41]:38371) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Safzd-0001kD-6p for bug-gnu-emacs@gnu.org; Sat, 02 Jun 2012 00:31:13 -0400 Original-Received: by vbbey12 with SMTP id ey12so2021313vbb.0 for ; Fri, 01 Jun 2012 21:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=XzB6nrulGGmn4/ODNiJ6Cut8Bl1+g3VoB2PVcWD1myc=; b=UOQ8jzf54LQu+w2GJSTCeCGXzd6ctWDO6i3/uRDoEayvA66rUuiCQSRK4nms7slACH wWiWUbMonU5OBEzhDC/0HzXGIHleGhQuh9dkyFVpE+eMnPgIyg/Ec61tJj6v2E5r3DRk e+VAMfzBa9chEMHF7xsDodvdrZfw9T2gMwdyvHSC9MpVdgNbzUx0V7LzDBuKs7EWfcBo J5hE1GhLUwq6gwsk1p5a8xNmjtZzEwxbbEl+ZUGLBb72en3AlpLr0rTmi+tFOZHdrf2U QVpgvRITLfffqnzz6uxr11/Mg80uFuZOxo78nAhc4w81JuKTCKqsaTc8Azdirfc/L0Pa tGgA== Original-Received: by 10.220.115.135 with SMTP id i7mr5038584vcq.29.1338611470776; Fri, 01 Jun 2012 21:31:10 -0700 (PDT) Original-Received: by 10.52.69.139 with HTTP; Fri, 1 Jun 2012 21:31:10 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:60618 Archived-At: --f46d043d67ef353afd04c175c546 Content-Type: text/plain; charset=UTF-8 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 --f46d043d67ef353afd04c175c546 Content-Type: application/octet-stream; name="0001-vc-find-revision-Auto-revert-file-revision-buffer-qu.patch" Content-Disposition: attachment; filename="0001-vc-find-revision-Auto-revert-file-revision-buffer-qu.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_h2y6p6uq0 RnJvbSBkMmFmMGY0ZGNjODFiMzlkOTM2MDEzNTI0NGQ2ODcwMzg4YTI2NGEzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBXaWxsaWFtIFh1IDx3aWxsaWFtLnh3bEBnbWFpbC5jb20+CkRh dGU6IFNhdCwgMiBKdW4gMjAxMiAxMjoxNjo0NSArMDgwMApTdWJqZWN0OiBbUEFUQ0hdICh2Yy1m aW5kLXJldmlzaW9uKTogQXV0byByZXZlcnQgZmlsZSByZXZpc2lvbiBidWZmZXIKIHF1aWV0bHku CgotLS0KIGxpc3AvdmMvdmMuZWwgfCAgICA2ICsrKystLQogMSBmaWxlcyBjaGFuZ2VkLCA0IGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC92Yy92Yy5lbCBi L2xpc3AvdmMvdmMuZWwKaW5kZXggODdlNGUxYy4uYmQzMzdkMCAxMDA2NDQKLS0tIGEvbGlzcC92 Yy92Yy5lbAorKysgYi9saXNwL3ZjL3ZjLmVsCkBAIC0xODE1LDExICsxODE1LDEzIEBAIFVzZSBC QUNLRU5EIGFzIHRoZSBWQyBiYWNrZW5kIGlmIHNwZWNpZmllZC4iCiAJCShkZWxldGUtZmlsZSBm aWxlbmFtZSkpKSkKIAkgICh2Yy1tb2RlLWxpbmUgZmlsZSkpCiAJKG1lc3NhZ2UgIkNoZWNraW5n IG91dCAlcy4uLmRvbmUiIGZpbGVuYW1lKSkpCi0gICAgKGxldCAoKHJlc3VsdC1idWYgKGZpbmQt ZmlsZS1ub3NlbGVjdCBmaWxlbmFtZSkpKQorICAgIChsZXQgKChyZXN1bHQtYnVmIChvciAoZ2V0 LWZpbGUtYnVmZmVyIGZpbGVuYW1lKQorICAgICAgICAgICAgICAgICAgICAgICAgICAoZmluZC1m aWxlLW5vc2VsZWN0IGZpbGVuYW1lKSkpKQogICAgICAgKHdpdGgtY3VycmVudC1idWZmZXIgcmVz dWx0LWJ1ZgogCTs7IFNldCB0aGUgcGFyZW50IGJ1ZmZlciBzbyB0aGF0IHRoaW5ncyBsaWtlCiAJ OzsgQy14IHYgZywgQy14IHYgbCwgLi4uIGV0YyB3b3JrLgotCShzZXQgKG1ha2UtbG9jYWwtdmFy aWFibGUgJ3ZjLXBhcmVudC1idWZmZXIpIGZpbGVidWYpKQorCShzZXQgKG1ha2UtbG9jYWwtdmFy aWFibGUgJ3ZjLXBhcmVudC1idWZmZXIpIGZpbGVidWYpCisgICAgICAgIChyZXZlcnQtYnVmZmVy IG5pbCB0KSkKICAgICAgIHJlc3VsdC1idWYpKSkKIAogOzsgSGVhZGVyLWluc2VydGlvbiBjb2Rl Ci0tIAoxLjcuOC4yCgo= --f46d043d67ef353afd04c175c546--