From 0cfe10cab992614f1f1f5f65f8db12ef5f124401 Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Mon, 9 Aug 2010 08:35:34 -0800 Subject: [PATCH] * vc-p4.el (vc-p4-workfile-unchanged-p): Return nil for files marked for deletion. [git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 7740] --- vc-p4.el | 1 + 1 file changed, 1 insertion(+) diff --git a/vc-p4.el b/vc-p4.el index f1403d2..872c7d1 100644 --- a/vc-p4.el +++ b/vc-p4.el @@ -210,6 +210,7 @@ revision." "Returns non-nil if FILE is unchanged from the version in Perforce." (let ((state (vc-p4-state file))) (and (not (equal (vc-file-getprop file 'vc-p4-action) "add")) + (not (equal (vc-file-getprop file 'vc-p4-action) "delete")) (or (equal state 'up-to-date) (equal state 'needs-patch) (p4-lowlevel-diff-s file "r")))))