Wish: clone to master bookmark und stay on bookmark on update
Sean Farley
sean at mcs.anl.gov
Mon Oct 10 18:45:56 UTC 2011
>
> I think I still don’t really understand. Do you want to hide that you added
> a
> head?
>
Basically, yes. I want to hide heads that are on bookmarks. If a head is not
bookmarked, then definitely show it (like it currently does). This, I
believe, maintains what mercurial does now, just adds some clarity for
developers that want to share bookmarks.
The note “new head” only shows up once, afterwards you have more heads in
> there pulling new changes does not change anything, so I would not see that
> as
> bad. You just need to be explicit about merging.
>
Well, that's my current problem. For more than two heads, mercurial will
force you to be explicit about which revisions to merge. But using the model
you describe below could lead to a situation where:
Developer A and Developer B work on damn-crap-does-not-work-yet.
Developer C clones, starts working, then accidentally runs 'hg merge' out of
habit, let's say.
Now we have a bad situation for A and B :-( By adding a similar 'check' (in
the same flavor as the 'hg heads' command), 'hg merge' will not, by default,
merge across bookmarks.
The main advantage of this change is that I can easily say::
>
> hg bookmark damn-crap-does-not-work-yet
> hg ci -m "debugging"
>
> and others still see master, when they get the repo, while I can remove my
> useless naming afterwards.
>
Yes, of course. I really want this too but it's difficult using the current
semantics in mercurial. Maybe this deserves another thread, but another
frustrating part of bookmarks is that if I rebase bookmark X onto bookmark
Y, *both* bookmarks are advanced forward, where I usually only wanted X to
be advanced.
> What I’d still like to have, is that they also see master, if they update
> while on revision without bookmark which has master as descendent.
>
I don't quite understand this.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20111010/61841afe/attachment-0002.html>
More information about the Mercurial
mailing list