Community
Participate
Working Groups
The icons available on top of the StructureMergeViewer are misleading: copy left to right and copy right to left do not mean the same thing depending on what is selected in the viewer, and also depending on the comparison being 2 or 3 ways. This needs to be improved to offer a better user experience. One idea: These icons should be updated depending on what is selected in the StructureMergeViewer, and probably new icons should be created too. This bug is created to allow discussion on that, we'll need to create different tickets once decisions are taken as to what is the way to go. This could be related to bug 462884.
In my opinion, the understandability is already quite good for the accept/reject merge mode but should be improved for the copy left-to-right/right-to-left mode (i.e., when both sides are editable). Currently, EMF Compare offers "Copy left to right" and "Copy right to left" with the respective delta+arrow icons. My suggestion would be to use the following depending on what is selected in the SMV for merging single diffs: * Left-hand side change is selected - Apply change on the right-hand side (icon: delta+arrow_left-to-right) - Undo change on the left-hand side (icon: delta+undo) * Right-hand side change is selected - Apply change on the left-hand side (icon: delta+arrow_right-to-left) - Undo change on the right-hand side (icon: delta+undo) This would apply to the context menu and the icons in the toolbar. Accordingly, I'd change the label/tooltip for the copy all non-conflicting merge actions to: * Apply all non-conflicting changes on the left-hand side (current icon) * Apply all non-conflicting changes on the right-hand side (current icon) Because MergeAllNonConflictingAction (cf. also bug 467668) does not undo actions; it will only set them as merged if they originally have been performed on the side towards which we are merging, which is what I'd expect. This is also why it is confusing imho that the single diff merge uses the same terminology although it actually reverts changes. I you want, I can make a proposal for the changes sketched above in the course of addressing bug 462884. What do you think? Are the changes mentioned above addressing what you meant with creating this bug, Laurent? Thanks!
> Accordingly, I'd change the label/tooltip for the copy all non-conflicting > merge actions to: > > * Apply all non-conflicting changes on the left-hand side (current icon) > * Apply all non-conflicting changes on the right-hand side (current icon) > The exact behavior is : * Apply all non-conflicting right changes on the left-hand side (current icon) * Apply all non-conflicting left changes on the right-hand side (current icon)
Right, Axel. Adding the source side of the changes to be applied makes it technically even more clear.
Created attachment 254246 [details] Mock-up of the context menu of left-hand side changes.
Created attachment 254248 [details] Mock-up of the context menu of right-hand side changes
Hi Philip, Here are my comments: - I think we need to also mock-up several cases of conflicts to make sure we cover all the cases, especially the most complicated - I'm not fond of "Undo", I'd use "Revert" - We'll see our ui specialist internally to see which icon should be used for "Revert", since all our opinions seem to differ on that...
