Commit 036f45fa authored by André Spiegel's avatar André Spiegel
Browse files

(vc-rcs-state): Call vc-workfile-unchanged-p only here, and

differentiate according to checkout model.
(vc-rcs-fetch-master-state): Don't call vc-workfile-unchanged-p, since
this function is only concerned with master state.
parent e5a9dabf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;; Author: FSF (see vc.el for full credits) ;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org> ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
;; $Id: vc-rcs.el,v 1.11 2000/10/03 12:08:40 spiegel Exp $ ;; $Id: vc-rcs.el,v 1.12 2000/11/16 18:13:16 spiegel Exp $
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -126,7 +126,9 @@ For a description of possible values, see `vc-check-master-templates'." ...@@ -126,7 +126,9 @@ For a description of possible values, see `vc-check-master-templates'."
(if (eq state 'up-to-date) (if (eq state 'up-to-date)
(if (vc-workfile-unchanged-p file) (if (vc-workfile-unchanged-p file)
'up-to-date 'up-to-date
'unlocked-changes) (if (eq (vc-checkout-model file) 'locking)
'unlocked-changes
'edited))
state))) state)))
(defun vc-rcs-state-heuristic (file) (defun vc-rcs-state-heuristic (file)
...@@ -688,12 +690,7 @@ file." ...@@ -688,12 +690,7 @@ file."
(if (or workfile-is-latest (if (or workfile-is-latest
(vc-rcs-latest-on-branch-p file workfile-version)) (vc-rcs-latest-on-branch-p file workfile-version))
;; workfile version is latest on branch ;; workfile version is latest on branch
(if (eq (vc-checkout-model file) 'locking) 'up-to-date
'up-to-date
(require 'vc)
(if (vc-workfile-unchanged-p file)
'up-to-date
'edited))
;; workfile version is not latest on branch ;; workfile version is not latest on branch
'needs-patch)) 'needs-patch))
;; locked by the calling user ;; locked by the calling user
......
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