I should perhaps add that I was trying to cherrypick that branch from lp:bzr into a branch from lp:bzr/2.2.
I should perhaps add that I was trying to cherrypick that branch from lp:bzr into a branch from lp:bzr/2.2.