aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1997-04-22 01:04:48 +0000
committerRichard M. Stallman1997-04-22 01:04:48 +0000
commit70b760ed2da29f1b5a8f90047ce70066da868cd5 (patch)
tree7841800571a47c292a22ca176ca21564d12ba214
parentd83cce6dda49e4ea7b356d4d789cfb78b1d4be65 (diff)
downloademacs-70b760ed2da29f1b5a8f90047ce70066da868cd5.tar.gz
emacs-70b760ed2da29f1b5a8f90047ce70066da868cd5.zip
(vc-find-cvs-master): Handle a "New file!" entry.
(vc-fetch-master-properties): Match "New file!".
-rw-r--r--lisp/vc-hooks.el8
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index ffcb5930de7..6ddba1a4a3b 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -356,6 +356,7 @@ See also variable `vc-consult-headers'.")
356 'needs-checkout) 356 'needs-checkout)
357 ((string-match "Unresolved Conflict" status) 'unresolved-conflict) 357 ((string-match "Unresolved Conflict" status) 'unresolved-conflict)
358 ((string-match "Locally Added" status) 'locally-added) 358 ((string-match "Locally Added" status) 'locally-added)
359 ((string-match "New file!" status) 'locally-added)
359 (t 'unknown) 360 (t 'unknown)
360 )))))))) 361 ))))))))
361 (if (get-buffer "*vc-info*") 362 (if (get-buffer "*vc-info*")
@@ -818,6 +819,13 @@ For CVS, the full name of CVS/Entries is returned."
818 (vc-file-setprop file 'vc-checkout-time 0) 819 (vc-file-setprop file 'vc-checkout-time 0)
819 (vc-file-setprop file 'vc-workfile-version "0") 820 (vc-file-setprop file 'vc-workfile-version "0")
820 (throw 'found (cons (concat dirname "CVS/Entries") 'CVS))) 821 (throw 'found (cons (concat dirname "CVS/Entries") 'CVS)))
822 ((re-search-forward
823 (concat "^/" (regexp-quote basename)
824 "/\\([^/]*\\)/Initial") nil t)
825 (setq case-fold-search fold) ;; restore the old value
826 (vc-file-setprop file 'vc-workfile-version "0")
827 (vc-file-setprop file 'vc-checkout-time 0)
828 (throw 'found (cons (concat dirname "CVS/Entries") 'CVS)))
821 (t (setq case-fold-search fold) ;; restore the old value 829 (t (setq case-fold-search fold) ;; restore the old value
822 nil))) 830 nil)))
823 (kill-buffer buffer))))) 831 (kill-buffer buffer)))))