Re: New @ bookmark on Savannah repo

[Jordi Gutiérrez Hermoso]

On 26 July 2013 18:17, Mike Miller <address@hidden> wrote:
> On Fri, Jul 26, 2013 at 16:39:14 -0400, Jordi Gutiérrez Hermoso wrote:
>> I have just pushed to Savannah a new bookmark called "@".
[snip]
>
> If using hg >= 2.4, does @ also get pushed automatically or would I
> have to "hg push -B @"?

Once the bookmark is both here and there, it gets pushed and pulled
automatically. The only thing that isn't automatic since is pushing
your own bookmarks. In 2.2 and earlier, you also had to manually pull
bookmarks.

> Needless to say I should keep my own bookmarks out of the main
> Octave repository, but is it in general good practice to push and
> delete bookmarks as needed to my own public clone, or should I keep
> them to my own working copy only?

It's up to you. If there's a public clone of yours with your
bookmarks, obviously (?) then any bookmarks on it are particular to
you, so anyone who pulls from your clone would be aware of that. You
might want to name your bookmarks in some fashion that makes it clear
that they're yours. As far as I can tell, any character is valid in a
bookmark name, so can use git-like names like "mike/feature1" or even
"Mike's new Octave feature!!!"[1]

The following also has a nice explanation about what happens when
bookmarks diverge, e.g. you advance @ on your local clone, but in the
meantime someone also does this and you pull that other @ bookmark:

     http://mercurial.aragost.com/kick-start/en/bookmarks/#divergent-bookmarks

Basically, divergent bookmarks get @[some-location-or-number] added to
them when they diverge, and that @-tail gets chopped off when you
merge them.

- Jordi G. H.

[1] P.S. Just read the source code:

    
http://hg.intevation.org/mercurial/crew/file/8b190adb7ee3/mercurial/scmutil.py#l48

So there you go, name your bookmarks whatever you want other than those
four characters.