Problem: I have the CVS pane with "Hide Up-to-date files" option activated. So I see only my modified files. A problem with conflicting files arises when doing "Update". If update has lead to conflicts in some files, then these files are not shown in CVS pane just after "Update"! However I see them as red when I deactivate "Hide Up-to-date files" option. After I edit such conflicting file somehow and do "save", this file appears as "changed" in CVS pane. Only the option "Hide Up-to-date files" is activated in CVS pane. Two others are turned off. IDEA build #528
Suggestion: It would be logical to treat conflicting files as "changed" JUST AFTER update when conflict appeared, but NOT only AFTER I have changed this file. --- Vladimir Kudinov V6.RU _______________________________________________ Eap-list mailing list [EMAIL PROTECTED] http://www.intellij.com/mailman/listinfo/eap-list
