Mercurial > emacs
changeset 48964:7bba5b5ff0d2
(vc-next-action-on-file): Use t argument to vc-checkout in
order to get the latest version on the current branch. Update
documentation of vc-BACKEND-checkout to explain this.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Thu, 26 Dec 2002 14:04:21 +0000 |
| parents | 1bb53161a4b9 |
| children | 322a31d667aa |
| files | lisp/vc.el |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc.el Thu Dec 26 00:12:09 2002 +0000 +++ b/lisp/vc.el Thu Dec 26 14:04:21 2002 +0000 @@ -6,7 +6,7 @@ ;; Maintainer: Andre Spiegel <spiegel@gnu.org> ;; Keywords: tools -;; $Id: vc.el,v 1.345 2002/11/03 14:48:37 spiegel Exp $ +;; $Id: vc.el,v 1.346 2002/11/03 15:08:29 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -223,9 +223,10 @@ ;; Check out revision REV of FILE into the working area. If EDITABLE ;; is non-nil, FILE should be writable by the user and if locking is ;; used for FILE, a lock should also be set. If REV is non-nil, that -;; is the revision to check out (default is current workfile version); -;; if REV is the empty string, that means to check out the head of the -;; trunk. The implementation should pass the value of vc-checkout-switches +;; is the revision to check out (default is current workfile version). +;; If REV is t, that means to check out the head of the current branch; +;; if it is the empty string, check out the head of the trunk. +;; The implementation should pass the value of vc-checkout-switches ;; to the backend command. ;; ;; * revert (file &optional contents-done) @@ -1194,7 +1195,7 @@ (if (yes-or-no-p (format "%s is not up-to-date. Get latest version? " (file-name-nondirectory file))) - (vc-checkout file (eq (vc-checkout-model file) 'implicit) "") + (vc-checkout file (eq (vc-checkout-model file) 'implicit) t) (if (and (not (eq (vc-checkout-model file) 'implicit)) (yes-or-no-p "Lock this version? ")) (vc-checkout file t)