From: justin <justin@web>
Date: Tue, 9 Oct 2012 03:32:17 +0000 (-0700)
Subject: More verbose notes.
X-Git-Url: https://gitweb.dragonflybsd.org/ikiwiki.git/commitdiff_plain/d6324ea27bb7c61f4d74aeea416c2e14fb5e1c40?ds=sidebyside

More verbose notes.
---

diff --git a/docs/developer/Release/index.mdwn b/docs/developer/Release/index.mdwn
index d81c60e7..be283298 100644
--- a/docs/developer/Release/index.mdwn
+++ b/docs/developer/Release/index.mdwn
@@ -15,6 +15,22 @@ On your own system:
 
 Check out two copies of /usr/src, one with master checked out, one with the new release branch checked out.  Checkouts should be under your user id, NOT as root, or the later tagging operation will be unhappy.
 
+    mkdir master
+    cd master
+    git init
+    git remote add origin ssh://crater.dragonflybsd.org/repository/git/dragonfly.git
+    git fetch origin
+
+    cd ..
+    cp -R master x_y 
+    # x_y is the release; faster than rechecking out
+    cd master
+    git checkout master
+    cd ..
+    cd ../x_y/
+    git branch DragonFly_RELEASE_x_y origin/DragonFly_RELEASE_x_y
+    git branch DragonFly_RELEASE_x_y 
+
 On the new branch:
 
     vi sys/sys/param.h      
@@ -37,18 +53,22 @@ Edit BRANCH, use 'DEVELOPMENT', update version.
 
 ##Tagging
 
-Make sure all changes on the master branch and on the new branch have been committed and pushed before tagging anything.
+Make sure all changes on the master branch **and** on the new branch have been committed and pushed before tagging anything.
+
+    git add sys/sys/param.h sys/conf/newvers.sh
+    git commit
+    git push
 
 man git-tag for info, the committer needs GPG set up so git tag -s works.  Then you can use your own checkout.  Be sure the checkouts are under your user id and you do the tagging as yourself instead of as root.
 
 ###In master
 
-    git tag -s -m "DragonFly 2.x.x" v2.x.x
+    git tag -s -m "DragonFly x.x.0" vx.x.0
     git push --tags
 
 ###In the new branch
 
-    git tag -s -m "DragonFly 2.x.x" v2.x.x
+    git tag -s -m "DragonFly x.y.0" vx.y.0
     git push --tags
 
 Do the x.x.0 immediately.  Just before doing the final nrelease build roll a x.x.1 tag for the release branch.  Release as x.x.1.