Commit a93de381 authored by André Spiegel's avatar André Spiegel

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

parent b667752d
...@@ -785,6 +785,7 @@ For CVS, the full name of CVS/Entries is returned." ...@@ -785,6 +785,7 @@ For CVS, the full name of CVS/Entries is returned."
;; case-sensitively ;; case-sensitively
(setq case-fold-search nil) (setq case-fold-search nil)
(cond (cond
;; normal entry
((re-search-forward ((re-search-forward
(concat "^/" (regexp-quote basename) (concat "^/" (regexp-quote basename)
"/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)") "/\\([^/]*\\)/[^ /]* \\([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." ...@@ -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 mtime)
(vc-file-setprop file 'vc-checkout-time 0))) (vc-file-setprop file 'vc-checkout-time 0)))
(throw 'found (cons (concat dirname "CVS/Entries") 'CVS))) (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 (t (setq case-fold-search fold) ;; restore the old value
nil))) nil)))
(kill-buffer buffer))))) (kill-buffer buffer)))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment