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

Bug 300656

Summary:

[Sync View][Apply Patch] Direction indicator vanishes after merge

Product:

[Eclipse Project] Platform

Reporter:

Tomasz Zarna <tomasz.zarna>

Component:

Team

Assignee:

Platform Team Inbox <platform-team-inbox>

Status:

CLOSED WONTFIX

QA Contact:

Tomasz Zarna <tomasz.zarna>

Severity:

minor

Priority:

CC:

Szymon.Brandys

Version:

3.6

Target Milestone:

---

Hardware:

OS:

Windows XP

URL:

http://wiki.eclipse.org/Apply_patch_in_Sync_view

Whiteboard:

stalebug

Bug Depends on:

Bug Blocks:

300345

Attachments:

Description	Flags
Screenshot illustrating the issue.	none

Description Tomasz Zarna

2010-01-25 06:53:47 EST

Switch to "Patch Contents" model and locate a file which has both matched and unmatched hunks. Do "Merge" on that file. Matched hunks are merged and are no longer shown in the view (see bug 300213), but at the same time the direction indicator for the file (blue arrow pointing left) disappears. I believe, the later should not happen.

Comment 1 Tomasz Zarna

2010-01-25 06:55:15 EST

Created attachment 157096 [details]
Screenshot illustrating the issue.

Comment 2 Tomasz Zarna

2010-03-09 08:11:12 EST

This is caused by the fact that org.eclipse.compare.internal.patch.PatchFileDiffNode.getKind(FileDiffResult) returns NO_CHANGE (0) for files with no matching hunks. After merging a file with both matched and unmatched hunks, those matched are merged in and excluded (from the view) but from the patcher point of view they are still there. Moreover they are treated as conflicting changes now (unmatched).

We will need to fix bug 305139 first to see this happening.

Comment 3 Szymon Brandys

2010-04-19 07:37:23 EDT

No plan to investigate it further at this point. Setting the target to match the reality.

Comment 4 Tomasz Zarna

2011-03-21 10:46:57 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 5 Lars Vogel

2019-11-08 04:37:50 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.