Bug 334893 - subclipse update overwrites local file without warning for conflicts
Summary: subclipse update overwrites local file without warning for conflicts
Status: NEW
Alias: None
Product: z_Archived
Classification: Eclipse Foundation
Component: PDT (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: PHP UI CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-01-20 09:57 EST by Christine CLA
Modified: 2020-05-14 10:15 EDT (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Christine CLA 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