crew repo and bookmarks

Thomas Arendsen Hein thomas at intevation.de
Thu Jun 7 04:31:48 CDT 2012


* Patrick Mézard <patrick at mezard.eu> [20120607 08:28]:
> Le 07/06/12 08:15, Bryan O'Sullivan a écrit :
> > On Wed, Jun 6, 2012 at 10:58 PM, Bryan O'Sullivan <bos at serpentine.com>wrote:
> >> OK. I'll see if my ssh key still works for crew (Thomas, na du!) and start
> >> funneling some stuff through. But anything that I consider taking I'll ack
> >> here first.

Yes, I intentionally never deleted your key. Welcome back! :)

> > At some point, there was mention of having "crew" and "crew-stable"
> > bookmarks in that repo for default and stable, which Matt would presumably
> > pull. Does anyone mind if I go ahead and add them?
> 
> What will it bring to the default/stable named branches scheme? Do you plan to push "non-pullable" changes to the crew repository?

First, putting bookmarks to some dogfooding might be nice.

I'm not sure about how the bookmarks should be named. When there are
conflicting names for bookmarks, an @repo will automatically be
added, therefore both, main and crew, could use the bookmark
'stable', resulting in stable at crew if mpm pulls or stable at main (or
stable at mpm or whatever path name is used) if a crew member pulls
from mpm.

Having a stable bookmark on the default branch will make the
currently rather obsolete hg-stable and crew-stable repositories
much more useful, because they could automatically keep the current
stable code available with a simple
hg clone http://hg.intevation.org/mercurial/crew-stable/
without any other options.

So my suggestion is simply to use "stable" as the bookmark for the
stable changes in main and in crew.

But I'm not sure how the development bookmark should be called or if
it should get a name at all. If someone clones/pulls the main or
crew repo, currently he always gets the development (default)
branch. When using two bookmarks, e.g. 'stable' and 'devel', the
default checkout could be one or the other, depending if stable was
immediately merged into devel or not. Of course one could say (or
even technically enforce) that the merge always has to happen
immediately, otherwise someone pulling might develop new features on
the stable bookmark by accident.

Maybe it is time for a new feature:
Adding a bookmark 'default' on the server will point to the
suggested changeset to checkout on clone. The local repo will pull
this bookmark and if on the next update (or pull -u) this changeset
is still checked out, it will update to the new default.

Regards,
Thomas

-- 
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Neuer Graben 17, 49074 Osnabrueck - AG Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner


More information about the Mercurial-devel mailing list