Author: buildbot
Date: Mon Aug 3 20:50:35 2015
New Revision: 960680
Log:
Staging update by buildbot for openoffice
Modified:
websites/staging/openoffice/trunk/content/ (props changed)
websites/staging/openoffice/trunk/content/svn-basics.html
Propchange: websites/staging/openoffice/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Aug 3 20:50:35 2015
@@ -1 +1 @@
-1693925
+1693969
Modified: websites/staging/openoffice/trunk/content/svn-basics.html
==============================================================================
--- websites/staging/openoffice/trunk/content/svn-basics.html (original)
+++ websites/staging/openoffice/trunk/content/svn-basics.html Mon Aug 3
20:50:35 2015
@@ -379,7 +379,7 @@ described in the previous Commit Message
<h2 id="merging-changes-to-a-branch"><a id="merging_changes"></a>Merging
changes to a branch<a class="headerlink" href="#merging-changes-to-a-branch"
title="Permanent link">¶</a></h2>
<p>New development is done in the "trunk", development area, of the tree.
Stable, release branches, are specifically named and can be found
-in the [branches] (http://svn.apache.org/viewvc/openoffice/branches/) area of
the openoffice svn tree. With few exceptions you do <strong>NOT</strong> do
direct commits to the stable, release,
+in the <a
href="http://svn.apache.org/viewvc/openoffice/branches/";>branches</a> area of
the openoffice svn tree. With few exceptions you do <strong>NOT</strong> do
direct commits to the stable, release,
branches. Changes, commits, to stable branch are typically only done during a
formal release cycle and must be discussed on the "dev" list.</p>
<p>When a new release is in preparation, bug fixes are reviewed, and fixes
that have been made to "trunk" get applied to the stable, release, branch. This
is done using the "svn merge" command which finds previous changes and replays
them. SVN also keeps a record
of the specific commits that have been merged so the changes are much easier
to track down.</p>
