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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2597f8e09e0d5ba5e845cea3421a9f832223d7cd..24963d909ff7156f6ef665421444ed4c65e62691 100644 (file)
--- 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  Glenn Morris  <rgm@gnu.org>
 
        * info.el (bookmark-make-cell-function, bookmark-search-size)

diff --git a/lisp/vc.el b/lisp/vc.el
index 102eeef0fbf2564fd3e7ca8b091a28bcf4e609fd..f2a044f8ce63903cdb43c1983f04b75bd520dfe6 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -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"