summaryrefslogtreecommitdiff
path: root/lisp/vc
diff options
context:
space:
mode:
authorSergei Organov <osv@javad.com>2011-07-13 00:58:34 -0700
committerGlenn Morris <rgm@gnu.org>2011-07-13 00:58:34 -0700
commita1c9f41b785b5978ffa9c9b65c92b3bbc3350a2b (patch)
treefb5071690599574b18c50d3cd411f812702a221a /lisp/vc
parent0be0ce47418235badfb0ae9866da8523058310db (diff)
downloademacs-a1c9f41b785b5978ffa9c9b65c92b3bbc3350a2b.tar.gz
* lisp/vc/vc.el (vc-revert-file): Don't set file time-stamp in the past.
Fixes: debbugs:5181
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/vc.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 796311f8f66..6704a43e59b 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2428,7 +2428,7 @@ its name; otherwise return nil."
(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)