[PATCH 1 of 3 STABLE] help: update help on bookmarks push/pull

[Matt Mackall]

On Wed, 2014-06-11 at 23:10 -0500, Kevin Bullock wrote:
> On Jun 11, 2014, at 11:03 PM, David Soria Parra <davidsp at fb.com> wrote:
> 
> > Kevin Bullock <kbullock+mercurial at ringworld.org> writes:
> > 
> >> Bookmark
> >> -    Bookmarks are pointers to certain commits that move when
> >> -    committing. They are similar to tags in that it is possible to use
> >> -    bookmark names in all places where Mercurial expects a changeset
> >> -    ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along
> >> -    when you make a commit.
> >> +    Bookmarks are lightweight pointers to commits. They are similar to
> >> +    tags in that it is possible to use bookmark names in all places
> >> +    where Mercurial expects a changeset ID, e.g., with
> >> +    :hg:`update`. Unlike tags, bookmarks move along when you make a
> >> +    commit.
> > I actually think the tag comparision should be removed as it is
> > confusing. It should say: "Bookmark names can used in all places where
> > Mercurial expects a changset". The current form of LIKE X except for
> > a,b,c also leads to people expecting behaviours which might not exist.
> 
> I agree, and I thought about including that change. At this point I could just as easily do a follow-up patch.
> 
> I'll wait a day or two to see if anyone wants to bikeshed further, then crew these.

Doh. With my large backlog, I wasn't aware this was on the list, and
more or less rewrote the help last week by putting it on Titanpad for
some collaborative editing:

http://www.selenic.com/hg/rev/0c6cdbb697d9

Feel free to bikeshed my version by follow-up patch.

-- 
Mathematics is the supreme nostalgia of our time.