Community
Participate
Working Groups
I20091025-2000 A conflicting change in a file added to an active change sets appears twice when synchronizing in outgoing mode: 1. In the active change set, decorated with the icon indicating conflict 2. In the checked-in change set causing the conflict, decorated the same way
This case becomes more important if we realize that the commit dialog also uses model synch to show changes to commit (bug 124039). So far we allow change sets to be displayed in the dialog, but when a situation described above occurs when committing the user may get confused. Another option is to do not show change sets in the dialog at all as it has been done so far.
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.