Comment 22 for bug 113809

I've made use of David's Strauss's merge with a minor change:
lp:~craighewetson/bzr/update_with_local_commit

I'm using the change as I speak and it works very well. Will need people to test it and give feed back on the merge proposal.