Bug 82 - Unhelpful conflicts on a folder (1GE6S2I)
Summary: Unhelpful conflicts on a folder (1GE6S2I)
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 2.0   Edit
Hardware: All Windows 2000
: P5 normal (vote)
Target Milestone: 2.1   Edit
Assignee: Kevin McGuire CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2001-10-10 21:36 EDT by Tim Ellison CLA
Modified: 2002-09-08 15:49 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 Tim Ellison CLA 2001-10-10 21:36:08 EDT 
Platform: JDK 108 W2K

If you create a folder and release it to the repository, then cause a conflict by,
say, adding a member _and_ modifying it in the repository, the catch-up/release
browser shows that the folder is in conflict (the red diamond) but givs no indication
about why or how.  The only action is to release local state or accept the repository
renditioning.
Comment 1 Kevin McGuire CLA 2002-04-17 15:55:14 EDT 
Need a way to provide more info
Comment 2 Michael Valenta CLA 2002-09-08 15:46:57 EDT 
Reopening
Comment 3 Michael Valenta CLA 2002-09-08 15:49:28 EDT 
These should no longer show up as folder conflicts. The only folder conflict 
occurs when a folder that exists locally but is not under version control is 
synced with a folder with the same name that exists remotely.