aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 407e9496e13..4f046690813 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 Stefan Monnier <monnier@iro.umontreal.ca> 62008-02-01 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * simple.el (reindent-then-newline-and-indent): Be careful about the 8 * 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."
2597 (vc-buffer-sync nil) 2597 (vc-buffer-sync nil)
2598 (let ((file buffer-file-name)) 2598 (let ((file buffer-file-name))
2599 (if (vc-up-to-date-p file) 2599 (if (vc-up-to-date-p file)
2600 (vc-checkout file nil "") 2600 (vc-checkout file nil t)
2601 (if (eq (vc-checkout-model file) 'locking) 2601 (if (eq (vc-checkout-model file) 'locking)
2602 (if (eq (vc-state file) 'edited) 2602 (if (eq (vc-state file) 'edited)
2603 (error 2603 (error