Results 1 to 10 of 10
  1. #1
    Join Date
    Apr 2013
    Posts
    1

    Smile SourceTree configuration

    Visual Diff Tool: Other
    Diff Command:/usr/local/bin/bcomp
    Parameters:$LOCAL $REMOTE
    Merge Tool: Other
    Merge Command:/usr/local/bin/bcomp
    Paramters:$LOCAL $REMOTE $BASE $MERGED

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

    Default

    Thanks for the configuration.
    Aaron P Scooter Software

  3. #3
    Join Date
    Apr 2013
    Posts
    8

    Default

    Side note: SourceTree has a built in list of compare tools.
    Would be great to contact them to add BC to it.
    I have seen somewhere else that someone suggested this, not sure if it was for SourceTree as well.

    Oh and fyi, sourcetree just append to ~/.gitconfig this:
    # sourcetree

    [difftool "sourcetree"]
    cmd = bcomp $LOCAL $REMOTE
    path =
    [mergetool "sourcetree"]
    cmd = bcomp $LOCAL $REMOTE $BASE $MERGED
    trustExitCode = true

  4. #4
    Join Date
    Apr 2013
    Location
    Tokyo
    Posts
    9

    Default

    A suggestion for the diff case is to use the "-ro" parameter to disable editing when viewing a diff.
    Parameters:-ro $LOCAL $REMOTE

  5. #5
    Join Date
    Dec 2013
    Location
    Amsterdam
    Posts
    32

    Default

    Quote Originally Posted by carbncl View Post
    Side note: SourceTree has a built in list of compare tools.
    Would be great to contact them to add BC to it.
    Here you go: https://jira.atlassian.com/browse/SRCTREE-2092

  6. #6
    Join Date
    Dec 2013
    Location
    Amsterdam
    Posts
    32

    Default

    Smart, I definitely second the -ro addition.

  7. #7
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,890

    Default

    Thanks for opening that request form. I've also updated the forum post with "-ro"
    Aaron P Scooter Software

  8. #8
    Join Date
    Mar 2014
    Posts
    1

    Default

    Quote Originally Posted by nevil View Post
    A suggestion for the diff case is to use the "-ro" parameter to disable editing when viewing a diff.
    Parameters:-ro $LOCAL $REMOTE
    I've found that if you have spaces in your file paths you need to add quotes around the parameters: -ro "$LOCAL" "$REMOTE"

  9. #9
    Join Date
    Apr 2006
    Location
    Norwich, UK
    Posts
    39

    Cool

    Guys, I made a request for adding BeyondCompare as a recognized diff/merge tool for SourceTree, please vote/add comments there.

    https://jira.atlassian.com/browse/SRCTREE-2156

  10. #10
    Join Date
    Sep 2014
    Posts
    1

    Default

    To get this working, you first need to install the Beyond Compare command line tools.

    From the main menu, choose Beyond Compare -> Install Command Line Tools..., then follow the instructions.

    That will install /usr/local/bin/bcomp and /usr/local/bin/bcompare on your Mac.

Posting Permissions

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