Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 305139 - [Sync View][Apply Patch] Merging a file with an unmatched hunk hides the file
Summary: [Sync View][Apply Patch] Merging a file with an unmatched hunk hides the file
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 3.6   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: 3.6 M6   Edit
Assignee: Tomasz Zarna CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-03-09 08:05 EST by Tomasz Zarna CLA
Modified: 2010-03-09 14:06 EST (History)
1 user (show)

See Also:

Attachments
Fix v01 (4.69 KB, patch)
2010-03-09 08:13 EST, Tomasz Zarna CLA 		no flags Details | Diff
Fix v02 (5.49 KB, patch)
2010-03-09 13:56 EST, Tomasz Zarna CLA 		no flags Details | Diff
mylyn/context/zip (7.80 KB, application/octet-stream)
2010-03-09 13:56 EST, Tomasz Zarna CLA 		no flags Details
Show Obsolete (1) View All 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 Tomasz Zarna CLA 2010-03-09 08:05:35 EST 
I20100307-2000

Merging a file with unmatched hunk hides the file, it should only merge hunks that can be merged and skip those unmatched. The file should still be visible in the view, contacting only unmatched hunks. This is similar to bug 300213. Caused by fix to bug 300237.
Comment 1 Tomasz Zarna CLA 2010-03-09 08:13:24 EST 
Created attachment 161453 [details]
Fix v01
Comment 2 Tomasz Zarna CLA 2010-03-09 13:56:08 EST 
Created attachment 161497 [details]
Fix v02
Comment 3 Tomasz Zarna CLA 2010-03-09 13:56:14 EST 
Created attachment 161498 [details]
mylyn/context/zip
Comment 4 Tomasz Zarna CLA 2010-03-09 14:06:58 EST 
Fixed in HEAD, but filed bug 305217 to address a scenario this fix doesn't cover.