Announcement

Collapse
No announcement yet.

bc with git

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

  • 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
    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

    Comment


    • #3
      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.

      Comment


      • #4
        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

        Comment


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

          Comment


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

            Comment

            Working...
            X