Community
Participate
Working Groups
I20110215-0800 Apply Patch doesn't show conflicts, so I don't know whether they are relevant. Steps: - import org.eclipse.jface.text v20110126-1800 from CVS - apply patch from attachment 188938 [details] (ignore missing org.eclipse.jdt.ui) - apply patch from attachment 188931 [details] There's a conflict in the first few lines, since both patches update the copyright to 2011. When you apply the second patch via Team > Apply Patch, you see a conflict in lines 0,5 -> 0,5, but you don't see the left side of the unmatched patch segment. When compare viewer shows an individual hunk, it only shows the result of the patch (in the right viewer pane). It should also show the original hunk in the ancestor pane. When you apply the second patch in the Synchronize view, the compare editor doesn't even show unmatched hunks (bug 325325). The ancestor also doesn't help, since it shows the same as the left pane (the saved state of the file).
If also often run into to this. Quite nasty as one thinks there are many conflicts and then aborts to apply the patch.
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.
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. As such, we're closing this bug. If you have further information on the current state of the bug, please add it and reopen this bug. 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. -- The automated Eclipse Genie.
