mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

(vc-update): Fix bug: Specify branch tip as vc-checkout REVISION.

Browse Source
This commit is contained in:
Thien-Thi Nguyen 2008-02-01 05:52:21 +00:00
parent c1c8b16f5d
commit cea93de37d
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 @@
2008-02-01 Thien-Thi Nguyen <ttn@gnuvola.org>
* vc.el (vc-update): Fix bug: Specify branch tip as
vc-checkout REVISION. Reported by Dan Nicolaescu.
2008-02-01 Glenn Morris <rgm@gnu.org>
* info.el (bookmark-make-cell-function, bookmark-search-size)

2
lisp/vc.el
View File

@ -2980,7 +2980,7 @@ changes from the current branch are merged into the working file."
(if (buffer-modified-p (get-file-buffer file))
(error "Please kill or save all modified buffers before updating."))
(if (vc-up-to-date-p file)
(vc-checkout file nil "")
(vc-checkout file nil t)
(if (eq (vc-checkout-model file) 'locking)
(if (eq (vc-state file) 'edited)
(error "%s"