At work, we just upgraded to subversion 1.6.3 from 1.4.x and it took us a 1-2 days to solve configuration issues. In order to make our life easier during merges, we decided to go for Aptana Studio. Unfortunately, at the time of this writing, this IDE is bundled with Subclipse 1.4.

Follow these manual steps to upgrade to http://subclipse.tigris.org/update_1.6.x

1. Remove Aptana Subversion Support

1. Go to About Apanta Studio
   • In your Aptana Studio
     • On Windows, go to Help and select About Aptana Studio
     • On Mac, go to Aptana Studio and select About Aptana Studio
   • In you Eclipse
     • On Windows, go to Help and select About Eclipse SDK
     • On Mac, go to Eclipse and select About Eclipse SDK
2. Select "Installation Details"
3. Select the" Installed Software" Tab
4. Select the plugins you would like to install and click "Uninstall".

2. Install subclipse 1.6.x

1. From the Help menu, select Install new Software ...
2. Select Available Software.
3. Click the Add Site... button.
4. In the Location text box, type http://subclipse.tigris.org/update_1.6.x
5. Also add mylyn: http://download.eclipse.org/tools/mylyn/update/e3.4
   

3. Install Aptana RadRails

If you ever have this error message when running
svn status
! C stories
> local delete, incoming edit upon update

=> Clean it with reverting the conflicted folder with:

svn revert stories

In the subversion configuration file ~/.subversion/config , you can set some global-ignores to a set of whitespace-delimited globs which Subversion will ignore in its 'status' output, and while importing or adding files and directories.

Mine was:
global-ignores = ._* *.log *.html-gzip-* ruby_sess.* *.rej .DS_Store schema.rb

It happens that the Rails framework has a file called vendor/rails/activerecord/lib/active_record/schema.rb ...

OOOPS! This file was not committed which broke the script/console ...

Better removing 'schema.rb' from my global-ignores!

Also worth checking the /etc/subversion/config file

I am using netbeans as an IDE for my work. This is a great IDE but sometimes a bit limited when dealing with subversion commands. I always ask a colleague of mine, Marco , who types faster than his shadow and knows everything about command lines some help about svn. In this post, I will compile what I have learned.

How to remove all svn properties from a folder

svn propdel svn:ignore tasks/
property 'svn:ignore' deleted from 'tasks'.
jeanmichel@21x100:~/ruby/projects/linqia/linqia_portal/lib$ svn status
M .
M tasks
? solr_reindexing/rspec_bcn_on_rails.rb
jeanmichel@21x100:~/ruby/projects/myproject/lib$ svn commit tasks -m "Should remove the weird properties on tasks folder"
Sending tasks
Committed revision 2208.

How to generate a diff between 2 versions

go to the folder where trunk / branch / tag is

svn diff -r 2114:2167 > text_file.diff

Merging

svn merge --dry-run svn://svn.linqia.com/lalala/production@2354 svn://svn.linqia.com/klikee-website/lalala/production@2355
Skipped missing target: 'script/sql/import/update_user_languages.sql'
U lib/tasks/import_communities.rake
jeanmichel@21x100:~/ruby/projects/linqia/linqia_portal$ svn merge svn://svn.linqia.com/klikee-website/klikee/branches/production-v-1.1-08-04-2008@2354 svn://svn.linqia.com/klikee-website/klikee/branches/production-v-1.1-08-04-2008@2355
Skipped missing target: 'script/sql/import/update_user_languages.sql'
U lib/tasks/import_communities.rake