From 63274db1395bb948af8120c0d9dd83dadc34b5f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Spiegel?= Date: Fri, 23 May 2003 17:57:29 +0000 Subject: [PATCH] (vc-cvs-checkout): Don't leave the branch when REV is t. From Don Provan . --- lisp/vc-cvs.el | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 -;; $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)))))