I use a variety of eclipse's for different uses, and for any backend work, my preference is Aptana, only problem with it, I feel is I think it's got a funky Git installation, which doesn't operate anything like EGit, which is common on the other versions I use.
The biggest irritation I have is comparison (with HEAD), and 'Show in history'. I've attached screenshots to show what I mean (all against the same project and file, a git tracked 'MANIFEST.in' file),
'Compare with' in Aptana:
In Android Developer Tools:
In Flash Builder:
'Team' context view in Aptana:
In the others:
I already have eGit installed,
Funky Aptana git plugin,
Any notion as to how to get rid of (what I deem to be) the funky Aptana one, and instead use the proper, more functional and standard eGit one?
Per request:
There's an option which should disable Aptana's Git in Preferences > Team > Git > Automatically attach our git support to projects added that have git repositories
Related
git log -G regexp can be used to search for differences in commits, but I cannot find how to do this operation in Eclipse. Is it possible at all?
To give an answer, I'm pretty sure there is no way to do this in Eclipse. Git has numerous subcommands and options. Eclipse uses the git interface to perform numerous tasks specific to operating on files in Eclipse. Git provides many other features that don't fit directly with an Eclipse feature.
I've looked at the answers to similar questions here, and none fit the bill, or manage to solve the issue.
Using Eclipse Neon.3 (4.6.3) with EGit 4.7.0, and no other versioning system like SVN or CVS, calling Team > Synchronize on some of my Java projects, which have been synced with a Bitbucket repo many times over, and which show absolutely no changes whatsoever in the compare editor, including any whitespace differences, Eclipse still lists several .java source files as Outgoing changes under the "Java Workspace" model.
So for instance, calling Team > Synchronize on a project in my workspace, that is tracked in my local Git repo and remotely in a Cloud hosted Bitbucket, returns the following message:
There are no more Incoming/Outgoing changes for Git Commits. However Java Workspace has changes in Incoming/Outgoing mode.
Change to Java Workspace
Show All Models
A Google search for "However Java Workspace has changes" only yields a single result:
The sole hit is a reported bug in Subversive (one of the two main SVN integrations for Eclipse). However, while the described issue sounds like a rather accurate match of the issue I'm having, it claims that doing another Team > Synchronize, or restarting Eclipse would resolve the phantom Outgoing changes. Not so in my case, not with EGit.
Like I said, the remote and local files are exactly the same, incl. their whitespace/line endings.
Fetch/Pull from origin says there are no changes, everything is up to date.
Calling Replace With > HEAD Revision also doesn't help, Eclipse keeps insisting, that my workspace has Outgoing changes. Outgoing where?
This is obviously no big issue, merely an irritating nuissance. Still would be nice to get to the bottom of it.
...Did you try doing the Eclipse dance?
Edit: I find after some time Eclipse will behave strangely (example: dumping views I have enabled, losing track of files, or behaviour similar to what you are experiencing). When this happens I usually select and delete the project from my workspace, close Eclipse, reopen it and reopen the project.
I don't know why this happens or why this works as a fix.
I have been using the built in mercurial support in NetBeans for a while now and its great. I just recently installed MercurialEclipse from http://cbes.javaforge.com/update so I can start using Mercurial for my Flex projects as well.
I can't seem to figure out how to use it.
I watched the video, when I right click files in the Package Explorer and go to tools I only have 2 or 3 options: Apply Patch, Share Project [, Show Local History]
When I click show local history, it says:
No local history for selected resource.
My project is a repository and I have made some changes since the last commit. I would like to see a diff of those changes so I can review them before committing.
Is this possible?
You need to click "Share Project" and enable Mercurial support for this project.
I would like to use two svn repositories. One is to synchronize with my production environment and the other is to synchronize with another developer. Is it possible using Subversive in Eclipse?
EDIT: Sorry! I meant SVN, not CVS
I think what you means is "For one given project, I would like to be able to synchronise on one side with the official repo and at the same time, use the synchronisation and merging facilities to stay i sync with another CVS repository".
Best of my knowledge, this is not possible from the same project. Neither with CVS nor with subversion nor with any other SCM. This is a little bit because all SCM plugins are actually plugged into the Team Management plugins of eclipse and has actually a lot to do with the fact that the relation between a dev environment and a repository is quite exclusive.
What you have to do if you want to synchronize on an exceptional basis is :
Disconnect from one repo (say CVS) (team disconnect). Do not delete the .cvs folders.
Reconnect to a second repo (say SVN - either subversive or subclipse <= my preferred one)
Synch with SVN
disconnect from SVN
reconnect with CVS (team => share).
This is too risky to be done on a regular basis.
Therefore there are other strategies
Use a "shadow project" in your workspace synchronised through a regular synchronisation tool. The master project being connected to the CVS repo and the shadow to VN.
Use git + SVN. git as your local repo backed by SVN. The other developer can use a similar approach.
All in all there are no simple "out of the box" solution. All these solutions require a significant amount of commitment to work flawlessly. But SCM has always been like this, I guess.
Subversive adds Subversion
integration for Eclipse (subversion
is a version control system similar
to CVS). It does not handle CVS
repositories!!!
To use CVS repositories with eclipse
you should use the appropriate CVS
Plugin for eclipse.
You may even use both eclipse plugins (subversive and the cvs plugin). They will work with Eclipse like a charm (but keep in mind that subversive only handles subversion repositories).
Yes its possible to use Subversive in Eclipse. I am using Subversion and CVS both through Eclipse and Tortoise. Subversion is much faster and seems to handle binary files better. The one thing to get your head around is that revision numbering is totally different between subversion and cvs. May be this can help you.
Hope this helps.
I am using svn tortoise to checkout a maven project from a repository, I then open eclispe, and use the m2eclipse plugin to import a maven project. The maven projeect comes in okay, and I can build it fine.
The problem is that eclipse using subversive, isn't marking files/ resources as being in source control (even though I seem to have all the relevant .svn directories.)
I get the same behaviour if I try and check the code in using
-> import -> check out Maven Projects from SCM. ie the project imports okay, but the files aren't linked in to teh svn repository in eclipse.
Are there any suggestions as to how I might proceed, as I find the tortoise svn checkin process pretty painful.
Did you set up your project for team sharing (right click on project->Team->Share project)? If I remember correctly that should detect the existing .svn folders an enables version control inside of eclipse.
You might wanna try using Subclipse. It's the Eclipse plug-in for Subversion and is really good. I've also found that interacting with a SVN repository with Tortoise while also having Eclipse open and accessing the same repository causes problems. You should avoid it if you can.
I would highly recommend making sure that you commit using tortoise svn as I've had particularly spotty consistency with subclipse. If you do you in/out with tortoise, and then just update with subclipse you should be fine.