aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2008-02-01 05:52:21 +0000
committerThien-Thi Nguyen2008-02-01 05:52:21 +0000
commitcea93de37d0aac9ac5ee7cc43b96b00dfda7c4cb (patch)
tree0c6df6704319dcf6fee34c497f4c012c134dd3f4
parentc1c8b16f5dd715ce17cb81384f3ca663ce771a78 (diff)
downloademacs-cea93de37d0aac9ac5ee7cc43b96b00dfda7c4cb.tar.gz
emacs-cea93de37d0aac9ac5ee7cc43b96b00dfda7c4cb.zip
(vc-update): Fix bug: Specify branch tip as vc-checkout REVISION.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2597f8e09e0..24963d909ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-02-01 Thien-Thi Nguyen <ttn@gnuvola.org>
2
3 * vc.el (vc-update): Fix bug: Specify branch tip as
4 vc-checkout REVISION. Reported by Dan Nicolaescu.
5
12008-02-01 Glenn Morris <rgm@gnu.org> 62008-02-01 Glenn Morris <rgm@gnu.org>
2 7
3 * info.el (bookmark-make-cell-function, bookmark-search-size) 8 * 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."
2980 (if (buffer-modified-p (get-file-buffer file)) 2980 (if (buffer-modified-p (get-file-buffer file))
2981 (error "Please kill or save all modified buffers before updating.")) 2981 (error "Please kill or save all modified buffers before updating."))
2982 (if (vc-up-to-date-p file) 2982 (if (vc-up-to-date-p file)
2983 (vc-checkout file nil "") 2983 (vc-checkout file nil t)
2984 (if (eq (vc-checkout-model file) 'locking) 2984 (if (eq (vc-checkout-model file) 'locking)
2985 (if (eq (vc-state file) 'edited) 2985 (if (eq (vc-state file) 'edited)
2986 (error "%s" 2986 (error "%s"