From: André Spiegel <spiegel@gnu.org>
Date: Mon, 16 Sep 1996 14:44:22 +0000 (+0000)
Subject: (vc-find-cvs-master): Fixed handling of "locally added" files.
X-Git-Tag: emacs-20.1~3728
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a93de381c14da99528a00e34cce07da37fad7796;p=emacs.git

(vc-find-cvs-master): Fixed handling of "locally added" files.
---

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 095b16c69b7..da978dbd078 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -785,6 +785,7 @@ For CVS, the full name of CVS/Entries is returned."
 	      ;; case-sensitively
 	      (setq case-fold-search nil)
 	      (cond
+	       ;; normal entry
 	       ((re-search-forward
 		 (concat "^/" (regexp-quote basename) 
 			 "/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)")
@@ -814,6 +815,13 @@ For CVS, the full name of CVS/Entries is returned."
 		      (vc-file-setprop file 'vc-checkout-time mtime)
 		    (vc-file-setprop file 'vc-checkout-time 0)))
 		(throw 'found (cons (concat dirname "CVS/Entries") 'CVS)))
+	       ;; entry for a "locally added" file (not yet committed)
+	       ((re-search-forward
+		 (concat "^/" (regexp-quote basename) "/0/Initial ") nil t)
+		(setq case-fold-search fold) ;; restore the old value
+		(vc-file-setprop file 'vc-checkout-time 0)
+		(vc-file-setprop file 'vc-workfile-version "0")
+		(throw 'found (cons (concat dirname "CVS/Entries") 'CVS)))
 	       (t (setq case-fold-search fold)  ;; restore the old value
 		  nil)))
 	  (kill-buffer buffer)))))