* 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]
This commit is contained in:
parent
1674c9ea2a
commit
0cfe10cab9
1 changed files with 1 additions and 0 deletions
1
vc-p4.el
1
vc-p4.el
|
@ -210,6 +210,7 @@ revision."
|
||||||
"Returns non-nil if FILE is unchanged from the version in Perforce."
|
"Returns non-nil if FILE is unchanged from the version in Perforce."
|
||||||
(let ((state (vc-p4-state file)))
|
(let ((state (vc-p4-state file)))
|
||||||
(and (not (equal (vc-file-getprop file 'vc-p4-action) "add"))
|
(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)
|
(or (equal state 'up-to-date)
|
||||||
(equal state 'needs-patch)
|
(equal state 'needs-patch)
|
||||||
(p4-lowlevel-diff-s file "r")))))
|
(p4-lowlevel-diff-s file "r")))))
|
||||||
|
|
Loading…
Reference in a new issue