Results 1 to 10 of 10
  1. #1
    Join Date
    Aug 2008
    Posts
    5

    Default external diff for tortoisesvn 1.5 diff with url

    i am using tortoisesvn 1.5.

    With the setup for external diff and merge described here,
    usual diff works good.
    BC3 is invoked for diff.

    But with the "diff with URL" command of tortoisesvn1.5 (in hidden context menu with shift key),
    still tortoiseMerge is invoked for diff.

    How can i use BC3 for these cases?

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    2,503

    Default

    I've never used it before, so I might be doing it wrong, but it appears to work ok for me. Are you using BC for both comparing both files and properties? Have you tried upgrading to TortoiseSVN 1.5.3?
    Zo P Scooter Software

  3. #3
    Join Date
    Aug 2008
    Posts
    5

    Default

    for a single file, it works good.

    but for a directory, if i do 'diff with url',
    then 'tortoiseMerge' is invoked.

  4. #4
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    2,503

    Default

    I didn't see any way to associate a diff tool with BC to compare directories. I'd suggest submitting a feature request to the TortoiseSVN guys. In the meantime, you may be able to work around it by replacing TortoiseMerge.exe with a copy of BComp.exe. It will get overwritten any time you upgrade though.
    Zo P Scooter Software

  5. #5
    Join Date
    Aug 2008
    Posts
    5

    Default

    I am not talkig about folder compare, but file compare.

    if i do 'diff with url' on the folder,
    a window with the list of files pops up, and i can select an individual file to view the "file" diff.
    I though there might be some short-cut to diff viewer in this case.

    I tried to replace tortoiseMerge with BComp.exe.
    but with BComp.exe, no file list window pops up and
    only first file of the list is shown on the session menu of BC3.
    Last edited by auditory; 10-Sep-2008 at 11:30 PM.

  6. #6
    Join Date
    Oct 2007
    Location
    Pennsylvania
    Posts
    1,772

    Default

    Quote Originally Posted by auditory View Post
    I am not talkig about folder compare, but file compare.

    if i do 'diff with url' on the folder,
    a window with the list of files pops up, and i can select an individual file to view the "file" diff.
    Craig is right. The "window with the list of files" equates to a folder compare.
    BC v4.0.7 build 19761

  7. #7
    Join Date
    Aug 2008
    Posts
    5

    Default

    first of all, i didn't mean craig was wrong.
    if it sounds like that, my apology about it.

    i thought, if tortoiseMerge works in that way, it would not be hard job
    BC3 intercepts the messages from tortoisesvn, and
    replace the "file" diff viewer with BC3.

    i can understand work-around about this issue.
    thank you for the replies.

  8. #8
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    2,503

    Default

    I'll take a look at this on Monday. If we can easily parse the command line to get the list of files then it should be easy enough to add support for it. If it requires actually communicating with SVN we're not likely to get to it soon, in which case I still encourage you to submit an enhancement request to TortoiseSVN, which would allow it to work with other third-party differs.
    Zo P Scooter Software

  9. #9
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    2,503

    Default

    Sorry, we won't be able to do this soon. Tortoise passes a path file (the same as our File Comparison Report's "Patch" output), and TortoiseMerge internally splits that up into the list of files and applies the patches to generate the original files for the comparison. That's been requested in the past, but it's a significant feature, and definitely not something we could whip out in an afternoon. If comparing/applying patches isn't in our request list already I'll add that, with a note to support TortoiseMerge's command line once we do.
    Zo P Scooter Software

  10. #10
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    2,503

    Default

    Oh, and once we add support for that, I think you can configure support for it in TortoiseSVN by changing the "Unified Diff Viewer" option, so replacing TortoiseMerge.exe won't be necessary.
    Zo P Scooter Software

Tags for this Thread

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •