Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 334893

Summary:	subclipse update overwrites local file without warning for conflicts
Product:	z_Archived	Reporter:	Christine <christine>
Component:	PDT	Assignee:	PHP UI <php.ui-inbox>
Status:	NEW ---	QA Contact:
Severity:	normal
Priority:	P3
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Linux
Whiteboard:

Description Christine

2011-01-20 09:57:41 EST

Build Identifier: 20100917-0705

When I know there's a conflict between the local php file and the one in subversion, I should get a warning, as I do for java files. However, there's no indication of a conflict and when I press "update", the local file is overwritten. In java, it works fine.
Maybe this is related to the compare editor bug? I like the compare editor in Java, but in php it simply doesn't work.

Reproducible: Always

Steps to Reproduce:
1.commit php file to svn
2.make local change
3.do svn "update"
4.local change is lost without a warning