[PATCH 2 of 2 RESEND] bookmarks: suggest 'push -B FOO' when a potentially new remote head has a local bookmark

[Matt Mackall]

On Mon, 2013-11-11 at 21:53 +1100, Stephen Lee wrote:
> # HG changeset patch
> # User Stephen Lee <sphen.lee at gmail.com>
> # Date 1384165016 -39600
> #      Mon Nov 11 21:16:56 2013 +1100
> # Node ID fdb1232d9c82b0d6d9c10bb47c2e7bfb7b9be7c6
> # Parent  59a82b3476c080cf969711190e2afdc6f79432db
> bookmarks: suggest 'push -B FOO' when a potentially new remote head has a local bookmark

This one's a little worrisome. There's a non-trivial fraction of users
who look like this:

http://bit.ly/1kqMrE6

> +  abort: push creates new remote head c922c0139ca0 with bookmark 'Y'
> +  (use push -B Y to push this bookmark)

..and will immediately type that command without trying to understand
why what they just did might even be considered an error. We have lots
of experience with people blindly using --force this way when we used to
suggest it.

This will be especially awesome in places where bookmarks and multiple
heads on the server are not part of the corporate workflow but $USER
found instructions that told them to use bookmarks on StackOverflow.

Then we have their admins showing up on IRC asking how to fix the
resulting mess and I will direct them to their nearest retailer of 2x4s.

However, I -do- like the part where you report the bookmark on the new
head. Please send that as a patch on its own, please.

-- 
Mathematics is the supreme nostalgia of our time.