Announcement

Collapse
No announcement yet.

Using bcompare with svn on the Mac

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

  • acroeica
    started a topic Using bcompare with svn on the Mac

    Using bcompare with svn on the Mac

    Hi,

    I would like to use bcompare 4.X on the Mac as my diff tool for my svn client.

    I followed the step detailed in the online documentation for Linux :
    http://www.scootersoftware.com/suppo...?zz=kb_vcs#svn

    Beyound compare launches correctly, but does not open the files passed by SVN.

    Are the arguments to use not the same on the Mac ?
    Or is there another issue ?

    Thanks very much,
    Nicolas Castagné

  • nikolaosinlight
    replied
    Good point however the ability to edit content in the right pane far exceeds IMHO making edits in the right pane that are not saved b/c one does not know about the tool they are using

    Leave a comment:


  • Aaron
    replied
    Hello,

    That's great, but be careful if you diff two older revisions (rather than a revision to local), as any edits would be to the temp file that SVN is currently showing.

    Leave a comment:


  • nikolaosinlight
    replied
    I also got BC4 working with Subversion on my Mac OS X.

    I did make one minor change though:
    /usr/bin/bcompare "$6" "$7" -title1="$3" -title2="$5" -readonly

    was changed to the following as I like having the ability to make changes to the actual code in a diff tool (and this way it makes the SVN pane only readonly):
    /usr/bin/bcompare "$6" "$7" -title1="$3" -title2="$5" -leftreadonly

    Leave a comment:


  • Aaron
    replied
    Thanks for testing that. Yes, in most cases bcomp is used/expected as it is designed to wait. It is actually an outlier to need bcompare for the Linux Subversion instructions. I've updated the thread with the instructions you recommend.

    Leave a comment:


  • acroeica
    replied
    Oh, the thread is closed. I propose you update it with the following :


    ----
    Subversion (command line) on OS X

    Step 1/
    Install the command line tools, as explained at the top of the thread

    Step 2/
    Follow the explanation for "Linux" on :
    http://www.scootersoftware.com/suppo...?zz=kb_vcs#svn

    However, do not use the "bcompare" command line in the scripts you create.
    Use instead the "bcomp" command line (which seems to be the blocking command line for beyound compare on the Mac).

    ---

    Nicolas

    Leave a comment:


  • acroeica
    replied
    Hello, and thanks for your answer Aaron.

    I had browsed the two pages, but they did not match.

    Indeed, seems that on the Mac I need to point to the "bcomp" command line, and not the "bcompare" command line (bcompare returns immediately).

    I ll update the thread "Using BC4 OSX with Version Control Systems" accordingly :
    http://www.scootersoftware.com/vbull...ad.php?t=11677

    Thanks,
    Nicolas

    Leave a comment:


  • Aaron
    replied
    Hello,

    You'll want to follow the instructions we've gathered for OSX here:
    http://www.scootersoftware.com/vbull...ad.php?t=11677

    The first, and most important, step is to use the Beyond Compare menu -> Install Command Line Tools to get "bcompare" and "bcomp" installed on your system.

    Leave a comment:

Working...
X