Community
Participate
Working Groups
The global 'show pseudo-conflicts' setting is problematic. From the point of view of someone using the compare framework, it creates problems because it imposes a filter on the view of our model which we are completely unaware of. One particular problem we are running into is that in the sync view, we automatically switch to the appropriate view (incoming, outgoing) depending on what types of changes are available. But if there is a pseudo-conflict and no incoming changes, the setting now affects whether the incoming mode is empty or not. More importantly, we have no way of knowing that it is empty! According to our model, there should be something in the incoming view, but the setting *may* have filtered it such that it is not visible. I think it would be better for the model to have control over what should be presented, rather than the view. The view should decide *how* it is presented, but not make decisions on whether or not content should be presented at all. I'm not sure what the appropriate solution to this problem is; I'm open to any suggestions. (A quick and dirty temporary workaround for this problem would be to change the default value of the global setting).
another option to only support this option in the text merge viewer, but not as a global option, i.e., in the drop down.
Fixed for 20020514 Made 'Show Pseudo-Conflicts' option only available in the text compare viewer. It no longer filters in the structure compare viewer (DiffTreeViewer). On the compare preference page the option had been already only available on the text compare page.