diff options
| author | André Spiegel <spiegel@gnu.org> | 2002-12-26 14:04:21 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2002-12-26 14:04:21 +0000 |
| commit | 4279775b92b2622ef107d270deb3019957d0fd29 (patch) | |
| tree | 1571ba72c96bb60855f9c92bb8a9427bc0d52b2d /lisp/vc.el | |
| parent | 217aa7d7b783a96da2c0139fd1fa5f0ec06bc249 (diff) | |
| download | emacs-4279775b92b2622ef107d270deb3019957d0fd29.tar.gz | |
(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.
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 577e1283266..1176d71b41a 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -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 VERBOSE is non-nil, query the user rather than using default parameters." (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) |