WinMerge / Bugs / #1784 Must Show Different to Show L/R Unique: Fldr Cmpr

#1784 Must Show Different to Show L/R Unique: Fldr Cmpr

Milestone: Branch_+_Trunk

Status: closed-fixed

Owner: Kimmo Varis

Labels: GUI (515)

Priority: 5

Updated: 2009-03-09

Created: 2008-09-26

Creator: Mark H

Private: No

Version 2.11.1.4 Unicode
This is in Folder Compare:

Must have View->Show Different checked
to have View->Show Left/Right Unique *work*

This seems to only be true of files in sub-folders.
A unique file in the "root" folder of the Folder compare will show up with-out the View->Show Different checked...

Discussion

Kimmo Varis - 2008-10-21

WinMerge considers unique items as being different. This logic comes from on/off logic - unique items are rather different than identical.

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark H - 2008-10-23

The desired behavior is to Only see the Left (or Right) Unique files--and none of the "Different" files that exist on both sides...

I think this is the behavior in earlier versions. I've been using WinMerge since about 2.2 or 2.4...
I can check earlier versions if needed.

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark H - 2008-10-24

I checked and this is the behavior in 2.10.0.0;
Unchecking the Different but leaving Left / Right Unique results in the Unique files/folders showing but not-the different files that exist on both sides...

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2008-10-24

Oh. Then I was wrong. Thanks for checking!

I assumed there were no changes related to this between 2.10.0 and current experimentals, so I must have missed something. Must be related to new tree-style view or unique items.

Assigning to me.

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2008-10-24

assigned_to: nobody --> kimmov

milestone: --> 102450
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-01-27

Patch

Unique_show_fix.patch

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-01-27

I haven't been able to really track this down to when it broke. I think it broke (as lots of other stuff) when we added tree-mode and showing of items in unique folders.

However I think I found small bug in how we determine what items to show. We are first checking for compare result (and if no match hide) and only after that check for unique items.

But we must check first for unique items. If item is unique, its not different or identical, so further checks are unnecessary. This change should also fix this bug.

Attaching a patch (Unique_show_fix.patch).
File Added: Unique_show_fix.patch

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark H - 2009-01-27

Great find!
Thanks! :-)

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-01-28

Fix committed to SVN trunk:
Completed: At revision: 6393

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-01-28

status: open --> open-fixed
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-02-04

Committed the fix to 2.12 branch:
Completed: At revision: 6414

So the bug will be fixed in next beta and stable releases.

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-02-04

milestone: 102450 --> Branch_+_Trunk

status: open-fixed --> closed-fixed
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark H - 2009-02-20

Still not working in Version: 2.13.3 Unicode

View->Differences + Left unique
Shows Different and Left unique
View->Left unique
Shows Nothing...

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark H - 2009-02-20

For RIGHT UNIQUE it Works.
Just broken for LEFT Unique.?

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark H - 2009-02-20

status: closed-fixed --> open-fixed
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark H - 2009-02-20

And it still works as expected in 2.10.4

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-02-24

Thanks for testing. I'll look what is going on, since left/right visibility *should* be almost identical..

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-02-24

Ok, this is because of the real tree-structured compare results WinMerge now creates. In tree-mode results view we hide contents of the "different" folders if "shown different" is not selected. Which is natural way to work in that view. This now confuses the flat view logic. Apparently I missed the difference in visibility logic for subfolders which are not shown but only files inside them.

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-02-24

Attaching a patch that disables checking for identical/different status for folders in flat result view. After short testing this looks to be working now ok. (Show_unique_in_flat_view.patch)
File Added: Show_unique_in_flat_view.patch

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-02-24

Differentiate tree-view and flat view

Show_unique_in_flat_view.patch

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-02-25

Fix committed to SVN trunk:
Completed: At revision: 6495
and to 2.12 branch:
Completed: At revision: 6496

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Kimmo Varis - 2009-03-05

Can you test 2.13.4 experimental?

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark H - 2009-03-05

It works! 2.13.4
Tried all possible combinations, and got the display I expected.
Thanks!
Great Work! :-D

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark H - 2009-03-09

Closing. Fix Verified.

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Mark H - 2009-03-09

status: open-fixed --> closed-fixed
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Log in to post a comment.