GNU bug report logs - #6326
23.1.95; `vc-diff' sometimes reports wrong diff status

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 6326 in the body.
You can then email your comments to 6326 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Markus Triska <markus.triska <at> gmx.at>
To: bug-gnu-emacs <at> gnu.org
Subject: 23.1.95; `vc-diff' sometimes reports wrong diff status
Date: Wed, 02 Jun 2010 05:11:02 +0200

When I open (in emacs -Q) a file under "git" version control and:

   1) view its log with: C-x v l
   2) open any previous revision, for example: n n n f
   3) save the previous revision under a different name:
      C-x C-w difrev.txt RET
   4) on difrev.txt, run `vc-diff' with: C-x v =

it unexpectedly says: "No changes between working revision and
workfile". It SHOULD say that the file is NOT under version control.
Also other operations like C-x v l should say this but currently don't
(C-x v l instead unexpectedly displays the log of the original file).


In GNU Emacs 23.1.95.5 (i386-apple-darwin8.11.1, X toolkit, Xaw3d scroll bars)
 of 2010-04-10 on mt-computer.lan
Windowing system distributor `The X.Org Foundation', version 11.0.10402000
configured using `configure  '--with-x-toolkit=lucid''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: en_GB.UTF-8
  value of $XMODIFIERS: nil
  locale-coding-system: nil
  default enable-multibyte-characters: t

Message #8 received at 6326 <at> debbugs.gnu.org (full text, mbox):

From: Dan Nicolaescu <dann <at> gnu.org>
To: Markus Triska <markus.triska <at> gmx.at>
Cc: 6326 <at> debbugs.gnu.org
Subject: Re: bug#6326: 23.1.95; `vc-diff' sometimes reports wrong diff status
Date: Wed, 02 Jun 2010 05:42:27 -0400

Markus Triska <markus.triska <at> gmx.at> writes:

> When I open (in emacs -Q) a file under "git" version control and:
>
>    1) view its log with: C-x v l
>    2) open any previous revision, for example: n n n f
>    3) save the previous revision under a different name:
>       C-x C-w difrev.txt RET
>    4) on difrev.txt, run `vc-diff' with: C-x v =
>
> it unexpectedly says: "No changes between working revision and
> workfile". It SHOULD say that the file is NOT under version control.
> Also other operations like C-x v l should say this but currently don't
> (C-x v l instead unexpectedly displays the log of the original file).

This because `vc-parent-file' still points to the original file. 
Maybe `vc-file-clearprops' (called from `write-file') should also reset `vc-parent-file'.

Message #11 received at 6326 <at> debbugs.gnu.org (full text, mbox):

From: Chong Yidong <cyd <at> gnu.org>
To: Dan Nicolaescu <dann <at> gnu.org>
Cc: 6326 <at> debbugs.gnu.org, Markus Triska <markus.triska <at> gmx.at>
Subject: Re: bug#6326: 23.1.95; `vc-diff' sometimes reports wrong diff status
Date: Mon, 29 Oct 2012 19:13:12 +0800

Dan Nicolaescu <dann <at> gnu.org> writes:

>> When I open (in emacs -Q) a file under "git" version control and:
>>
>>    1) view its log with: C-x v l
>>    2) open any previous revision, for example: n n n f
>>    3) save the previous revision under a different name:
>>       C-x C-w difrev.txt RET
>>    4) on difrev.txt, run `vc-diff' with: C-x v =
>>
>> it unexpectedly says: "No changes between working revision and
>> workfile". It SHOULD say that the file is NOT under version control.
>> Also other operations like C-x v l should say this but currently don't
>> (C-x v l instead unexpectedly displays the log of the original file).
>
> This because `vc-parent-file' still points to the original file. 
> Maybe `vc-file-clearprops' (called from `write-file') should also
> reset `vc-parent-file'.

I think you're right.  Done in trunk.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.