From 21111be08937ade484d8bf68630017052e9a2a14 Mon Sep 17 00:00:00 2001 From: luxh Date: Fri, 4 Mar 2011 08:06:08 -0800 Subject: [PATCH] Clearify how to add new branches and when it's needed. --- docs/howtos/HowToPkgsrc.mdwn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/howtos/HowToPkgsrc.mdwn b/docs/howtos/HowToPkgsrc.mdwn index 99d6e23d..01b65199 100644 --- a/docs/howtos/HowToPkgsrc.mdwn +++ b/docs/howtos/HowToPkgsrc.mdwn @@ -79,30 +79,30 @@ to fetch the intial pkgsrc repository from the net, or to update. -Edit /usr/Makefile to select a different download location, if desired. +Edit GITHOST /usr/Makefile to select a different download location, if desired. -This downloads the absolute most recent version of pkgsrc. In a production environment, you may want a more stable release. Check the section below for more details. +This downloads the latest stable version of pkgsrc. -### Tracking the stable branch +### Tracking the stable branch -There are quarterly releases of pkgsrc that are specifically designed for stability. You should in general follow the latest branch, rather than bleeding edge pkgsrc. +There are quarterly releases of pkgsrc that are specifically designed for stability. You should in general follow these, rather than bleeding edge pkgsrc. When a new branch is out you need to set up a local branch tracking that one. make pkgsrc-update will not do this for you. -To see the available branches: +To see the available remote branches: cd /usr/pkgsrc git branch -r -To switch to a recent branch: +To create a local branch, tracking the remote quarterly release: cd /usr/pkgsrc - git branch pkgsrc-2010Q3 origin/pkgsrc-2010Q3 + git branch pkgsrc-2010Q4 origin/pkgsrc-2010Q4 Branch naming format is 'pkgsrc-YYYYQX', where YYYY is the year and QX is quarters 1-4 of the year. Check [pkgsrc.org](http://www.pkgsrc.org/) to see the name of the most recently released branch. -After switching to a new branch, it can be downloaded with: +After adding a new branch, it can be downloaded with: cd /usr/pkgsrc - git checkout vendor + git checkout pkgsrc-2010Q4 git pull ## Dealing with pkgsrc packages -- 2.41.0