Announcement

Collapse
No announcement yet.

TortoiseSVN integration

Collapse
X
  • Filter
  • Time
  • Show
Clear All
new posts

  • #16
    Hello,

    The VBS script and TortoiseSVn are generally Windows-only. The overall goal of the script was to call with the command line arguments to mark as resolved.

    Once merged, I assume RapidSVN is not marking your files as resolved? How did you define BC3 in your 'Programs' tab (documented here: http://www.rapidsvn.org/index.php/On...ntents#Merging )
    Aaron P Scooter Software

    Comment


    • #17
      Tortoise Git and Beyond Compare 3

      This is what I found for the settings of Diff Viewer:

      "C:\bc3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly


      This is what I found for the merge tool:

      "C:\bc3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname


      Is the Merge tool supposed to bring up the 3 way comparison and the result window at the bottom?

      What do I have to do to get it? I'm currently using the Standard Version.

      Cheers,
      Mike Stone

      Comment


      • #18
        As Aaron described in your other thread, 3-way merge is only supported in Beyond Compare 3 Pro. Beyond Compare 3 Standard only supports 2-way compare/merge.
        Chris K Scooter Software

        Comment


        • #19
          Originally posted by ZoŽ View Post
          ...
          1. Save the attached text file in your BC3 install directory as "BComp.vbs".

          ...
          BComp.vbs appears to no longer be attached. I lost my copy to a disk failure. Can Zoe or another please re-post? I would be grateful.

          Comment


          • #20
            Hello,

            Unfortunately, this file appears to have been lost during a forum upgrade. I asked our developers if they'd be able to recreate it but we don't have a back up copy here or reference material to the original issues.

            Do any other users in this thread still have this file floating around? We'd be grateful (and would properly back it up this time ). You can post the code as plain text instead of attaching as a file.
            Aaron P Scooter Software

            Comment

            Working...
            X