New IntelliJ IDEA 11.1 EAP build (116.32) is available with Subversion 1.7 support finally built in. Here are some details on the current implementation.
We don’t perform automatic upgrade of your working copies to version 1.7, you can easily do it manually (Changes | Subversion Working Copies | Change).
We’ve received a number of questions related to the support for Subversion 1.7 in IntelliJ IDEA 11 and related IDEs. With this post, we’d like to provide an update regarding the current status of the support and our future plans.
As you may know, IntelliJ IDEA relies on the SVNKit library for its Subversion support. Subversion 1.7 is a huge release in terms of the internal changes, and although the SVNKit team started work on it a long time ago, this work is unfortunately not yet finished.
We’ve been working closely with the SVNKit team and providing them feedback regarding the open issues that need to be resolved before we can fully rely on the new SVNKit in our integration. We’ve also included an experimental SVN 1.7 plugin in one of the beta releases of IntelliJ IDEA 11. However, due to major performance problems discovered during our testing, we’ve had to remove the plugin from the final release. Therefore, IntelliJ IDEA 11 and other IDEs based on the same version of the platform (PhpStorm/WebStorm 3.0, PyCharm 2.0) do not support Subversion 1.7.
However, we’re confident that the remaining open issues are going to be resolved in the coming months, and we plan to include full Subversion 1.7 support in the forthcoming IntelliJ IDEA 11.1 update, planned for release in late Q1/early Q2 2012. The Early Access Preview testing for IntelliJ IDEA 11.1 will begin early next year. Updates for PyCharm and PhpStorm/WebStorm will also be released around that time.
If you can’t wait for the IntelliJ IDEA 11.1 EAP to begin, you can build the plugin from source today. In our GitHub repo, the svn4idea plugin is the new plugin updated for SVN 1.7 compatibility and bundling the new SVNKit, and svn4ideaOld is the plugin currently shipped with IntelliJ IDEA 11.
Note that if your main reason for upgrading to SVN 1.7 is better update performance, you can achieve this with the exising IntelliJ IDEA integration and older SVN versions. In order to do that, please enable the “Update administrative information only in changed subtrees” option under Settings | Version Control | Subversion.
Also note that we do not currently plan to release SVN 1.7 compatible updates for IntelliJ IDEA 10.5 or older releases.
There’s been a number of new things we’ve added in IntelliJ IDEA 10.5 related to version control support. You can try them already in a latest EAP build. And here’s a quick overview.
Now you can easily ensure you haven’t forgotten to implement a method, and double-check the important places in your code before commit. Just mark those places in code with TODO.
IntelliJ IDEA’s new “Check TODO” before commit inspection will notify about all new and edited TODO items.
It will also confirm about TODO items in the changed fragments (in case they are not actual any more).
You can use TODO filter with this inspection — if you want to pay attention only to TODO items of a special kind.
You can further review TODO items in the changed lines:
You can now import a patch into shelf.
It is quite useful when you review someone’s code and use patches for communication.
Later, you can unshelve it using the new detailed Unshelve… action, which opens a dialog similar to ‘Apply Patch’ and allows setting any bases for the patch parts (in case some files or directories had moved since then).
You can also import patches directly from the Apply Patch dialog.
GNOME Keyring support has been implemented by svnkit, so you can use it in IntelliJ IDEA now.
As svnkit folks say, it is in experimental phase, and a special JVM key should be used to enable it. So, please read the details.
This is it for now. Let us know what you think.
And make sure you are using the latest IntelliJ IDEA 10.5 EAP build when you get to try these and other new features.
The summer is hot not only because of the sun. Today we have even 3 breaking news to share:
1. IntelliJ IDEA 9.0.3 is available with fixes for many reported issues and some improvements, namely:
BTW, if you’re doing Flex, make sure to watch the IntelliJ IDEA screencasts by John Lindquist, about the debugger, refactorings and other stuff IntelliJ IDEA provides for Flex.
2. TeamCity 5.1.3 is out with some compatibility and stability fixes.
3. And the last big piece of news for today is PyCharm Beta release. JetBrains PyCharm is the new lightweight IDE for Python with the best available support for Django and Google App Engine. During the Beta we are giving away 50% discount coupons for PyCharm 1.0. So, check it out!
Needless to say, we are still going to continue to develop and release the Python plugin for IntelliJ IDEA, which will remain free for all users of IntelliJ IDEA Ultimate.
Develop with pleasure!
-The JetBrains Team
Feature branches have simple life cycle, they usually consume trunk changes and are merged back into trunk after the work is completed.
In IntelliJ IDEA 9.0.3 EAP, take all trunk changes into feature branch and reintegrate back into trunk using new “Merge from…” action:
You can merge all changes in one shot or select a subset of them. Changelist with merged changes is created and offered for commit.
Maia supports Subversion 1.6 using svnkit 1.3.0. Tree conflicts are detected.
You can mark tree conflicts as resolved.
Tweets about IntelliJ IDEA
