Migrate from GitHub to SourceForge with this tool. Check out all of SourceForge's recent improvements.
Close

#1708 Cannot compare files in different paths with TortoiseSVN

Branch_+_Trunk
closed-fixed
6
2008-06-02
2008-05-26
Frank Tan
No

Integrate WinMerge with TortoiseSVN during installation.

In TortoiseSVN repo-browser, when you select 2 files in different folders, e.g. one trunk file and a branch copy of it, right click and choose "Compare revisions", WinMerge will pop up but show no result.

Tested on 2.8.0.0 and 2.9.1.2. But 2.6.14.0/2.6.12.0 can do this kind of comparison.

Discussion

  • Kimmo Varis

    Kimmo Varis - 2008-05-26
    • priority: 5 --> 6
     
  • Kimmo Varis

    Kimmo Varis - 2008-05-26

    Logged In: YES
    user_id=631874
    Originator: NO

    Thanks for the report! I can confirm this.

    Can you check the command line from configuration log? You'll see the log from Main menu/Help/Configuration. When I open two files from repository browser, TortoiseSVN gives me two "8.3" -format paths. For example:
    "C:\DOCUME~1\Kimmo\LOCALS~1\Temp\readme.txt-revHEAD.svn000.tmp.txt"

    It is possible we don't expand these short paths correctly. Can you confirm you see the short path also?

     
  • Kimmo Varis

    Kimmo Varis - 2008-05-26

    Logged In: YES
    user_id=631874
    Originator: NO

    No, it is not about those paths. That would have been too easy. I did some more testing, and it seems it is because "descriptions" now contain strings with "/". And so the crappy MFC command line parser thinks they are switches!

    so if I give params:
    /dl "blaa blaa" - it works
    but if I give params
    /dl "/blaa blaa" it does not work

     
  • Kimmo Varis

    Kimmo Varis - 2008-05-26
    • assigned_to: nobody --> kimmov
     
  • Kimmo Varis

    Kimmo Varis - 2008-05-26

    Logged In: YES
    user_id=631874
    Originator: NO

    Attaching a patch for this bug.

    This patch works around the bug in the parser by forcing the string after /dl and /dr to be handled as description string.

    File Added: FixCmdlineDescriptions.zip

     
  • Kimmo Varis

    Kimmo Varis - 2008-05-27
    • status: open --> open-fixed
     
  • Kimmo Varis

    Kimmo Varis - 2008-05-27

    Logged In: YES
    user_id=631874
    Originator: NO

    Committed to SVN trunk:
    Completed: At revision: 5379

    Leaving open for 2.8 branch commit.

     
  • Frank Tan

    Frank Tan - 2008-05-27

    Logged In: YES
    user_id=2098927
    Originator: YES

    Prompt response! Love this project.

    I will test it and report others.

     
  • Kimmo Varis

    Kimmo Varis - 2008-06-02
    • status: open-fixed --> closed-fixed
     
  • Kimmo Varis

    Kimmo Varis - 2008-06-02

    Logged In: YES
    user_id=631874
    Originator: NO

    Committed to 2.8 branch:
    Completed: At revision: 5413

    Next 2.8.2 stable release will have this bug fixed.

     

Log in to post a comment.