diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 407e9496e13..4f046690813 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/vc.el b/lisp/vc.el index e7fc52b5019..e221044b769 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -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 |