GNU bug report logs - #6249
23.2: vc-revert don't works in git

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Mario Castelan Castro <marioxcc <at> gnu.org>
Subject: bug#6249: closed (Re: bug#6249: 23.2: vc-revert don't works in git)
Date: Tue, 01 Jun 2010 07:10:03 +0000

[Message part 1 (text/plain, inline)]

Your bug report

#6249: 23.2: vc-revert don't works in git

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 6249 <at> debbugs.gnu.org.

-- 
6249: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6249
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Dan Nicolaescu <dann <at> gnu.org>
To: Mario Castelan Castro <marioxcc <at> gnu.org>
Cc: 6249-done <at> debbugs.gnu.org
Subject: Re: bug#6249: 23.2: vc-revert don't works in git
Date: Tue, 01 Jun 2010 03:09:36 -0400

Mario Castelan Castro <marioxcc <at> gnu.org> writes:

> May 26th 2010 for Dan Nicolaescu <dann <at> gnu.org> copy in
> 6249 <at> debbugs.gnu.org thread "bug#6249: 23.2: vc-revert don't works in
> git".
>
> Hi Dan.
>
> Please excuse my late reponse.  I got a bit busy.
>
> I just installed git 1.7.1, and this appears to fix the problem too,

Closing the bug then.

[Message part 3 (message/rfc822, inline)]

From: Mario Castelan Castro <marioxcc <at> gnu.org>
To: bug-gnu-emacs <at> gnu.org
Cc: marioxcc <at> gnu.org
Subject: 23.2: vc-revert don't works in git
Date: Sat, 22 May 2010 13:58:59 -0500

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
NotDashEscaped: You need GnuPG to verify this message

May 22th 2010 in bug-gnu-emacs <at> gnu.org thread "23.2: vc-revert don't
works in git"

Hi.

I found a possible bug:

Running M-x vc-revert from a buffer displaying a GIT-versioned file
with non commited changes gives a message like this, for each modified
file:

FILE: needs update

I.e: If the only modified file, wich I want to revert is program.c i get:

program.c: needs update

If there are more modified files, the message lists all them (I'ts the
same message if I run M-x vc-revert from program.c, program.h or
*vc-dir*).

program.c: needs update
program.h: needs update

Removing a line from vc-git.el appears to fix the problem.  This line
was added after 23.1 but before 23.2.  23.1 didn't gave this problem.
Here is the "patch" than removes the lines (Made againsting the BZR
revision 100413):

=== modified file 'lisp/vc-git.el'
*** lisp/vc-git.el	2010-04-21 02:05:24 +0000
--- lisp/vc-git.el	2010-05-22 18:43:28 +0000
*************** or an empty string if none."
*** 577,583 ****
    "Revert FILE to the version stored in the git repository."
    (if contents-done
        (vc-git-command nil 0 file "update-index" "--")
-     (vc-git-command nil 0 file "reset" "-q" "--")
      (vc-git-command nil nil file "checkout" "-q" "--")))
  
  ;;; HISTORY FUNCTIONS
--- 577,582 ----

Regards and thanks.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEAREIAAYFAkv4KUUACgkQZ4DA0TLic4gZIwCfWABBFCX9Ae5UT2KApGWrWMzy
RZAAnjtzDQNQ8zGhAcZCHRYkDsSjj37D
=I8j7
-----END PGP SIGNATURE-----

Previous Next

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