[Emacs-diffs] /srv/bzr/emacs/trunk r105153: * lisp/vc/vc.el (vc-revert-file): Don't set file time-stamp in the past.

[Glenn Morris]

------------------------------------------------------------
revno: 105153
fixes bug(s): http://debbugs.gnu.org/5181
author: Sergei Organov <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-13 00:58:34 -0700
message:
  * lisp/vc/vc.el (vc-revert-file): Don't set file time-stamp in the past.
modified:
  lisp/ChangeLog
  lisp/vc/vc.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-12 23:25:50 +0000
+++ b/lisp/ChangeLog    2011-07-13 07:58:34 +0000
@@ -1,3 +1,8 @@
+2011-07-13  Sergei Organov  <address@hidden>  (tiny change)
+
+       * vc/vc.el (vc-revert-file):
+       Don't set file time-stamp in the past.  (Bug#5181)
+
 2011-07-12  Lars Magne Ingebrigtsen  <address@hidden>
 
        * files.el (after-find-file): Give a better error message when

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2011-07-10 01:42:39 +0000
+++ b/lisp/vc/vc.el     2011-07-13 07:58:34 +0000
@@ -2428,7 +2428,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)