svn commit: r842197 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/contributors/release-process.html

[bu...@apache.org]

Author: buildbot
Date: Thu Dec 13 21:14:24 2012
New Revision: 842197

Log:
Staging update by buildbot for isis

Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/contributors/release-process.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Dec 13 21:14:24 2012
@@ -1 +1 @@
-1421522
+1421539

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Dec 13 21:14:24 2012
@@ -1 +1 @@
-1421522
+1421539

Modified: websites/staging/isis/trunk/content/contributors/release-process.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-process.html Thu Dec 13 21:14:24 2012
@@ -285,7 +285,7 @@ git pull --ff-only
 <p>Then, create a release branch in your local Git repo, as per <a href="release-branch-and-tag-names.html">these standards</a>.  For example, to prepare a release of <code>core</code>, use:</p>
 
 <pre>
-git checkout -b prepare/isis-core/x.y.z
+git checkout -b prepare/core/x.y.z
 </pre>
 
 <p>All release preparation is done locally; if we are successful, this branch will be pushed back to master.</p>
@@ -767,12 +767,16 @@ Unfortunately, Nexus does not seem to al
 
 <h3>Push changes</h3>
 
-<p>Finally, push your local branch to a new, similarly named branch on the central origin server:</p>
+<p>Finally, push the tag that was created locally to the central origin server, for example:</p>
 
 <pre>
-git push -u origin release/x.y.z
+git push origin tag release/core/x.y.z
 </pre>
 
+<p><div class="note">
+The remote tag isn't visible locally (eg via <code>gitk --all</code>), but can be seen <a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=summary">online</a>
+</div></p>
+
 <h2>Voting</h2>
 
 <p>Once the artifacts have been uploaded, you can call a vote.</p>
@@ -841,19 +845,27 @@ The vote is SUCCESSFUL.
 <p>If the vote has been unsuccessful, then:</p>
 
 <ul>
-<li>delete your local branch</li>
+<li>delete your local branch, for example:</li>
+</ul>
+
+<pre>
+  git branch -D prepare/core/x.y.z
+</pre>
+
+<ul>
+<li>delete the tag that was created locally, for example:</li>
 </ul>
 
 <pre>
-  git branch -D release/x.y.z
+  git tag -d release/core/x.y.z
 </pre>
 
 <ul>
-<li>delete the remote origin server's branch</li>
+<li>delete the remote origin server's tag, for example:</li>
 </ul>
 
 <pre>
-  git push origin --delete release/x.y.z
+  git push origin --delete tag release/core/x.y.z
 </pre>
 
 <ul>
@@ -1001,11 +1013,12 @@ Enjoy!
 <p>Because we release from a branch, the changes made in the branch (changes to <code>pom.xml</code> made by the <code>maven-release-plugin</code>, or any manual edits) should be merged back from the release branch back into the <code>master</code> branch:</p>
 
 <pre>
-git checkout master         # update master with latest
+git checkout master                # update master with latest
 git pull
-git checkout release/x.y.z  # apply release commits onto master
+git checkout prepare/core/x.y.z    # apply branch commits onto master
 git rebase master
 git checkout master
+git branch -D prepare/core/x.y.z   # branch no longer needed
 </pre>
 
 <p>Next, do a sanity check that everything builds ok:</p>
@@ -1015,7 +1028,7 @@ rm -rf ~/.m2/org/apache/isis
 mvn clean install
 </pre>
 
-<p>Finally, and run up an Isis application</p>
+<p>... and run up an Isis application.</p>
 
 <h3>Update <code>STATUS</code> file</h3>