mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-17 17:58:46 +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:51:06 +00:00
parent ed3fdc0ea2
commit eaf07ced98
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 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (reindent-then-newline-and-indent): Be careful about the

2
lisp/vc.el
View File

@ -2597,7 +2597,7 @@ the current branch are merged into the working file."
(vc-buffer-sync nil)
(let ((file buffer-file-name))
(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