Mercurial > emacs
changeset 46543:7fa004ccd462
(vc-rcs-fetch-master-state): Be more careful to check
if this is really an RCS master file.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Fri, 19 Jul 2002 13:27:44 +0000 |
| parents | f8e6993503cf |
| children | 513411cc4308 |
| files | lisp/vc-rcs.el |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-rcs.el Fri Jul 19 13:26:11 2002 +0000 +++ b/lisp/vc-rcs.el Fri Jul 19 13:27:44 2002 +0000 @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc-rcs.el,v 1.23 2002/02/25 22:04:29 spiegel Exp $ +;; $Id: vc-rcs.el,v 1.24 2002/03/18 17:17:38 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -605,7 +605,10 @@ `vc-checkout-model' to their correct values, based on the master file." (with-temp-buffer - (vc-insert-file (vc-name file) "^[0-9]") + (if (or (not (vc-insert-file (vc-name file) "^[0-9]")) + (progn (goto-char (point-min)) + (not (looking-at "^head[ \t\n]+[^;]+;$")))) + (error "File %s is not an RCS master file" (vc-name file))) (let ((workfile-is-latest nil) (default-branch (vc-parse-buffer "^branch[ \t\n]+\\([^;]*\\);" 1))) (vc-file-setprop file 'vc-rcs-default-branch default-branch)