[00:01] <LeoNerd> Meh.. shelve's Edit manually is all well and good but I've never managed to unshelve it without it leaving two levels of conflict markers in my file... :/
[18:58] <mightyiam> hi. i moved a whole bzr controlled directory and now when i do 'pull' i get 'error: not a branch'