Author: britter
Date: Tue Mar 3 17:27:23 2015
New Revision: 1663751
URL: http://svn.apache.org/r1663751
Log:
Split up explanation about the role of release branches in svn and git
Modified:
commons/cms-site/trunk/content/xdoc/releases/prepare.xml
Modified: commons/cms-site/trunk/content/xdoc/releases/prepare.xml
URL:
http://svn.apache.org/viewvc/commons/cms-site/trunk/content/xdoc/releases/prepare.xml?rev=1663751&r1=1663750&r2=1663751&view=diff
==============================================================================
--- commons/cms-site/trunk/content/xdoc/releases/prepare.xml (original)
+++ commons/cms-site/trunk/content/xdoc/releases/prepare.xml Tue Mar 3
17:27:23 2015
@@ -108,6 +108,11 @@
<p>
<strong>Creating a release branch with SVN</strong>
</p>
+ <p>
+ The description below assumes a release is being prepared using the code
in trunk for SVN based components.
+ The process is nearly identical when preparing from a release branch:
only the directory in which the work is
+ performed is different.
+ </p>
<pre>
cd to the project's base directory in your subversion working copy.
svn update trunk
@@ -133,14 +138,12 @@
<p>
<strong>Creating a release branch with git</strong>
</p>
+ <p>
+ All git specific commands in the description below assume that you're on
the release branch.
+ </p>
<pre>
git checkout -b release
</pre>
- <p>
- The description below assumes a release is being prepared using the code
in trunk for SVN based components.
- The process is nearly identical when preparing from a release branch:
only the directory in which the work is
- performed is different. All git specific commands assume that you're on
the release branch.
- </p>
</subsection>
<subsection name='Check Compatibility'>
<p>
