Hi all,
My apologies for the noise, however, Rich Lowe has pointed out on
#caiman-discuss that unfortunately hg recommit does not play well with
branches. Please hold off on slim_source pushes until a workaround or
alternative is put into place.
Thank you,
Clay
On Tue, 2 Feb 2010, Clay Baenziger wrote:
> Hi all,
> To help those working on fixes for the next release of OpenSolaris, a
> new branch has been formed for the on-going 0SOL 1003 work. The two branches
> of slim_source are now slim_1003 for the 1003 release, and default for
> on-going development.
>
> Policy of what to do for a bugfix or new feature:
> ------------------------------------------------
> *If you are working a 1003 bug (blocker bug), you will have to merge and
> push to both branches, default and the 1003 branch (slim_1003). Please
> ensure you use the same commit string for each push
>
> *If you're working a bug not for 1003 or pushing a new feature, then
> you will merge and push to slim_source as before (into the default branch).
>
> Mechanics of what to do for a push:
> ----------------------------------
> *To work in the new branch, pull slim_source as before:
> hg clone ssh://anon at hg.opensolaris.org/hg/caiman/slim_source
>
> *To update your working view to use the slim_1003 branch run:
> hg update -C slim_1003 (this will overwrite any changes in your
> Mercurial workspace, so beware)
>
> *To see which branch you are working in run:
> [0] clayb at xsplat:hg branch
> slim_1003
>
> *The branch of changes will show up in hg log and hg tip:
> [0] clayb at xsplat:hg tip
> changeset: 710:9ff1a0d6d32b
> branch: slim_1003
> tag: tip
> user: Clay Baenziger <ClayB at OpenSolaris.ORG>
> date: Tue Feb 02 17:59:21 2010 -0700
> description:
> Branched slim_1003 for OpenSolaris 1003 release
>
> *To work in slim_source use Mercurial as before in the default branch
> [0] clayb at xsplat:hg branch
> default
>
> Where to find build status:
> --------------------------
> Internal Developers May Use:
> *Nightly builds of slim_1003 will be available, done by cron, the same as
> for slim_source and will have a dashboard at:
> http://indiana-build.central/release_slim_status.html
>
> External Developers May Use:
> *Push by push builds of slim_1003 will be available, done by Hudson, the
> same as for slim_source and will have a dashboard at:
> http://hudson.opensolaris.org/job/slim-1003-build
>
> Please direct questions or concerns to Clay, Keith and Ginnie and CC
> caiman-discuss as appropriate to help others learn too.
> Thank you,
> Clay
>
