[Bf-docboard-svn] bf-manual: [7677] branches/blender-2.92-release/blender_docs/manual/about/contribute/release_cycle.rst: Add documentation on working with branches
Aaron Carlisle
noreply at blender.org
Tue Jan 26 04:31:24 CET 2021
Revision: 7677
https://developer.blender.org/rBM7677
Author: Blendify
Date: 2021-01-26 04:31:24 +0100 (Tue, 26 Jan 2021)
Log Message:
-----------
Add documentation on working with branches
Modified Paths:
--------------
branches/blender-2.92-release/blender_docs/manual/about/contribute/release_cycle.rst
Modified: branches/blender-2.92-release/blender_docs/manual/about/contribute/release_cycle.rst
===================================================================
--- branches/blender-2.92-release/blender_docs/manual/about/contribute/release_cycle.rst 2021-01-26 03:11:43 UTC (rev 7676)
+++ branches/blender-2.92-release/blender_docs/manual/about/contribute/release_cycle.rst 2021-01-26 03:31:24 UTC (rev 7677)
@@ -23,6 +23,30 @@
giving 2 months to add documentation for new features of the next release, and another month to make improvements.
+.. highlight:: sh
+
+Switching Branches
+------------------
+
+To switch to the release branch use::
+
+ svn switch https://svn.blender.org/svnroot/bf-manual/branches/blender-{VERSION}-release/
+
+To switch back to the development branch use::
+
+ svn switch https://svn.blender.org/svnroot/bf-manual/trunk/blender_docs/
+
+
+Updating Branches
+-----------------
+
+To merge changes from the release branch to the development branch,
+first switch to the development branch and use::
+
+ svn merge https://svn.blender.org/svnroot/bf-manual/branches/blender-{VERSION}-release/
+ svn ci -m "Merge branch 'blender-{VERSION}-release'"
+
+
Bcon Phases
===========
More information about the Bf-docboard-svn
mailing list