BibSonomy now supports HTTPS. Switch to HTTPS
svn update svn merge -r 150:140 . svn commit -m "Rolled back to r140"
With Subversion 1.5 or later the merge is recorded on your local working copy in the svn:mergeinfo property. So this information is not lost.
You can see the merged revisions if you use svn log -g
svn propset svn:ignore "*.jpg" .