From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sergei Organov Newsgroups: gmane.emacs.bugs Subject: bug#5181: [PATCH] vc-revert-file: fix setting of file time-stamp into the past. Date: Fri, 11 Dec 2009 19:12:39 +0300 Message-ID: <87k4wtwkug.fsf@osv.gnss.ru> Reply-To: Sergei Organov , 5181@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1260548894 31267 80.91.229.12 (11 Dec 2009 16:28:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 11 Dec 2009 16:28:14 +0000 (UTC) To: bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Dec 11 17:28:07 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NJ8Ld-0003nL-T5 for geb-bug-gnu-emacs@m.gmane.org; Fri, 11 Dec 2009 17:28:06 +0100 Original-Received: from localhost ([127.0.0.1]:36782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJ8Ld-0000z5-NJ for geb-bug-gnu-emacs@m.gmane.org; Fri, 11 Dec 2009 11:28:05 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NJ8LA-0000o1-J5 for bug-gnu-emacs@gnu.org; Fri, 11 Dec 2009 11:27:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NJ8L5-0000mh-9V for bug-gnu-emacs@gnu.org; Fri, 11 Dec 2009 11:27:35 -0500 Original-Received: from [199.232.76.173] (port=48390 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJ8L4-0000mO-UE for bug-gnu-emacs@gnu.org; Fri, 11 Dec 2009 11:27:30 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:45635) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NJ8L3-0001V3-M9 for bug-gnu-emacs@gnu.org; Fri, 11 Dec 2009 11:27:30 -0500 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id nBBGRRKE017919; Fri, 11 Dec 2009 08:27:27 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id nBBGF5SL016595; Fri, 11 Dec 2009 08:15:05 -0800 Resent-Date: Fri, 11 Dec 2009 08:15:05 -0800 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Sergei Organov Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Fri, 11 Dec 2009 16:15:05 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 5181 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.126054797316423 (code B ref -1); Fri, 11 Dec 2009 16:15:05 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 11 Dec 2009 16:12:53 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id nBBGCpCg016420 for ; Fri, 11 Dec 2009 08:12:53 -0800 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NJ86q-0004Dy-92 for bug-gnu-emacs@gnu.org; Fri, 11 Dec 2009 11:12:48 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NJ86l-00047k-IP for bug-gnu-emacs@gnu.org; Fri, 11 Dec 2009 11:12:47 -0500 Original-Received: from [199.232.76.173] (port=34410 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJ86l-00047Y-D2 for bug-gnu-emacs@gnu.org; Fri, 11 Dec 2009 11:12:43 -0500 Original-Received: from javad.com ([205.178.136.214]:37315 helo=02aef2d.netsolvps.com) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NJ86k-0008I7-V2 for bug-gnu-emacs@gnu.org; Fri, 11 Dec 2009 11:12:43 -0500 Original-Received: (qmail 26216 invoked from network); 11 Dec 2009 16:12:41 +0000 Original-Received: from unknown (HELO osv.gnss.ru) (89.175.180.246) by javad.com with (AES256-SHA encrypted) SMTP; 11 Dec 2009 16:12:41 +0000 Original-Received: from osv by osv.gnss.ru with local (Exim 4.69) (envelope-from ) id 1NJ86h-0002BO-UB for bug-gnu-emacs@gnu.org; Fri, 11 Dec 2009 19:12:39 +0300 User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Fri, 11 Dec 2009 11:27:35 -0500 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:33494 Archived-At: The patch below fixes a long-standing bug in the VC, described here: 2009-12-11 Sergei Organov * vc.el (vc-revert-file): Fix setting of file time-stamp into the past. Index: lisp/vc.el =================================================================== RCS file: /sources/emacs/emacs/lisp/vc.el,v retrieving revision 1.746 diff -u -r1.746 vc.el --- lisp/vc.el 7 Dec 2009 09:02:16 -0000 1.746 +++ lisp/vc.el 11 Dec 2009 16:03:12 -0000 @@ -2114,7 +2114,7 @@ (list file) (let ((backup-file (vc-version-backup-file file))) (when backup-file - (copy-file backup-file file 'ok-if-already-exists 'keep-date) + (copy-file backup-file file 'ok-if-already-exists) (vc-delete-automatic-version-backups file)) (vc-call revert file backup-file)) `((vc-state . up-to-date)