all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Mario Castelan Castro <marioxcc@gnu.org>
To: 6249@debbugs.gnu.org
Cc: marioxcc@gnu.org
Subject: bug#6249: 23.2: vc-revert don't works in git
Date: Sat, 22 May 2010 13:58:59 -0500	[thread overview]
Message-ID: <87ljbb226k.fsf@Q6600-0.ver.megared.net.mx> (raw)

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

May 22th 2010 in bug-gnu-emacs@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-----





             reply	other threads:[~2010-05-22 18:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-22 18:58 Mario Castelan Castro [this message]
2010-05-23 19:49 ` bug#6249: 23.2: vc-revert don't works in git Dan Nicolaescu
2010-05-26 20:27   ` Mario Castelan Castro
2010-06-01  7:09     ` Dan Nicolaescu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87ljbb226k.fsf@Q6600-0.ver.megared.net.mx \
    --to=marioxcc@gnu.org \
    --cc=6249@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.