From 015a4a67dc43d127270c178a6cce618121491044 Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Mon, 9 Aug 2010 09:58:53 -0800 Subject: [PATCH] * vc-p4.el (vc-p4-state): Mark new files as added. [git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 7742] --- vc-p4.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vc-p4.el b/vc-p4.el index 0ac8587..d9d71c0 100644 --- a/vc-p4.el +++ b/vc-p4.el @@ -144,7 +144,7 @@ compare non-open files to the depot version." (if (string-match " by \\([^@]+\\)@" opened) (match-string 1 opened) (if (equal headRev haveRev) - 'edited + (if (string= action "add") 'added 'edited) 'needs-merge)))) ((and (file-exists-p file) (not dont-compare-nonopened)