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

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 095b16c69b716fd381d03017a078db36afe380ef..da978dbd07866b88438d2a07dd8fa610abdf5c23 100644 (file)
--- 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)))))