From unknown Fri Sep 05 14:00:06 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6249: 23.2: vc-revert don't works in git Resent-From: Mario Castelan Castro Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 22 May 2010 19:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 6249 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 6249@debbugs.gnu.org Cc: marioxcc@gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.127455521727992 (code B ref -1); Sat, 22 May 2010 19:07:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 May 2010 19:06:57 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFu2C-0007HR-Jo for submit@debbugs.gnu.org; Sat, 22 May 2010 15:06:57 -0400 Received: from mx10.gnu.org ([199.232.76.166]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFttF-0007DI-OD for submit@debbugs.gnu.org; Sat, 22 May 2010 14:57:42 -0400 Received: from lists.gnu.org ([199.232.76.165]:47145) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1OFttB-0000rZ-7S for submit@debbugs.gnu.org; Sat, 22 May 2010 14:57:37 -0400 Received: from [199.232.76.173] (port=54720 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFttA-0005tD-O4 for bug-gnu-emacs@gnu.org; Sat, 22 May 2010 14:57:36 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1OFtt9-0000rT-Dv for bug-gnu-emacs@gnu.org; Sat, 22 May 2010 14:57:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on monty-python X-Spam-Level: X-Spam-Status: No, score=-1.3 required=5.0 tests=AWL autolearn=ham version=3.1.0 Received: from fencepost.gnu.org ([140.186.70.10]:43654) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1OFtt9-0000rP-2D for bug-gnu-emacs@gnu.org; Sat, 22 May 2010 14:57:35 -0400 Received: from localhost ([127.0.0.1]:42476 helo=Q6600-0.ver.megared.net.mx) by fencepost.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFtt5-0003YG-7E; Sat, 22 May 2010 14:57:31 -0400 From: Mario Castelan Castro Date: Sat, 22 May 2010 13:58:59 -0500 Message-ID: <87ljbb226k.fsf@Q6600-0.ver.megared.net.mx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -6.6 (------) X-Mailman-Approved-At: Sat, 22 May 2010 15:06:55 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.6 (------) -----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----- From unknown Fri Sep 05 14:00:06 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6249: 23.2: vc-revert don't works in git Resent-From: Dan Nicolaescu Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 23 May 2010 19:50:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6249 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Mario Castelan Castro Cc: 6249@debbugs.gnu.org Received: via spool by 6249-submit@debbugs.gnu.org id=B6249.12746441596993 (code B ref 6249); Sun, 23 May 2010 19:50:04 +0000 Received: (at 6249) by debbugs.gnu.org; 23 May 2010 19:49:19 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGHAk-0001ok-Vt for submit@debbugs.gnu.org; Sun, 23 May 2010 15:49:19 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGHAj-0001oe-1P for 6249@debbugs.gnu.org; Sun, 23 May 2010 15:49:17 -0400 Received: from dann by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1OGHAe-0005L0-JQ; Sun, 23 May 2010 15:49:12 -0400 References: <87ljbb226k.fsf@Q6600-0.ver.megared.net.mx> From: Dan Nicolaescu Date: Sun, 23 May 2010 15:49:12 -0400 In-Reply-To: <87ljbb226k.fsf@Q6600-0.ver.megared.net.mx> (Mario Castelan Castro's message of "Sat\, 22 May 2010 13\:58\:59 -0500") Message-ID: User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -5.3 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.5 (------) Mario Castelan Castro writes: > 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*). I can't reproduce this. Can you please describe step by step what you are doing, starting with emacs -Q? From unknown Fri Sep 05 14:00:06 2025 X-Loop: help-debbugs@gnu.org Subject: bug#6249: 23.2: vc-revert don't works in git Resent-From: Mario Castelan Castro Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 26 May 2010 20:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6249 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo To: Dan Nicolaescu Cc: marioxcc@gnu.org, 6249@debbugs.gnu.org Received: via spool by 6249-submit@debbugs.gnu.org id=B6249.127490557912021 (code B ref 6249); Wed, 26 May 2010 20:27:01 +0000 Received: (at 6249) by debbugs.gnu.org; 26 May 2010 20:26:19 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHNBC-00037q-MF for submit@debbugs.gnu.org; Wed, 26 May 2010 16:26:18 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHNBB-00037l-1r for 6249@debbugs.gnu.org; Wed, 26 May 2010 16:26:17 -0400 Received: from localhost ([127.0.0.1]:39957 helo=Q6600-0.ver.megared.net.mx) by fencepost.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHNB6-0006RM-QQ; Wed, 26 May 2010 16:26:13 -0400 From: Mario Castelan Castro In-Reply-To: (Dan Nicolaescu's message of "Sun, 23 May 2010 15:49:12 -0400") References: <87ljbb226k.fsf@Q6600-0.ver.megared.net.mx> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) Date: Wed, 26 May 2010 15:27:43 -0500 Message-ID: <87632al874.fsf@Q6600-0.ver.megared.net.mx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.6 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.6 (------) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 May 26th 2010 for Dan Nicolaescu copy in 6249@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, more likely it's a bug or design change in GIT what makes vc-revert don't work with the old GIT version. When I had the problem I was using GIT 1.5.6.5 (The one than comes with debian lenny. Regards and thanks. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEAREIAAYFAkv9hDcACgkQZ4DA0TLic4igigCfX/06SOKW7ghIfU2FM5IqhLSA nKwAn33pgUS25O/C8kOKRhFymM+umyXO =ntZI -----END PGP SIGNATURE----- From unknown Fri Sep 05 14:00:06 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.427 (Entity 5.427) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Mario Castelan Castro Subject: bug#6249: closed (Re: bug#6249: 23.2: vc-revert don't works in git) Message-ID: References: <87ljbb226k.fsf@Q6600-0.ver.megared.net.mx> X-Gnu-PR-Message: they-closed 6249 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: moreinfo Reply-To: 6249@debbugs.gnu.org Date: Tue, 01 Jun 2010 07:10:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1275376203-15049-1" This is a multi-part message in MIME format... ------------=_1275376203-15049-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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@debbugs.gnu.org. --=20 6249: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D6249 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1275376203-15049-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 6249-done) by debbugs.gnu.org; 1 Jun 2010 07:09:39 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJLbX-0003uU-F3 for submit@debbugs.gnu.org; Tue, 01 Jun 2010 03:09:39 -0400 Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJLbW-0003uP-3N for 6249-done@debbugs.gnu.org; Tue, 01 Jun 2010 03:09:38 -0400 Received: from dann by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1OJLbU-0003gY-H6; Tue, 01 Jun 2010 03:09:37 -0400 To: Mario Castelan Castro Subject: Re: bug#6249: 23.2: vc-revert don't works in git References: <87ljbb226k.fsf@Q6600-0.ver.megared.net.mx> <87632al874.fsf@Q6600-0.ver.megared.net.mx> From: Dan Nicolaescu X-Debbugs-No-Ack: yes Date: Tue, 01 Jun 2010 03:09:36 -0400 In-Reply-To: <87632al874.fsf@Q6600-0.ver.megared.net.mx> (Mario Castelan Castro's message of "Wed\, 26 May 2010 15\:27\:43 -0500") Message-ID: User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.5 (------) X-Debbugs-Envelope-To: 6249-done Cc: 6249-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.5 (------) Mario Castelan Castro writes: > May 26th 2010 for Dan Nicolaescu copy in > 6249@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. ------------=_1275376203-15049-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 May 2010 19:06:57 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFu2C-0007HR-Jo for submit@debbugs.gnu.org; Sat, 22 May 2010 15:06:57 -0400 Received: from mx10.gnu.org ([199.232.76.166]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFttF-0007DI-OD for submit@debbugs.gnu.org; Sat, 22 May 2010 14:57:42 -0400 Received: from lists.gnu.org ([199.232.76.165]:47145) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1OFttB-0000rZ-7S for submit@debbugs.gnu.org; Sat, 22 May 2010 14:57:37 -0400 Received: from [199.232.76.173] (port=54720 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFttA-0005tD-O4 for bug-gnu-emacs@gnu.org; Sat, 22 May 2010 14:57:36 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1OFtt9-0000rT-Dv for bug-gnu-emacs@gnu.org; Sat, 22 May 2010 14:57:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on monty-python X-Spam-Level: X-Spam-Status: No, score=-1.3 required=5.0 tests=AWL autolearn=ham version=3.1.0 Received: from fencepost.gnu.org ([140.186.70.10]:43654) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1OFtt9-0000rP-2D for bug-gnu-emacs@gnu.org; Sat, 22 May 2010 14:57:35 -0400 Received: from localhost ([127.0.0.1]:42476 helo=Q6600-0.ver.megared.net.mx) by fencepost.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFtt5-0003YG-7E; Sat, 22 May 2010 14:57:31 -0400 From: Mario Castelan Castro To: bug-gnu-emacs@gnu.org Subject: 23.2: vc-revert don't works in git Date: Sat, 22 May 2010 13:58:59 -0500 Message-ID: <87ljbb226k.fsf@Q6600-0.ver.megared.net.mx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Spam-Score: -6.6 (------) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sat, 22 May 2010 15:06:55 -0400 Cc: marioxcc@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.6 (------) -----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----- ------------=_1275376203-15049-1--