Message when pushing to a diverged branch is less helpful than it could be

[James Westby]

bug 269477 deals with a slightly different issue with this message,
fixing them both at once may be a good idea.

When you try and push to a diverged branch you get

  ERROR: These branches have diverged. Try using "merge" and then "push".

so you "bzr merge" and it will probably merge a completely different branch.

If it included the location you were pushing to there would be no confusion
over what it was suggesting that you do.

(A help topic on diverged branches may be a good idea, we could then
point to it from the error message)

Thanks,

James