Posts Tagged ‘Computers’

Recovering lost IntelliJ IDEA shelved changesets

Monday, July 27th, 2009

Imagine the following scenario:

  • You are moving your beloved project out from a subdirectory of an svn repository, into it’s own brand spanking new repository.
  • You have about 3 days worth of large refactorings to the codebase waiting in the wings, with most of the tests passing, but not quite ready for commit to the trunk
  • You use IDEA’s shelve feature to put those changes into safe keeping, so you can make changes and commits to the repository in preparation for the move
  • You manage to successfully migrate the svn repository across, managing to keep all the history (yay)
  • You then open the new (and renamed) project in IDEA, and all of your shelved changes are gone

Gulp.

Luckily, IDEA never deletes any of the shelved changesets, and conveniently stores them in unified .diff format in $USERDIR$\.IntelliJIdea80\config\shelf

Also, conveniently, there’s the ‘Version Control -> Apply Patch’ menu item, so you don’t have to worry about mucking about with the *nix patch command line tool.

Day saved. Hurrah!

** Perhaps this sort of thing is a good argument for using a Distributed VCS system, like git or mercurial or monotone et al. You would normally be doing lots of small commits to your local repository, without necessarily worrying about breaking trunk for everybody, and your changes stay safe

New Job!

Saturday, November 24th, 2007

Looks like I have a new job in Melbourne! I start on the 2nd of January at Stock Software.. They are a small contracting / consultancy type place, and it sounds like I’ll be working on some cool J2EE stuff as well as some Ruby on Rails, which I should have some fun learning. Windows based desktops though.. I might end up having to use…… Vista.. Ergh.

I should be heading over just after Christmas, so there’s a little bit of time for me to get myself all packed and organised. I’ll probably typically leave everything until the last minute :)

Got a new Nokia N95, mainly for the GPS feature so I don’t get too lost… Oh how I do like the new toys :)

Going to see Muse tomorrow night, that should be awesome.

Nasty haxors

Tuesday, July 17th, 2007

Well it seems I’m back on the air after some nasty haxors (probably script kiddies) managed to root the box :( Prime suspect #1 is somebody’s insecure PHP code (not mine, of course ;) ). It’s times like this that really cements my recently found hatred for PHP. I’m thinking if I need to do any new sites that aren’t big enough to warrant Java, then I’ll have to look into something else. Python? Ruby? Hmm, there’s always too much new stuff to learn in this line of business….

On interweb trends

Thursday, June 7th, 2007

It seems that not only do I have a blog now, but I find myself being increasingly suck(er)ed into these social networking sites. I now find I have a bebo, am on oldfriends.co.nz a dreaded myspace, and now also a facebook.

So far, facebook has the least offensive user interface.  So much time-wasting, but it seems like good distraction from the JAAS security problems I’m having with JBoss right now :)

Different way of teaching programming

Wednesday, May 16th, 2007

I saw this link on Digg, and was immediately interested. I have a friend, who is bright enough, but has never really been able to ‘get’ programming. This is because she learns in a aural/kinetic way, which is pretty much the exact opposite of the way programming is traditionally taught.

read more