Mercurial > emacs
comparison lisp/vc-rcs.el @ 94627:9cc7bc51e055
(vc-rcs-fetch-master-state): Fix inf-loop.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 05 May 2008 06:38:04 +0000 |
| parents | a0bb8ca25a33 |
| children | ee5932bf781d |
comparison
equal
deleted
inserted
replaced
| 94626:5eb3ee73ed4e | 94627:9cc7bc51e055 |
|---|---|
| 891 ;; workfile version is not latest on branch | 891 ;; workfile version is not latest on branch |
| 892 'needs-update)) | 892 'needs-update)) |
| 893 ;; locked by the calling user | 893 ;; locked by the calling user |
| 894 ((and (stringp locking-user) | 894 ((and (stringp locking-user) |
| 895 (string= locking-user (vc-user-login-name file))) | 895 (string= locking-user (vc-user-login-name file))) |
| 896 (if (or (eq (vc-rcs-checkout-model (list file)) 'locking) | 896 ;; Don't call `vc-rcs-checkout-model' to avoid inf-looping. |
| 897 (if (or (eq (vc-file-getprop file 'vc-checkout-model) 'locking) | |
| 897 workfile-is-latest | 898 workfile-is-latest |
| 898 (vc-rcs-latest-on-branch-p file working-revision)) | 899 (vc-rcs-latest-on-branch-p file working-revision)) |
| 899 'edited | 900 'edited |
| 900 ;; Locking is not used for the file, but the owner does | 901 ;; Locking is not used for the file, but the owner does |
| 901 ;; have a lock, and there is a higher version on the current | 902 ;; have a lock, and there is a higher version on the current |