From: André Spiegel <spiegel@gnu.org>
Date: Fri, 23 May 2003 17:57:29 +0000 (+0000)
Subject: (vc-cvs-checkout): Don't leave the branch when REV is t.
X-Git-Tag: ttn-vms-21-2-B4~10013
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63274db1395bb948af8120c0d9dd83dadc34b5f9;p=emacs.git

(vc-cvs-checkout): Don't leave the branch when REV is t.
From Don Provan <dprovan@bivio.net>.
---

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 798ee5c6803..e2374c0e7f4 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -5,7 +5,7 @@
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-cvs.el,v 1.59 2003/05/08 20:44:50 monnier Exp $
+;; $Id: vc-cvs.el,v 1.60 2003/05/09 14:32:01 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -428,11 +428,14 @@ REV is the revision to check out into WORKFILE."
                                        'implicit)))
                           "-w")
                      "update"
-                     ;; default for verbose checkout: clear the sticky tag so
-                     ;; that the actual update will get the head of the trunk
-                     (if (or (not rev) (eq rev t) (string= rev ""))
-                         "-A"
-                       (concat "-r" rev))
+                     (when rev
+                       (unless (eq rev t)
+                         ;; default for verbose checkout: clear the
+                         ;; sticky tag so that the actual update will
+                         ;; get the head of the trunk
+                         (if (string= rev "")
+                             "-A"
+                           (concat "-r" rev))))
                      switches))))
 	(vc-mode-line file)
 	(message "Checking out %s...done" filename)))))