Neat!
Posts Tagged ‘linkedin’
iCode iPhone Programming Blog
December 23rd, 2008SVN: Handling merging of multiple branches up and down from trunk
December 17th, 2008I’ve been away from code and SVN branch merges a little recently so I forgot the exact process of handling multiple branches merging up and down from trunk.
After a little thought and partially effective googling, i found that the following is an efficient process:
Introduction – What I had
- trunk
- branch_a created at SVN revision 2111
- branch_b created at SVN revision 2113
Step 1 – Preparation – Checkout local copies of trunk, branch_a, and branch_b
- cd ~/
- svn co http://svn_repository/trunk ./trunk
- svn co http://svn_repository/branches/branch_a ./branch_a
- svn co http://svn_repository/branches/branch_b ./branch_b
- I ensured that all changes had been committed to trunk and both branches
Step 2 – Merging branch_a back to trunk after a successful rollout
- cd ~/trunk
- svn merge http://svn_repository/trunk http://svn_repository/branches/branch_a
- svn commit -m “merged branch_a into trunk”
Step 3 – Merging the newly updated trunk into branch_b
- cd ~/branch_b
- svn merge http://svn_repository/trunk -r2113:HEAD .
- svn commit -m “merged up from trunk, applying changes between 2113:HEAD that included changes made on branch_a”
Step 4 – When i’m ready, i’ll merge branch_b back into trunk, following Step 2 above
That’s it!
Now we’re rocking! DSL story driven development and testing in Java!
December 9th, 2008At TechnoPhobia, we have an interesting challenge to implement a technology agnostic requirements capture process that (in my mind) will enable us, with very minimal effort, to repurpose these documented requirements into fully automated browser tests. I’m thinking that the process could look something like this:
- The project and client team write end-user functional requirements as User Stories and Scenarios
- The stories are stored as plain text in SVN or GIT and made immediately available to the development and test teams
- The development and test teams create a few executable padder files, wrapped around these stories, turning them into fully automatable browser tests
- The executable files are run, they read the stories and interact with the browser to determine if the stories successfully pass
Pretty cool, huh! No more massive team specific documents, just good old plain textual stories that are shared by all on the project, including the client.
Making this happen across multiple technologies
- In Ruby, we’ve already used this parts of this approach on a live project using Cucumber (formally RSpec story runner). It worked pretty well.
- In Java, easyb seems to be the a good forward. Here’s a little more about using easyb
I am WAY TOO EXCITED to see an implementation in Java! This opens massive opportunity to progress with a technology agnostic approach. Now to find a suitable solution for .Net and perhaps PHP
Omnifocus – getting more beautiful by the day
December 2nd, 2008I have many notes on my use of OmniFocus on mac and iPhone to GTD but none quite ready to post. But, if you your’re not Getting Things Done or are on a mac and are not using OmniFocus, perhaps you should! It’s lovely!
Merb & Adobe Air File Uploader – Nice!
October 29th, 2008Whilst writing an Adobe Lightroom plugin to upload library items to a rails app, i spotted something i definitely need to play with! Adobe Air and Merb file uploader. Looks rather handy!
