Bookmarks: don't push local bookmark heads by default?

Kevin Bullock kbullock+mercurial at ringworld.org
Fri Jun 8 11:15:17 CDT 2012


On Jun 8, 2012, at 10:05 AM, Pierre-Yves David wrote:

> I "regularly" use bookmark to add "local label" to commit. This label -may-
>  something ends on head and I will be confused and annoyed it if magically
>  -stop- pushing change because I **finally moved** the 'test-on-sulfur' on a head.

I agree, we should preserve the local-only usage of bookmarks while smoothing out the sharing experience. But I think your full proposal for local vs. remote is unnecessarily complex.

> […]
> A lower version of this is to just warn when this happen
> 
>  $ hg push
>  warning: pushed heads b4b49c313571 without it bookmark "elephants" unknown remotely
>  (use "hg push -B elephant" to push it)

This seems perfectly reasonable to me, and better than just not pushing bookmarked heads.

Here's my quick proposal for bookmark push behavior only. I'm formulating a more complete, coherent bookmark plan that I will post soon.

1. hg push -r BOOKMARK

Push BOOKMARK along with the changesets, without requiring -B.

2. hg push -B BOOKMARK

As currently, i.e.: push all changesets, as well as the named bookmark.

3. hg push

Push all changesets, warn if bookmarks weren't pushed. Tell users to rely on phases to keep *changesets* local.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock



More information about the Mercurial-devel mailing list