You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by bu...@apache.org on 2012/12/14 13:54:52 UTC
svn commit: r842310 - in /websites/staging/isis/trunk: cgi-bin/ content/
content/contributors/release-branch-and-tag-names.html
Author: buildbot
Date: Fri Dec 14 12:54:52 2012
New Revision: 842310
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-branch-and-tag-names.html
Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 14 12:54:52 2012
@@ -1 +1 @@
-1421832
+1421834
Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 14 12:54:52 2012
@@ -1 +1 @@
-1421832
+1421834
Modified: websites/staging/isis/trunk/content/contributors/release-branch-and-tag-names.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-branch-and-tag-names.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-branch-and-tag-names.html Fri Dec 14 12:54:52 2012
@@ -197,10 +197,6 @@ distinguish the releasable module that t
<li>The branch name to use is not actually that important, because it would not usually be pushed to the origin (unless you were preparing the release with some other committer). However, we recommend that is similar (though not identical to) the tag name. </li>
</ul>
-<p><div class="note">
-In fact, git allows the same name to be used for both branches and for tags; within git they are namespaced to be unique. However, using the same name for the branch confuses <code>maven-release-plugin</code>; thus the branch name is slightly different from the tag name.
-</div></p>
-
<table>
<tr>
<th>Releasable module</th>
@@ -217,6 +213,10 @@ In fact, git allows the same name to be
<p>where <code>xxx</code> represents a specific component or archetype being released.</p>
+<p><div class="note">
+In fact, git allows the same name to be used for both branches and for tags; within git they are namespaced to be unique. However, using the same name for the branch confuses <code>maven-release-plugin</code>; thus the branch name is slightly different from the tag name.
+</div></p>
+
</div>