From d4562f9ba7a8e051206d4ff40e3689a3fe074159 Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Thu, 27 Aug 2009 04:24:27 -0800 Subject: [PATCH] * vc-p4.el (vc-p4-state): Display files present neither on client nor in depot head as `up-to-date'. [git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 7362] --- vc-p4.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vc-p4.el b/vc-p4.el index f8c7766..ee7273a 100644 --- a/vc-p4.el +++ b/vc-p4.el @@ -132,6 +132,7 @@ compare non-open files to the depot version." (haveRev (cdr (assoc "haveRev" alist))) (depotFile (cdr (assoc "depotFile" alist))) (action (cdr (assoc "action" alist))) + (headAction (cdr (assoc "headAction" alist))) (state (cond (action @@ -144,7 +145,9 @@ compare non-open files to the depot version." ((and (not dont-compare-nonopened) (p4-lowlevel-diff-s file "e")) 'unlocked-changes) - ((equal headRev haveRev) + ((or + (equal headRev haveRev) + (and (null haveRev) (string= headAction "delete"))) 'up-to-date) (t 'needs-patch)))