Code review comment for lp:~brian-murray/jockey/brian

$ bzr merge lp:~brian-murray/jockey/brian
bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified.

I pick the change manually. Seems you didn't base on Vcs-Bzr, but perhaps on the auto-imports?