From 508d65013695506ee60a42744a79e4e9bf4fdd9e Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Mon, 9 Aug 2010 08:46:04 -0800 Subject: [PATCH] * vc-p4.el (vc-p4-state): Don't compare non-existent files. [git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 7741] --- vc-p4.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vc-p4.el b/vc-p4.el index 872c7d1..0ac8587 100644 --- a/vc-p4.el +++ b/vc-p4.el @@ -146,7 +146,8 @@ compare non-open files to the depot version." (if (equal headRev haveRev) 'edited 'needs-merge)))) - ((and (not dont-compare-nonopened) + ((and (file-exists-p file) + (not dont-compare-nonopened) (p4-lowlevel-diff-s file "e")) 'unlocked-changes) ((or