#2076 [2.12.4.0] Incorrect directory diff

open
nobody
7
2011-09-22
2011-09-13
Pom_
No

A directory with only one subdirectory ("plv" in the screenshots) is compared to an empty directory in a trunk directory (with subdirectory comparison, and with the filter for source code and subversion...).
The subdirectory "plv" is effectively compared with the ".svn" !! (see screenshot page 3).

Test is made renaming the "plv" directory (with uppercase, with more chars, with another text ...) but the bug always appears.
Only the case of adding another directory make the bug disappear (screenshot page 2).

Using Winmerge 2.12.4.0 (portable version on Windows) (see screenshot page 1).

Discussion

  • Jochen Tucht

    Jochen Tucht - 2011-09-22

    This is by design. When there is exactly one directory on either side, WinMerge cannot give you any better guess. It is wrong most of the time, but it supports a few real-world use cases.

     
  • Pom_

    Pom_ - 2011-09-22

    But also for elements (here directory ".svn) that should be filtered (not be compared) ???

    Are the real-world use cases described somewhere?

     
  • Pom_

    Pom_ - 2011-09-22
    • priority: 5 --> 7
     
  • Pom_

    Pom_ - 2011-09-22

    Thank you for your answer.
    I think that WinMerge do not have to "guess" anything, it has to compare what exist (and what is seen as "same" on many systems, e.g. the uppercase and lowercase characters of a string) !
    When the described behaviour is wanted, we must use another tool, because it could/will lead to making mistakes !

    Thanks for your answer to come.

     
  • Jochen Tucht

    Jochen Tucht - 2011-09-24

    The related RFE is
    http://sourceforge.net/tracker/?func=detail&aid=1205516&group_id=13216&atid=363216

    If in Open dialog you select a filter that includes a rule

    d: \\.svn$ ## Subversion control directory

    then things should work as you expect.

    Examples of such filters are

    [F] Exclude Source Control
    [F] Visual C++ loose

    Read http://manual.winmerge.org/Filters.html#Filters_FileFilter to learn how to create a custom filter for your specific needs.

    Take care to not leave any files with extensions like .FLT~ or so in Filters directory. Some odd logic inside WinMerge was designed to skip such files, but instead entirely aborts scanning of Filters directory.

     
  • Pom_

    Pom_ - 2011-09-24

    Hello Jochen,

    Thank you for your answer.
    But, as described in the bug report, we use the filter Exclude Source Control, and it does not work in this case!

     
  • Jochen Tucht

    Jochen Tucht - 2011-09-24

    I'm wondering whether this is possibly something specific to the portable version.
    Can you recheck with original version?

     
  • Pom_

    Pom_ - 2011-10-31

    Recheck with original version. Same behaviour.

     
  • Jochen Tucht

    Jochen Tucht - 2011-10-31

    Forget about my previous post. I seem to be getting your point. If filters are set to exclude the .svn directory, then plx doesn't show up either. That is not exactly useful.

     

Log in to post a comment.

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:

JavaScript is required for this form.





No, thanks