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

Bug 301432

Summary: [Sync View][Apply Patch] Patched project receives 'unmatched' decoration after merge
Product: [Eclipse Project] Platform Reporter: Tomasz Zarna <tomasz.zarna>
Component: TeamAssignee: Platform Team Inbox <platform-team-inbox>
Status: CLOSED WONTFIX QA Contact: Tomasz Zarna <tomasz.zarna>
Severity: normal    
Priority: P3 CC: Szymon.Brandys
Version: 3.6   
Target Milestone: ---   
Hardware: PC   
OS: Windows XP   
Whiteboard: stalebug
Bug Depends on:    
Bug Blocks: 300345    

Description Tomasz Zarna CLA 2010-02-01 11:35:54 EST 
I20100129-1300
Steps:
1. Synchronize with patch
2. Switch to Patch Contents model
3. Select a file and 'Merge'
=> Project for the file is decorated with umatched icon (white 'x' in red circle). Other models do not show any conflicts.
Comment 1 Tomasz Zarna CLA 2010-03-01 12:19:51 EST 
This is caused by the fact that we only hide merged files (setting them as excluded when merged and marking as manually merged when... manually merged). If these files contain conflicts, and they usually do, the enclosing project will get the "unmatched" decoration as he consults all hunks in all files looking for a one that doesn't match. This is how it works in the Apply Patch wizards, that's a legacy we have to deal with. A way to fix it would be ignoring non-matching hunks from elements that were excluded or marked as merged. This could be done in org.eclipse.team.internal.ui.synchronize.patch.PatchWorkbenchAdapter.getImageDescriptor(Object)...
Comment 2 Tomasz Zarna CLA 2010-03-09 13:44:07 EST 
The same thing applies to files when:
1. A file has one matched and one unmatched hunk
2. 'Merge' the file
3. Fix the conflict for the unmatched hunk
=> The file is still decorated with 'unmatched' overlay
Comment 3 Tomasz Zarna CLA 2010-03-10 06:36:29 EST 
Although I'm deferring the bug, I still think is something that have to be fixed in 3.6.
Comment 4 Szymon Brandys CLA 2010-04-19 07:37:40 EDT 
No plan to investigate it further at this point. Setting the target to match the reality.
Comment 5 Tomasz Zarna CLA 2011-03-21 10:45:32 EDT 
Sorry I had no time to look at this. Given the fact this is not a severe issue I'm resetting the assignee and target milestone. Feel free to comment on the bug if this is not acceptable for you. Currently, this bug is not on my task list for the nearest future.
Comment 6 Lars Vogel CLA 2019-11-08 04:39:04 EST 
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet.

If you have further information on the current state of the bug, please add it. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.

If the bug is still relevant please remove the stalebug whiteboard tag.