From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sergei Organov Newsgroups: gmane.emacs.devel Subject: [PATCH] vc-revert-file: fix setting of file time-stamp into the past. Date: Fri, 11 Dec 2009 20:18:34 +0300 Message-ID: <87d42lwhsl.fsf@osv.gnss.ru> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1260561590 9781 80.91.229.12 (11 Dec 2009 19:59:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 11 Dec 2009 19:59:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 11 20:59:43 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NJBeQ-0006W4-Vd for ged-emacs-devel@m.gmane.org; Fri, 11 Dec 2009 20:59:43 +0100 Original-Received: from localhost ([127.0.0.1]:39506 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJBeQ-0005lK-BV for ged-emacs-devel@m.gmane.org; Fri, 11 Dec 2009 14:59:42 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NJ98c-0007RB-Gl for emacs-devel@gnu.org; Fri, 11 Dec 2009 12:18:42 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NJ98X-0007O7-Cb for emacs-devel@gnu.org; Fri, 11 Dec 2009 12:18:41 -0500 Original-Received: from [199.232.76.173] (port=37728 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJ98X-0007O0-7A for emacs-devel@gnu.org; Fri, 11 Dec 2009 12:18:37 -0500 Original-Received: from javad.com ([205.178.136.214]:54796 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 1NJ98W-0006cN-RK for emacs-devel@gnu.org; Fri, 11 Dec 2009 12:18:37 -0500 Original-Received: (qmail 29799 invoked from network); 11 Dec 2009 17:18:36 +0000 Original-Received: from unknown (HELO osv.gnss.ru) (89.175.180.246) by javad.com with (AES256-SHA encrypted) SMTP; 11 Dec 2009 17:18:35 +0000 Original-Received: from osv by osv.gnss.ru with local (Exim 4.69) (envelope-from ) id 1NJ98U-0004yj-B5 for emacs-devel@gnu.org; Fri, 11 Dec 2009 20:18:34 +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-Mailman-Approved-At: Fri, 11 Dec 2009 14:56:43 -0500 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:118550 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)