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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 407e9496e13081f5a1f6eca4e6a000ec7455fb98..4f0466908138f46c38bb867ab908c07c84a1236e 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  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 e7fc52b5019001394c2a024b42eb91e9d127ba83..e221044b769e803a1d3bf43ea0a75b7f8c11ee99 100644 (file)
--- 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