From cea93de37d0aac9ac5ee7cc43b96b00dfda7c4cb Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Fri, 1 Feb 2008 05:52:21 +0000 Subject: [PATCH] (vc-update): Fix bug: Specify branch tip as vc-checkout REVISION. --- lisp/ChangeLog | 5 +++++ lisp/vc.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2597f8e09e0..24963d909ff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-02-01 Thien-Thi Nguyen + + * vc.el (vc-update): Fix bug: Specify branch tip as + vc-checkout REVISION. Reported by Dan Nicolaescu. + 2008-02-01 Glenn Morris * info.el (bookmark-make-cell-function, bookmark-search-size) diff --git a/lisp/vc.el b/lisp/vc.el index 102eeef0fbf..f2a044f8ce6 100644 --- 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" -- 2.11.4.GIT