Results 1 to 10 of 10
  1. #1
    Join Date
    Dec 2007
    Posts
    39

    Default integerate with Eclipse "egit"

    Running the Google provided Android Eclipse bundle, which bundles Eclipse, the Android ADT. It has GIT support out the box using Eclipse "egit".

    I havn't installed anything GIT related, and it all works just fine using this. The big question is, how to integrate Beyond Compare?

    Alll the instructions seem to assume that I have installed the windows GIT binary, rather than the eclipse Java based egit add-in.

    Any help would be appreciated.

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

    Default

    Hello,

    Is there a location to define an External Diff or Merge tool in either the Git or Eclipse configuration?

    We do have a plug-in our on VCS page for Eclipse; does "egit" hook into this call?
    http://www.scootersoftware.com/suppo...kb_vcs#eclipse
    Aaron P Scooter Software

  3. #3
    Join Date
    Dec 2007
    Posts
    39

    Default

    The plugin name suggests it's all centred about CVS...

  4. #4
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,680

    Default

    The plug-in is designed for CVS and SVN, but the egit support might hook into the same area when calling the internal difftool as this tool overrides.

    Did you find any documentation on egit support of external diff or merge tools? I performed a bit of searching but have not found anything yet. I would need to setup the environment in a test VM next, to see if I can find it within the program itself.
    Aaron P Scooter Software

  5. #5
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,680

    Default

    I have not gotten the full environment setup yet, but I did find in the Eclipse Preferences, under Team -> Git -> Configuration, it points to a .gitconfig file. If you make the recommended changes for Git for Windows here, does that work for you?
    Aaron P Scooter Software

  6. #6
    Join Date
    Dec 2007
    Posts
    39

    Default

    Solved the problem by ditching the truly horrendous Eclipse, and moved to the new Android Studio (based on IntelliJ).

    It's so much nicer, and doesn't need 32GB of ram and a $1000 i7 to run properly like Eclipse seems to need these days with the Android ADT.

    http://developer.android.com/sdk/installing/studio.html

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

    Default

    That's one way to solve the issue. Good timing with the Goolge I/O presentation, eh?

    If anyone else runs into this issue, please let us know if the setting I point out above does help call BC3.
    Aaron P Scooter Software

  8. #8
    Join Date
    Oct 2013
    Posts
    1

    Default

    I have a .gitconfig which brings up BC3 just fine when running git difftool from a command line. This is the same .gitconfig which is referenced in Team -> Git -> Configuration. It does not bring up Beyond Compare when selecting compare with HEAD revision in Eclipse. It still brings up the Eclipse diff tool... which is not nearly as nice. Anyway for scootersoftware to create it's own plugin?

  9. #9
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,680

    Default

    Hello,

    It is unlikely we would be able to create our own Eclipse plug-in. BeyondCVS (listed above) is not a Scooter Software product, but an open source project hosted on Sourceforge.

    It also sounds like a bug if the configuration does not allow an external diff tool. Most/many VCS solutions allow external applications (like BC3) to be used as their difftool with a simple command line.
    Aaron P Scooter Software

  10. #10
    Join Date
    Jan 2014
    Posts
    3

    Default

    Hi,
    I have found a context menu plugin called Context Quickie which works with BC4 (and presumably 3, since it is configurable).

    An eclipse add-on which extends the context menu for accessing various windows tools like Beynod Compare, Tortoise SVN or Tortoise Git.

Posting Permissions

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