Community
Participate
Working Groups
Created attachment 204370 [details] test.patch Scenario: - checkout revision 785 of this project : http://dev.eclipse.org/svnroot/modeling/org.eclipse.emft.facet/trunk/tests/org.eclipse.emf.facet.widgets.nattable.tests - switch to the Team Synchronizing perspective - copy the contents of the patch attached to this bug to your clipboard - in the Synchronize view, click "Synchronize..." - select "Synchronize with Patch" - select "Clipboard" - (select "Apply the patch to the workspace root" if asked) - click Finish - open AllUITests.java in the Compare Editor from the Synchronize view result: the class AllUITests.java appears with merge conflicts, and the Compare Editor shows no changes between the workspace and the patch expected result: the Compare Editor should show incoming changes from the patch, that I am expected to merge in I think this is a serious bug because I would have lost work if I hadn't noticed that the Compare Editor didn't show changes from the patch. Note: the attached patch is an excerpt from this patch: https://bugs.eclipse.org/bugs/attachment.cgi?id=198170 I have tried applying the same patch by pasting the patch into my workspace directly without going through the Synchronize view, and it shows conflicts, and correctly generates a ".rej" file for the changes it couldn't merge automatically.
Gosia, could you please look at it? Check first if a similar problem hasn't been already reported (hint: "[Sync View][Apply Patch]" in summary).
This is very easy to reproduce, but I'm not sure what could we do about it. Just create a patch, make a conflicting change and try to apply the patch in synchronize view. When you open a file in Compare Editor you have the original file on the left and file with changes applied on the right. But when there are conflicts we can't apply conflicting changes. If we can't apply them than we can't show them on the right side. Your patch contained all changes conflicted that's why no changes where displayed. Analogically if you go to the normal Apply Patch wizard you'll see on the differences page that if you click on the conflicting file, the conflicting changes aren't displayed. You can select individual conflicting changes and they are displayed below but they are not applied to the file. Displaying conflicts in the compare editor like in synchronization with CVS would be ideal, but this is only possible in tree way compares, but this would be only possible if we have an original file from which the patch was created. Patches don't provide it. Maybe displaying the individual changes like in Apply Patch wizard would give you a hint that besides applying non-conflicting changes you need to also apply manually/discard conflicting changes.
(In reply to comment #2) > Maybe displaying the individual changes like in Apply Patch wizard would give > you a hint that besides applying non-conflicting changes you need to also apply > manually/discard conflicting changes. This can be done: in synchronize toolbar the third menu handles Models. If you expand the menu you'll see that the default model is "All Models". Despite the name it doesn't display patch contents. Switch it to "Patch Contents" and you'll see the conflicting changes that could not be applied to the conflicting file. But I understand that not being able to see it by default is misleading.
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.
