Commit 11a36f64 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(vc-rcs-fetch-master-state): Fix inf-loop.

parent 8653eee8
2008-05-05 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-rcs.el (vc-rcs-fetch-master-state): Fix inf-loop.
2008-05-05 Tom Tromey <tromey@redhat.com>
 
* smerge-mode.el (smerge-start-session): Don't call smerge-next if
......
......@@ -893,7 +893,8 @@ file."
;; locked by the calling user
((and (stringp locking-user)
(string= locking-user (vc-user-login-name file)))
(if (or (eq (vc-rcs-checkout-model (list file)) 'locking)
;; Don't call `vc-rcs-checkout-model' to avoid inf-looping.
(if (or (eq (vc-file-getprop file 'vc-checkout-model) 'locking)
workfile-is-latest
(vc-rcs-latest-on-branch-p file working-revision))
'edited
......
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