I’m currently hacking away on Launchpad’s support for “stacked branches”, something that will really make Launchpad’s codehosting a joy to use.
At the moment, I’m writing some tests that require a user to login. This was becoming a bit cumbersome, until I remembered something: Tim has recently landed some code to make this easy. But how do I get these changes without messing up all of the work I’m doing now? bzr shelve to the rescue!
‘shelve’ interactively goes through each change you’ve made to your current working tree and allows you to decide whether to keep a change or shelve it. It comes with a twin command ‘unshelve’, which lets you interactively restore your changes.
In this case, I don’t even care about the interactivity, so here’s what I did:
# Shelve my changesbzr shelve --all# Fetch the latest trunkcd ../trunkbzr pull# Merge it into my branchcd ../stackingbzr merge ../trunkbzr ci -m "Merge in changes from trunk to get login testing improvements."# Restore my changesbzr unshelve --all
The ‘shelve’ command comes with the bzrtools plugin, and I am basically in love with it.
And now I’m off to keep working on this branch.