Results 1 to 6 of 6

Thread: bc with git

  1. #1
    Join Date
    Feb 2013
    Posts
    16

    Default bc with git

    When i setup beyond compare to use git, when bc loads the remove file is missing? Says file not found. Any ideas?

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

    Default

    How is your .gitconfig currently configured? With SourceTree installed and if it is configured to use a GitRepository, it would already have a difftool and mergetool defined. Did you use these definitions?
    Aaron P Scooter Software

  3. #3
    Join Date
    Feb 2013
    Posts
    16

    Default

    I tried both,

    SourceTree

    'bcompare' $LOCAL $REMOTE

    basically just followed this
    http://www.iokom.com/drupal/node/4

    git difftool

    Viewing: 'something.js'
    Launch 'bc3' [Y/n]: y

    When beyond compare opens the left side says "File Not Found",right side has the file.


    Happens both from SourceTree and from git command line.

  4. #4
    Join Date
    Oct 2009
    Posts
    116

    Default

    This turns out to be bad memory on my part. There should be two CLI tools set up in the /usr/local/bin/ directory:

    ln -s /Applications/Beyond Compare/Contents/MacOS/bcomp /usr/local/bin/bcompare
    ln -s /Applications/Beyond Compare/Contents/MacOS/bcomp /usr/local/bin/bcomp

    This provides 'bcompare' and 'bcomp' from the command line. 'bcompare' starts up BC and then returns immediately (bcompare -h gives command line options). 'bcomp' starts up BC and then waits for BC to finish before returning. 'bcomp' is the one that should be used as the external diff call.

    So git-diff-wrapper looks like:

    "/usr/local/bin/bcomp" "$2" "$5" | cat
    David J Scooter Software

  5. #5
    Join Date
    Feb 2013
    Posts
    16

    Default

    perfect, thanks. I assume, that will all happen from the install cli tools in the future.

  6. #6
    Join Date
    Oct 2009
    Posts
    116

    Default

    Yep. I put it in the code the same day.
    David J Scooter Software

Posting Permissions

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