Community
Participate
Working Groups
I20100914-0100 Apply Patch in Synchronize view does not show unmatched hunks. In case of merge conflicts, the wizard shows unmatched hunks in the "Patch Content" tree, so I know I have to click "Guess" to choose a better fuzz factor. In the Synchronize view, I only see the conflict decorator on the file, but the compare editor silently ignores unmatched hunks.
Does this bug mean, the Synchronize view cannot handle conflicts? What other reasons than working on conflicts would there be for using the synchronize view for applying a patch? Anyway, this is what I just observed: For applying a non-trivial patch (1.3MByte) with numerous conflicts I tried the option "Apply patch in Synchronize view". (Why is this option not directly available in the patch wizard?) Once the synchronize view opened I clicked "Merge All Non-Conflicting Changes". After the initial merge finished I still see all those files with conflicts in the Synchronize view, but double click opens a compare editor with no differences. This is true for all files with conflicts. At a closer look, both panes show the content of the disk file.
Created attachment 179582 [details] error log There actually is an error in the log. I'm surprised to see that the PatchWorkspace has a problem with its left element (Local File) although it's the right element (After Patch) that is missing the unresolved conflicts.
(In reply to comment #1) > Does this bug mean, the Synchronize view cannot handle conflicts? > What other reasons than working on conflicts would there be for using > the synchronize view for applying a patch? Actually, the Apply Patch in Synchronize View is totally useless because of this bug. And I think it were supposed to simplify exactly this task (manage conflicts/unmatched hunks) with respect to the old Apply Patch Wizard... so this bug is really a bad surprise for me :-( I noticed it a long time ago and wrote about it in the eclipse.platform newsgroup, but I just received an answer to try again. Today I could finally try this feature again and I confirm the problem. I hope this will be fixed soon, because it can lead to severe problems when you use this function to apply a patch that has some unmatched hunks... By the way, I don't have Stephan's error in my error log, although I reproduce the same behaviour.
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.
I simply developed the habit to avoid the synchronize view as much as possible. It could be useful for complex operations like applying patches with lots of conflicts, but it isn't.
I use the Synchronize View a lot for my synrhonisation needs with Subversion, but this bug made the ability to apply patches from there totally useless, so I never used it again. Unless some work has been done in this context, I don't think anything has changed. I usually apply patches from the Project Explorer.
