Received: (at 19543) by debbugs.gnu.org; 17 May 2015 00:33:08 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 16 20:33:07 2015 Received: from localhost ([127.0.0.1]:47539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1YtmVv-0004na-3S for submit <at> debbugs.gnu.org; Sat, 16 May 2015 20:33:07 -0400 Received: from mail-wi0-f194.google.com ([209.85.212.194]:32951) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from <raaahh@HIDDEN>) id 1YtmVs-0004n3-IJ for 19543 <at> debbugs.gnu.org; Sat, 16 May 2015 20:33:05 -0400 Received: by wivz2 with SMTP id z2so4351757wiv.0 for <19543 <at> debbugs.gnu.org>; Sat, 16 May 2015 17:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=1h9WdzGHbjoE0Vtrxr3hiotopl3rgUfYiXJ/7+6enHc=; b=yaGQuI6o2zLUjEIsgHeygvc2sjHuNwqiXqMmnDAtZpz3TGIIIsW9buyDKy4NLgEiox CLgSHT4g58xPI+ob448qo1o+bPvA3r1QEiilRHjptuUyVhDL9dCOJ05ec8cs461luTTk z7M+HIzQlsw58u3jPAykzlxHqgz5rim8JE6RurrItL9sy+bxnNhw7zxoJuILx+ncbDgQ N+iKo4Jo/zxh8vY42WSDDywr/wtzyH4v6NWmo0O+u+2i9vUprMxR2q9qwGc/bzqy6y6m YVbz1mNHc+18TLtjWbWID1UAjZeGnS7KdfnTBjsT+EYijYBnz+bnTsOVEbBB1WM2+kCL Rv9Q== X-Received: by 10.180.87.105 with SMTP id w9mr9574259wiz.32.1431822778908; Sat, 16 May 2015 17:32:58 -0700 (PDT) Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id v3sm5139963wix.8.2015.05.16.17.32.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 May 2015 17:32:58 -0700 (PDT) Subject: Re: bug#19543: 24.4; vc-mode: 'Fileset is up-to-date' even when vc-diff showed differences To: Ed Avis <eda@HIDDEN>, "19543 <at> debbugs.gnu.org" <19543 <at> debbugs.gnu.org> References: <7E039918541B4C4183BFDB8F015C743032D5B80F@HIDDEN> <55575720.2050503@HIDDEN> <5A8CCC03-84BA-41C4-AD55-47A06F91B3DB@HIDDEN> From: Dmitry Gutov <dgutov@HIDDEN> Message-ID: <5557E1B8.3080609@HIDDEN> Date: Sun, 17 May 2015 03:32:56 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 MIME-Version: 1.0 In-Reply-To: <5A8CCC03-84BA-41C4-AD55-47A06F91B3DB@HIDDEN> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 19543 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.7 (/) On 05/16/2015 07:19 PM, Ed Avis wrote: > Another way to make it consistent would be for vc-diff to work based on what is currently in the buffer, not what's on disk. We could, but being consistent with out-of-date information is not that valuable. > But I think a better way to solve it would be for vc-next-action to include a quick check of the file's status on disk. So before it confidently says "Fileset is up-to-date", it can go and test if the file has changed, and if so go into the usual Emacs prompts about whether to reload the buffer from disk. I don't know; with TRAMP, for example, process calls are at a premium, and this would unconditionally increase their number, especially when committing many files. Further, vc-dir already expects the state information to be up-to-date (it has some related checks and logic depending on it). Aside from using auto-revert-mode, inferring the necessity of refresh from vc-diff output might be the best solution. > This email is intended only for the person to whom it is addressed and may contain confidential information. Any retransmission, copying, disclosure or other use of, this information by persons other than the intended recipient is prohibited. If you received this email in error, please contact the sender and delete the material. This email is for information only and is not intended as an offer or solicitation for the purchase or sale of any financial instrument. Wadhwani Asset Management LLP is a Limited Liability Partnership registered in England (OC303168) with registered office at 40 Berkeley Square, 3rd Floor, London, W1J 5AL. It is authorised and regulated by the Financial Conduct Authority. Please drop this nonsense. The above text makes it seem like I can't even quote your message here because a copy goes to the public bug tracker.
bug-gnu-emacs@HIDDEN:bug#19543; Package emacs.
Full text available.Received: (at 19543) by debbugs.gnu.org; 16 May 2015 16:19:12 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 16 12:19:12 2015 Received: from localhost ([127.0.0.1]:47451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1Ytenv-0007uz-Oz for submit <at> debbugs.gnu.org; Sat, 16 May 2015 12:19:12 -0400 Received: from mail1.bemta14.messagelabs.com ([193.109.254.116]:7814) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from <eda@HIDDEN>) id 1Ytent-0007uo-7m for 19543 <at> debbugs.gnu.org; Sat, 16 May 2015 12:19:10 -0400 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id F1/E8-02507-CFD67555; Sat, 16 May 2015 16:19:08 +0000 X-Env-Sender: eda@HIDDEN X-Msg-Ref: server-8.tower-27.messagelabs.com!1431793147!18084652!1 X-Originating-IP: [213.212.127.155] X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=waniasset.com,-,- X-VirusChecked: Checked Received: (qmail 6304 invoked from network); 16 May 2015 16:19:07 -0000 Received: from unknown (HELO WCL-EXCHCAS03.wcl.local) (213.212.127.155) by server-8.tower-27.messagelabs.com with AES128-SHA encrypted SMTP; 16 May 2015 16:19:07 -0000 Received: from WCL-EXCH02.wcl.local ([169.254.1.57]) by WCL-EXCHCAS03.wcl.local ([149.85.126.212]) with mapi id 14.03.0123.003; Sat, 16 May 2015 17:19:07 +0100 From: Ed Avis <eda@HIDDEN> To: Dmitry Gutov <dgutov@HIDDEN>, "19543 <at> debbugs.gnu.org" <19543 <at> debbugs.gnu.org> Subject: Re: bug#19543: 24.4; vc-mode: 'Fileset is up-to-date' even when vc-diff showed differences Thread-Topic: bug#19543: 24.4; vc-mode: 'Fileset is up-to-date' even when vc-diff showed differences Thread-Index: AdAr9lXQu8B6kxR9T8G2/O/OyCgxZxj57FgAAAWAKQA= Date: Sat, 16 May 2015 16:19:06 +0000 Message-ID: <5A8CCC03-84BA-41C4-AD55-47A06F91B3DB@HIDDEN> References: <7E039918541B4C4183BFDB8F015C743032D5B80F@HIDDEN> <55575720.2050503@HIDDEN> In-Reply-To: <55575720.2050503@HIDDEN> Accept-Language: en-US, en-GB Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/15.9.0.150408 x-originating-ip: [149.85.126.5] Content-Type: text/plain; charset="utf-8" Content-ID: <FF60F461C6E31944B2D7835F890F9F98@HIDDEN> Content-Transfer-Encoding: base64 MIME-Version: 1.0 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: 19543 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.3 (-) QW5vdGhlciB3YXkgdG8gbWFrZSBpdCBjb25zaXN0ZW50IHdvdWxkIGJlIGZvciB2Yy1kaWZmIHRv IHdvcmsgYmFzZWQgb24gd2hhdCBpcyBjdXJyZW50bHkgaW4gdGhlIGJ1ZmZlciwgbm90IHdoYXQn cyBvbiBkaXNrLgoKQnV0IEkgdGhpbmsgYSBiZXR0ZXIgd2F5IHRvIHNvbHZlIGl0IHdvdWxkIGJl IGZvciB2Yy1uZXh0LWFjdGlvbiB0byBpbmNsdWRlIGEgcXVpY2sgY2hlY2sgb2YgdGhlIGZpbGUn cyBzdGF0dXMgb24gZGlzay4gIFNvIGJlZm9yZSBpdCBjb25maWRlbnRseSBzYXlzICJGaWxlc2V0 IGlzIHVwLXRvLWRhdGUiLCBpdCBjYW4gZ28gYW5kIHRlc3QgaWYgdGhlIGZpbGUgaGFzIGNoYW5n ZWQsIGFuZCBpZiBzbyBnbyBpbnRvIHRoZSB1c3VhbCBFbWFjcyBwcm9tcHRzIGFib3V0IHdoZXRo ZXIgdG8gcmVsb2FkIHRoZSBidWZmZXIgZnJvbSBkaXNrLgoKVGhpcyBlbWFpbCBpcyBpbnRlbmRl ZCBvbmx5IGZvciB0aGUgcGVyc29uIHRvIHdob20gaXQgaXMgYWRkcmVzc2VkIGFuZCBtYXkgY29u dGFpbiBjb25maWRlbnRpYWwgaW5mb3JtYXRpb24uIEFueSByZXRyYW5zbWlzc2lvbiwgY29weWlu ZywgZGlzY2xvc3VyZSBvciBvdGhlciB1c2Ugb2YsIHRoaXMgaW5mb3JtYXRpb24gYnkgcGVyc29u cyBvdGhlciB0aGFuIHRoZSBpbnRlbmRlZCByZWNpcGllbnQgaXMgcHJvaGliaXRlZC4gSWYgeW91 IHJlY2VpdmVkIHRoaXMgZW1haWwgaW4gZXJyb3IsIHBsZWFzZSBjb250YWN0IHRoZSBzZW5kZXIg YW5kIGRlbGV0ZSB0aGUgbWF0ZXJpYWwuIFRoaXMgZW1haWwgaXMgZm9yIGluZm9ybWF0aW9uIG9u bHkgYW5kIGlzIG5vdCBpbnRlbmRlZCBhcyBhbiBvZmZlciBvciBzb2xpY2l0YXRpb24gZm9yIHRo ZSBwdXJjaGFzZSBvciBzYWxlIG9mIGFueSBmaW5hbmNpYWwgaW5zdHJ1bWVudC4gV2FkaHdhbmkg QXNzZXQgTWFuYWdlbWVudCBMTFAgaXMgYSBMaW1pdGVkIExpYWJpbGl0eSBQYXJ0bmVyc2hpcCBy ZWdpc3RlcmVkIGluIEVuZ2xhbmQgKE9DMzAzMTY4KSB3aXRoIHJlZ2lzdGVyZWQgb2ZmaWNlIGF0 IDQwIEJlcmtlbGV5IFNxdWFyZSwgM3JkIEZsb29yLCBMb25kb24sIFcxSiA1QUwuIEl0IGlzIGF1 dGhvcmlzZWQgYW5kIHJlZ3VsYXRlZCBieSB0aGUgRmluYW5jaWFsIENvbmR1Y3QgQXV0aG9yaXR5 Lgo=
bug-gnu-emacs@HIDDEN:bug#19543; Package emacs.
Full text available.
Received: (at 19543) by debbugs.gnu.org; 16 May 2015 14:44:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 16 10:44:34 2015
Received: from localhost ([127.0.0.1]:47443 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.80)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1YtdKM-0005bj-EJ
for submit <at> debbugs.gnu.org; Sat, 16 May 2015 10:44:34 -0400
Received: from mail-wg0-f42.google.com ([74.125.82.42]:34578)
by debbugs.gnu.org with esmtp (Exim 4.80)
(envelope-from <raaahh@HIDDEN>) id 1YtdKK-0005bW-Sc
for 19543 <at> debbugs.gnu.org; Sat, 16 May 2015 10:44:33 -0400
Received: by wguv19 with SMTP id v19so82249578wgu.1
for <19543 <at> debbugs.gnu.org>; Sat, 16 May 2015 07:44:27 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=sender:subject:to:references:from:message-id:date:user-agent
:mime-version:in-reply-to:content-type:content-transfer-encoding;
bh=IwfVoxXaHhmkfoAgCrkg8JmJ+xvvGIUV8LKU4byQrPI=;
b=uAQWk60vDjI9Dgk+aVo2Pw3XPRXfSEpNSjWF3sWZqe3b+PwuUSfoE7gEzVIrZs5BES
Jea8yU/Vifppn8TjQLDwYvbNqvia/cKZSmBwh8li6IYAKm2kxdb7ArIppfnjLJEFmWx6
HTK2+zP/Qovq+N9nroU4q7oGYPraJQgDyAJbNktJ3IkkEAM1rfDVuANqmlh7WSNvQhkh
trEg7pq2qWNqxWsrBMcP9B1rSuVncVSF9lVARh+zDjcmxm6lzxMfi6k5fTzkE1aPqhbZ
Tk+cm1LcTj4mfdt1fddI/0QLpiwVwCjH7WrrjeZ5ugZTd0bc3rBk0tRgKW5xHV15F8ee
pBqw==
X-Received: by 10.180.218.108 with SMTP id pf12mr6706486wic.13.1431787467363;
Sat, 16 May 2015 07:44:27 -0700 (PDT)
Received: from [192.168.0.185] (static-nbl2-118.cytanet.com.cy.
[212.31.107.118])
by mx.google.com with ESMTPSA id ez19sm3175667wid.19.2015.05.16.07.44.26
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Sat, 16 May 2015 07:44:27 -0700 (PDT)
Subject: Re: bug#19543: 24.4; vc-mode: 'Fileset is up-to-date' even when
vc-diff showed differences
To: Ed Avis <eda@HIDDEN>, 19543 <at> debbugs.gnu.org
References: <7E039918541B4C4183BFDB8F015C743032D5B80F@HIDDEN>
<55575720.2050503@HIDDEN>
From: Dmitry Gutov <dgutov@HIDDEN>
Message-ID: <555757C9.80303@HIDDEN>
Date: Sat, 16 May 2015 17:44:25 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
Thunderbird/38.0
MIME-Version: 1.0
In-Reply-To: <55575720.2050503@HIDDEN>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 19543
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)
On 05/16/2015 05:41 PM, Dmitry Gutov wrote:
> I guess vc-diff could update the status of the file (or files) if the
> current value is obviously wrong, but that still makes for brittle
> workflow: there's no guarantee that the user will case vc-diff before
^ call
> vc-next-action.
bug-gnu-emacs@HIDDEN:bug#19543; Package emacs.
Full text available.Received: (at 19543) by debbugs.gnu.org; 16 May 2015 14:41:46 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 16 10:41:46 2015 Received: from localhost ([127.0.0.1]:47439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1YtdHd-0005XL-SJ for submit <at> debbugs.gnu.org; Sat, 16 May 2015 10:41:46 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:33726) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from <raaahh@HIDDEN>) id 1YtdHc-0005X5-2S for 19543 <at> debbugs.gnu.org; Sat, 16 May 2015 10:41:44 -0400 Received: by wgin8 with SMTP id n8so144297650wgi.0 for <19543 <at> debbugs.gnu.org>; Sat, 16 May 2015 07:41:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=Mv1Ha0TpsyGVkO4Wqmpqj1fGScll+H3/vdz33Qpi9MM=; b=IV78drdXnQJzYQGKxT3orRD7PwK5wfdY3dovaE7JJKwPq/yd7p9koi3xkYFI2EwXP/ 6hD5cGErJsY4zIQTEzl3s+2T2ltzm2KGY4XhapJ/qrmEYMoxze0idWFeRD0KwEuNhUx6 Bc6TrNpbLjXswjPJkRWhvRAEgLrhqYstPjcxCMHSeX+AxS0rBHjLOovZcNlVXWFxfGcK H0YlrFnHRvL6MFDJpKjePZNY21tN22GQUM00v1ROLmNZ4kwGTYm/rXqGyqvuu8MhFYJD DsMuLXOuIgfA8/GWbK1UXtUyBaHMwUW5OZq/jEmPPuIYajT/leaXPL/5ZIWWFnHvrxm8 lqEg== X-Received: by 10.180.37.101 with SMTP id x5mr6640286wij.74.1431787298479; Sat, 16 May 2015 07:41:38 -0700 (PDT) Received: from [192.168.0.185] (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by mx.google.com with ESMTPSA id gy8sm3184292wib.13.2015.05.16.07.41.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 May 2015 07:41:38 -0700 (PDT) Subject: Re: bug#19543: 24.4; vc-mode: 'Fileset is up-to-date' even when vc-diff showed differences To: Ed Avis <eda@HIDDEN>, 19543 <at> debbugs.gnu.org References: <7E039918541B4C4183BFDB8F015C743032D5B80F@HIDDEN> From: Dmitry Gutov <dgutov@HIDDEN> Message-ID: <55575720.2050503@HIDDEN> Date: Sat, 16 May 2015 17:41:36 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 MIME-Version: 1.0 In-Reply-To: <7E039918541B4C4183BFDB8F015C743032D5B80F@HIDDEN> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 19543 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.7 (/) On 01/09/2015 12:24 PM, Ed Avis wrote: > Now do C-x v = to show differences. There are some changes to check in. > Yet when using C-x v v, Emacs reports 'Fileset is up-to-date', > despite the fact that a moment ago vc-diff showed it wasn't. You should try M-x global-auto-revert-mode. > If the last vc-diff operation on a file showed changes, then > vc-next-action should revert the buffer contents to what is currently on > disk. I guess vc-diff could update the status of the file (or files) if the current value is obviously wrong, but that still makes for brittle workflow: there's no guarantee that the user will case vc-diff before vc-next-action.
bug-gnu-emacs@HIDDEN:bug#19543; Package emacs.
Full text available.
Received: (at submit) by debbugs.gnu.org; 9 Jan 2015 10:24:18 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 09 05:24:18 2015
Received: from localhost ([127.0.0.1]:40778 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.80)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1Y9Wjp-0003fY-L6
for submit <at> debbugs.gnu.org; Fri, 09 Jan 2015 05:24:18 -0500
Received: from eggs.gnu.org ([208.118.235.92]:54125)
by debbugs.gnu.org with esmtp (Exim 4.80)
(envelope-from <eda@HIDDEN>) id 1Y9Wjm-0003fP-86
for submit <at> debbugs.gnu.org; Fri, 09 Jan 2015 05:24:15 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <eda@HIDDEN>) id 1Y9Wjk-0004TS-9q
for submit <at> debbugs.gnu.org; Fri, 09 Jan 2015 05:24:14 -0500
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level:
X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled
version=3.3.2
Received: from lists.gnu.org ([2001:4830:134:3::11]:42004)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from <eda@HIDDEN>) id 1Y9Wjk-0004TK-7N
for submit <at> debbugs.gnu.org; Fri, 09 Jan 2015 05:24:12 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55825)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <eda@HIDDEN>) id 1Y9Wji-00082N-AN
for bug-gnu-emacs@HIDDEN; Fri, 09 Jan 2015 05:24:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <eda@HIDDEN>) id 1Y9Wjf-0004QR-1U
for bug-gnu-emacs@HIDDEN; Fri, 09 Jan 2015 05:24:10 -0500
Received: from mail1.bemta14.messagelabs.com ([193.109.254.118]:18097)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from <eda@HIDDEN>) id 1Y9Wje-0004Pb-Pm
for bug-gnu-emacs@HIDDEN; Fri, 09 Jan 2015 05:24:06 -0500
Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id
CC/90-02743-54CAFA45; Fri, 09 Jan 2015 10:24:05 +0000
X-Env-Sender: eda@HIDDEN
X-Msg-Ref: server-2.tower-27.messagelabs.com!1420799044!19512649!1
X-Originating-IP: [80.169.169.167]
X-StarScan-Received:
X-StarScan-Version: 6.12.5; banners=waniasset.com,-,-
X-VirusChecked: Checked
Received: (qmail 17776 invoked from network); 9 Jan 2015 10:24:04 -0000
Received: from unknown (HELO WCL-EXCHCAS02.wcl.local) (80.169.169.167)
by server-2.tower-27.messagelabs.com with AES128-SHA encrypted SMTP;
9 Jan 2015 10:24:04 -0000
Received: from WCL-EXCH02.wcl.local ([169.254.1.213]) by
WCL-EXCHCAS02.wcl.local ([149.85.127.102]) with mapi id 14.03.0123.003; Fri,
9 Jan 2015 10:24:04 +0000
From: Ed Avis <eda@HIDDEN>
To: "'bug-gnu-emacs@HIDDEN'" <bug-gnu-emacs@HIDDEN>
Subject: 24.4; vc-mode: 'Fileset is up-to-date' even when vc-diff showed
differences
Thread-Topic: 24.4; vc-mode: 'Fileset is up-to-date' even when vc-diff
showed differences
Thread-Index: AdAr9lXQu8B6kxR9T8G2/O/OyCgxZw==
Date: Fri, 9 Jan 2015 10:24:04 +0000
Message-ID: <7E039918541B4C4183BFDB8F015C743032D5B80F@HIDDEN>
Accept-Language: en-US, en-GB
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
x-originating-ip: [149.85.127.178]
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
(bad octet value).
X-Received-From: 2001:4830:134:3::11
X-Spam-Score: -4.0 (----)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -4.0 (----)
Open a file under version control (I used an svn working copy).
Do not make any changes to the file in Emacs, so that the modification
flag remains unset. But change the file contents outside Emacs,
for example
M-! echo hello >>foo
Now do C-x v =3D to show differences. There are some changes to check in.=
Yet when using C-x v v, Emacs reports 'Fileset is up-to-date',
despite the fact that a moment ago vc-diff showed it wasn't.
I understand that Emacs cannot constantly keep track of times when an
edited file might have been changed by some other program. And that on
trying to edit the buffer, it will warn 'foo changed on disk...'.
However, for me at least, it is quite a common operation to change a
file somehow and then use an existing Emacs buffer to view the
differences and check it in. Hence it is frustrating that
vc-next-action does nothing.
If the last vc-diff operation on a file showed changes, then
vc-next-action should revert the buffer contents to what is currently on
disk. This could even=20be done without a warning if the modification
flag on the buffer is currently unset and the buffer was under version
control when loaded. Then a further vc-next-action should commit.
In GNU Emacs 24.4.1 (x86_64-redhat-linux-gnu, GTK+ Version 3.10.9)
of 2014-11-03 on wcl-linux04.wcl.local
Configured using:
`configure --build=3Dx86_64-redhat-linux-gnu
--host=3Dx86_64-redhat-linux-gnu --program-prefix=3D
--disable-dependency-tracking --prefix=3D/usr --exec-prefix=3D/usr
--bindir=3D/usr/bin --sbindir=3D/usr/sbin --sysconfdir=3D/etc
--datadir=3D/usr/share --includedir=3D/usr/include --libdir=3D/usr/lib64
--libexecdir=3D/usr/libexec --localstatedir=3D/var
--sharedstatedir=3D/var/lib --mandir=3D/usr/share/man
--infodir=3D/usr/share/info --with-dbus --with-gif --with-jpeg --with-png=
--with-rsvg --with-tiff --with-xft --with-xpm --with-x-toolkit=3Dgtk3
--with-gpm=3Dno build_alias=3Dx86_64-redhat-linux-gnu
host_alias=3Dx86_64-redhat-linux-gnu 'CFLAGS=3D-DMAIL_USE_LOCKF -O2 -g
-pipe -Wall -Wp,-D_FORTIFY_SOURCE=3D2 -fexceptions
-fstack-protector-strong --param=3Dssp-buffer-size=3D4
-grecord-gcc-switches -m64 -mtune=3Dgeneric' 'LDFLAGS=3D-Wl,-z,relro ''
Important settings:
value of $LC_COLLATE: C
value of $LC_CTYPE: en_GB.UTF-8
value of $LC_MESSAGES: en_GB.UTF-8
value of $LC_MONETARY: en_GB.UTF-8
value of $LC_NUMERIC: en_GB.UTF-8
value of $LC_TIME: en_GB.UTF-8
value of $LANG: en_GB.UTF-8
locale-coding-system: utf-8-unix
Major mode: Diff
Minor modes in effect:
diff-auto-refine-mode: t
shell-dirtrack-mode: t
tooltip-mode: t
mouse-wheel-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
font-lock-mode: t
auto-composition-mode: t
auto-encryption-mode: t
auto-compression-mode: t
buffer-read-only: t
line-number-mode: t
transient-mark-mode: t
Recent input:
C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p=20
C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p=20
C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p=20
C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p=20
C-p C-p C-p C-p C-p C-w C-x C-s ESC < C-x k RET C-x=20
C-g q C-x v u y e s RET ESC ! p a t c h SPC b u TAB=20
SPC < d RET ESC ! v p SPC b u DEL DEL DEL DEL DEL DEL=20
DEL c p SPC b u TAB SPC ~ / w i TAB s c TAB RET C-x=20
v =3D C-x o C-s i n t e r e s t r a t e 1 m o f f C-s=20
C-s C-s C-s C-s C-a ESC > C-r C-r C-r C-r C-r C-r C-r=20
C-a C-x v =3D ESC [ 6 ~ ESC [ 5 ~ C-x v v C-g C-x v =3D=20
C-x v v C-x o ESC x r e p o r t SPC e m a C-g C-g C-x=20
C-f DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL=20
DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL=20
DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL=20
DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL DEL=20
DEL DEL j o b RET ESC ! e c h o SPC h e l l o SPC >=20
> j o b RET C-x v =3D C-x v v ESC x r e p o r t - e m=20
a c s - b u g SPC RET
Recent messages:
Mark saved where search started
Finding changes in /home/eda/svn_working/repos/wwwroot/WaniSystems/Configu=
ration/MarketSampler/jobs/build.trend.signals.xml...done
Fileset is up-to-date
Quit
Finding changes in /home/eda/svn_working/repos/wwwroot/WaniSystems/Configu=
ration/MarketSampler/jobs/build.trend.signals.xml...done
Fileset is up-to-date
Quit [2 times]
(Shell command succeeded with no output)
Finding changes in /home/eda/svn_working/repos/job...done
Fileset is up-to-date
Load-path shadows:
None found.
Features:
(shadow sort emacsbug sendmail sh-script smie executable python json
macros rect ispell network-stream starttls tls mail-extr etags
smerge-mode tabify imenu man ediff-ptch ediff-merg ediff-wind ediff-diff
ediff-mult ediff-help ediff-init ediff-util ediff conf-mode log-view
two-column iso-transl edmacro dabbrev mule-util vc-cvs vc-rcs sql view
kmacro cus-edit wid-edit cus-start cus-load perl-mode ffap thingatpt
url-parse auth-source eieio eieio-core gnus-util password-cache url-vars
help-mode diff-mode vc misearch multi-isearch vc-dispatcher vc-svn
nxml-uchnm rng-xsd xsd-regexp rng-cmpct rng-nxml rng-valid rng-loc
rng-uri rng-parse nxml-parse rng-match rng-dt rng-util rng-pttrn nxml-ns
nxml-mode nxml-outln nxml-rap nxml-util nxml-glyph nxml-enc xmltok
pcmpl-unix dired xterm time-date log-edit easy-mmode message format-spec
rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231
rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mailabbrev mail-utils
gmm-utils mailheader pcvs-util add-log server csharp-mode advice
help-fns byte-opt bytecomp byte-compile cconv cc-langs cc-mode cc-fonts
easymenu cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars
cc-defs zoom-frm frame-cmds frame-fns cl-macs avoid cl gv cl-loaddefs
cl-lib compile shell pcomplete comint ring ansi-color tooltip electric
uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar
dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-mode
prog-mode register page menu-bar rfn-eshadow timer select scroll-bar
mouse jit-lock font-lock syntax facemenu font-core frame cham georgian
utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean
japanese hebrew greek romanian slovak czech european ethiopic indian
cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev
minibuffer nadvice loaddefs button faces cus-face macroexp files
text-properties overlay sha1 md5 base64 format env code-pages mule
custom widget hashtable-print-readable backquote make-network-process
dbusbind gfilenotify dynamic-setting system-font-setting
font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs)
Memory information:
((conses 16 1423060 129450)
(symbols 48 31755 0)
(miscs 40 814 5691)
(strings 32 73621 14450)
(string-bytes 1 3790116)
(vectors 16 35632)
(vector-slots 8 1579991 202665)
(floats 8 689 851)
(intervals 56 175106 1106)
(buffers 960 165)
(heap 1024 100883 14170))
______________________________________________________________________
This email has been scanned by the Symantec Email Security.cloud service.
For more information please visit http://www.symanteccloud.com
______________________________________________________________________
Ed Avis <eda@HIDDEN>:bug-gnu-emacs@HIDDEN.
Full text available.bug-gnu-emacs@HIDDEN:bug#19543; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.