procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/vc.el (vc-revert-file): Don't set file time-stamp in the past.

Browse source 
Fixes: debbugs:5181
This commit is contained in:
Sergei Organov 2011-07-13 00:58:34 -07:00 • committed by Glenn Morris
parent 0be0ce4741
commit a1c9f41b78
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

2
lisp/vc/vc.el
View file

@ -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)