remote-bzr: fixes for branch diverge