diff options
| author | André Spiegel <spiegel@gnu.org> | 1996-09-16 14:44:22 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 1996-09-16 14:44:22 +0000 |
| commit | 96111013f1e5f17fe681e62be3b69ac9e84ae04c (patch) | |
| tree | 5c7651d03299809ab24eb424046a2de602d71c06 /lisp | |
| parent | b55417374968ac7b06a3d2282a9ef8ba63328f35 (diff) | |
| download | emacs-96111013f1e5f17fe681e62be3b69ac9e84ae04c.tar.gz | |
(vc-find-cvs-master): Fixed handling of "locally added" files.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc-hooks.el | 8 |
1 files changed, 8 insertions, 0 deletions
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))))) |