diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 19c80a65888..e2371c6f7c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-07-13 Sergei Organov <osv@javad.com> (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 <larsi@gnus.org> * files.el (after-find-file): Give a better error message when 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) |