Author: buildbot Date: Mon Aug 3 16:03:26 2015 New Revision: 960659 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 16:03:26 2015 @@ -1 +1 @@ -1691777 +1693925 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 16:03:26 2015 @@ -49,7 +49,18 @@ <div id="clear"></div> <div id="sidenav"> - <h1 id="general">General</h1> + <style type="text/css"> +/* The following code is added by mdx_elementid.py + It was originally lifted from http://subversion.apache.org/style/site.css */ +/* + * Hide class="elementid-permalink", except when an enclosing heading + * has the :hover property. + */ +.headerlink, .elementid-permalink { + visibility: hidden; +} +h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style> +<h1 id="general">General<a class="headerlink" href="#general" title="Permanent link">¶</a></h1> <ul> <li><a href="/index.html">About</a></li> <li><a href="/downloads.html">Downloads</a></li> @@ -58,7 +69,7 @@ <li><a href="/press.html">Press</a></li> <li><a href="http://www.openoffice.org/">OpenOffice.org website</a></li> </ul> -<h1 id="community">Community</h1> +<h1 id="community">Community<a class="headerlink" href="#community" title="Permanent link">¶</a></h1> <ul> <li><a href="/get-involved.html">Get Involved</a></li> <li><a href="/orientation/index.html">Orientation</a></li> @@ -71,7 +82,7 @@ <li><a href="/people.html">People</a></li> <li><a href="/community-faqs.html">Community FAQs</a></li> </ul> -<h1 id="development">Development</h1> +<h1 id="development">Development<a class="headerlink" href="#development" title="Permanent link">¶</a></h1> <ul> <li><a href="/source.html">Source Code</a></li> <li><a href="/bug-tracking.html">Bug Tracking</a></li> @@ -82,12 +93,12 @@ <li><a href="/contributing-code.html">Contributing Code</a> </li> <li><a href="/developer-faqs.html">Developer FAQs</a></li> </ul> -<h1 id="project-management-pmc">Project Management PMC</h1> +<h1 id="project-management-pmc">Project Management PMC<a class="headerlink" href="#project-management-pmc" title="Permanent link">¶</a></h1> <ul> <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li> <li><a href="/pmc-faqs.html">PMC FAQs</a> </li> </ul> -<h1 id="the-apache-software-foundation">The Apache Software Foundation</h1> +<h1 id="the-apache-software-foundation">The Apache Software Foundation<a class="headerlink" href="#the-apache-software-foundation" title="Permanent link">¶</a></h1> <ul> <li><a href="http://www.apache.org/">Website</a></li> <li><a href="http://www.openoffice.org/donations.html">Donations</a></li> @@ -98,7 +109,18 @@ <div id="contenta"> <h1 class="title">Subversion Basics</h1> - <p>We use <a href="http://subversion.apache.org">Apache Subversion</a> for version control. For a complete reference on Subversion see the <a href="http://svnbook.red-bean.com">Subversion Book</a>. You can <a href="http://svn.apache.org/viewvc/openoffice/trunk">browse our repository</a> in your web browser.</p> + <style type="text/css"> +/* The following code is added by mdx_elementid.py + It was originally lifted from http://subversion.apache.org/style/site.css */ +/* + * Hide class="elementid-permalink", except when an enclosing heading + * has the :hover property. + */ +.headerlink, .elementid-permalink { + visibility: hidden; +} +h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style> +<p>We use <a href="http://subversion.apache.org">Apache Subversion</a> for version control. For a complete reference on Subversion see the <a href="http://svnbook.red-bean.com">Subversion Book</a>. You can <a href="http://svn.apache.org/viewvc/openoffice/trunk">browse our repository</a> in your web browser.</p> <p>This page gives instructions on performing basic development tasks using the Subversion Command-Line Client. This instruction assumes you have Apache Subversion installed.</p> <ul> <li><a href="#overview">Overview</a> </li> @@ -114,10 +136,10 @@ <li><a href="#merging_changes">Merging changes to a branch</a></li> <li><a href="#further_information">Further Information</a></li> </ul> -<h2 id="wzxhzdk26wzxhzdk27overview"><a id="overview"></a>Overview</h2> +<h2 id="overview"><a id="overview"></a>Overview<a class="headerlink" href="#overview" title="Permanent link">¶</a></h2> <p>You begin using Subversion by copying a directory from a remote repository to a local directory on your file system. This is known as a checkout of a working copy.</p> <p>Subversion uses a copy-modify-merge model meaning that you can add and edit files and directories in your working copy like any other files on your system, but you should use subversion commands for everything else such as <code>svn copy</code> and <code>svn move</code> instead of the operating system commands.</p> -<h2 id="wzxhzdk28wzxhzdk29sub-commands-and-abbreviations"><a id="sub-commands_and_abbreviations"></a>Sub-commands and Abbreviations</h2> +<h2 id="sub-commands-and-abbreviations"><a id="sub-commands_and_abbreviations"></a>Sub-commands and Abbreviations<a class="headerlink" href="#sub-commands-and-abbreviations" title="Permanent link">¶</a></h2> <p>Subversion commands can be run from a command shell such as Bash on Linux. The subversion client command is <code>svn</code> followed by optional sub-commands, options, and arguments.</p> <p>Show the program version and modules</p> <div class="codehilite"><pre>$ <span class="n">svn</span> <span class="o">--</span><span class="n">version</span> @@ -145,14 +167,14 @@ <li><code>status</code> - Print the status of working copy files and directories</li> <li><code>update</code> - Bring changes from the repository into your working copy</li> </ul> -<h2 id="wzxhzdk30wzxhzdk31client-configuration"><a id="client_configuration"></a>Client Configuration</h2> +<h2 id="client-configuration"><a id="client_configuration"></a>Client Configuration<a class="headerlink" href="#client-configuration" title="Permanent link">¶</a></h2> <p>Committers need to <a href="http://www.apache.org/dev/version-control.html#https-svn-config">configure their Subversion client</a> to handle the differences in line endings of text files on different operating systems.</p> <p>There are instances where Subversion may need to open an editor. You need to have the environment variable EDITOR set to the editor you would like to use. To set it for the current terminal session in Bash (your path may differ):</p> <div class="codehilite"><pre>$ <span class="n">export</span> <span class="n">EDITOR</span><span class="p">=</span><span class="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">bin</span><span class="o">/</span><span class="n">vim</span> </pre></div> -<h2 id="wzxhzdk32wzxhzdk33repository-layout"><a id="repository_layout"></a>Repository Layout</h2> +<h2 id="repository-layout"><a id="repository_layout"></a>Repository Layout<a class="headerlink" href="#repository-layout" title="Permanent link">¶</a></h2> <p>The AOO repository layout uses the following top-level directories <code>branches</code>, <code>site</code>, <code>tags</code>, and <code>trunk</code>.</p> <ul> <li><code>branches</code> - Contains branches used for continued development of a specific version, experimental versions, or for developing features to be merged into the trunk or a branch later. (needs examples)</li> @@ -161,7 +183,7 @@ <li><code>trunk</code> - Contains the current source code. For more information see the <a href="http://www.apache.org/dev/contributors.html#svnbasics">Contributors Tech Guide</a>.</li> </ul> -<h2 id="getting-the-source-code">Getting the source code</h2> +<h2 id="getting-the-source-code">Getting the source code<a class="headerlink" href="#getting-the-source-code" title="Permanent link">¶</a></h2> <p>From the parent directory of where you want the working copy. In this example the <code>aoo-trunk</code> directory will be created if it does not exist.</p> <div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">co</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">openoffice</span><span class="o">/</span><span class="n">trunk</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span> <span class="n">A</span> <span class="n">aoo</span><span class="o">-</span><span class="n">trunk</span><span class="o">/</span><span class="n">tools</span> @@ -176,7 +198,7 @@ For more information see the <a href="ht <p>"A" indicates file or directory is "Added" to working copy</p> -<h2 id="wzxhzdk34wzxhzdk35basic-work-cycle"><a id="basic_work_cycle"></a>Basic Work Cycle</h2> +<h2 id="basic-work-cycle"><a id="basic_work_cycle"></a>Basic Work Cycle<a class="headerlink" href="#basic-work-cycle" title="Permanent link">¶</a></h2> <ul> <li>Update your working copy - For this you use the <code>svn update</code> command</li> <li>Make changes - For this you may edit files in an editor, or use the <code>svn add</code>, <code>svn delete</code>, <code>svn copy</code>, <code>svn-move</code> commands</li> @@ -185,7 +207,7 @@ For more information see the <a href="ht <li>Resolve Conflicts - There is a chance others have committed changes while you have been changing your working copy. You should run the <code>svn update</code> command to bring your copy up to date. This may create a local conflict where someone may have added a file with a name that you also want to add, or may have made changes to the same line of a file as you. For this use the <code>svn resolve</code> command.</li> <li>Publish Changes - For this you use the <code>svn commit</code> command</li> </ul> -<h3 id="adding-a-file">Adding a File</h3> +<h3 id="adding-a-file">Adding a File<a class="headerlink" href="#adding-a-file" title="Permanent link">¶</a></h3> <p>After creating the file "test-file.txt" in the working copy.</p> <div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">status</span> ? <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> @@ -193,7 +215,7 @@ For more information see the <a href="ht <p>? indicates test-file.txt is not under version control</p> -<h3 id="scheduling-a-file-for-addition-to-repository">Scheduling a file for addition to repository</h3> +<h3 id="scheduling-a-file-for-addition-to-repository">Scheduling a file for addition to repository<a class="headerlink" href="#scheduling-a-file-for-addition-to-repository" title="Permanent link">¶</a></h3> <div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">add</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="n">A</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> @@ -203,7 +225,7 @@ $ <span class="n">svn</span> <span class <p>"A" indicates file is scheduled for addition</p> -<h3 id="running-a-diff">Running a diff</h3> +<h3 id="running-a-diff">Running a diff<a class="headerlink" href="#running-a-diff" title="Permanent link">¶</a></h3> <div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">diff</span> <span class="n">Index</span><span class="p">:</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="o">==================================================================</span><span class="p">=</span> @@ -219,7 +241,7 @@ $ <span class="n">svn</span> <span class </pre></div> -<h3 id="committing-a-file">Committing a file</h3> +<h3 id="committing-a-file">Committing a file<a class="headerlink" href="#committing-a-file" title="Permanent link">¶</a></h3> <div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">commit</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="o">-</span><span class="n">m</span> "<span class="n">added</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span>" <span class="n">Adding</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="n">Transmitting</span> <span class="n">file</span> <span class="n">data</span> <span class="p">.</span> @@ -227,7 +249,7 @@ $ <span class="n">svn</span> <span class </pre></div> -<h3 id="update-the-working-copy">Update the working copy</h3> +<h3 id="update-the-working-copy">Update the working copy<a class="headerlink" href="#update-the-working-copy" title="Permanent link">¶</a></h3> <div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">update</span> <span class="n">U</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> <span class="n">Updated</span> <span class="n">to</span> <span class="n">revision</span> 3<span class="p">.</span> @@ -240,7 +262,7 @@ $ <span class="n">svn</span> <span class </pre></div> -<h3 id="check-the-status">Check the Status</h3> +<h3 id="check-the-status">Check the Status<a class="headerlink" href="#check-the-status" title="Permanent link">¶</a></h3> <div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">status</span> <span class="n">M</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">txt</span> </pre></div> @@ -259,7 +281,7 @@ $ <span class="n">svn</span> <span class </pre></div> -<h3 id="resolving-conflicts">Resolving Conflicts</h3> +<h3 id="resolving-conflicts">Resolving Conflicts<a class="headerlink" href="#resolving-conflicts" title="Permanent link">¶</a></h3> <p>Suppose someone edits the same line as you before you commit</p> <div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">update</span> <span class="n">Conflict</span> <span class="n">discovered</span> <span class="n">in</span> <span class="s">'test-file.txt'</span><span class="p">.</span> @@ -294,7 +316,7 @@ Select: (p) postpone, (df) diff-full, (e <p>"G" indicates "merGed"</p> -<h2 id="wzxhzdk36wzxhzdk37committing-changes"><a id="committing_changes"></a>Committing Changes</h2> +<h2 id="committing-changes"><a id="committing_changes"></a>Committing Changes<a class="headerlink" href="#committing-changes" title="Permanent link">¶</a></h2> <p>Only Committers can commit directly to the repository. The following example shows using your Apache ID and password.</p> <div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">commit</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="p">.</span><span class="n">c</span> <span class="o">--</span><span class="n">username</span> <span class="n">your</span><span class="o">-</span><span class="n">name</span> <span class="o">--</span><span class="n">password</span> <span class="n">your</span><span class="o">-</span><span class="n">password</span> <span class="o">\</span> <span class="o">-</span><span class="n">m</span> "<span class="n">added</span> <span class="n">new</span> <span class="n">C</span> <span class="n">file</span>" @@ -308,7 +330,7 @@ Select: (p) postpone, (df) diff-full, (e <p>Always check your changes with "svn diff" and "svn status". Also be careful to specify the files and/or directories you want to change, if you don't specify, SVN will commit <strong>all</strong> your changes.</p> <p>For further information see the <a href="http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html">Basic Work Cycle</a> page from <a href="http://svnbook.red-bean.com">Subversion Book</a>.</p> -<h2 id="wzxhzdk38wzxhzdk39commit-message"><a id="commit_message"></a>Commit Message</h2> +<h2 id="commit-message"><a id="commit_message"></a>Commit Message<a class="headerlink" href="#commit-message" title="Permanent link">¶</a></h2> <p>The examples in the previous sections use a simple commit message with the "-m" option.</p> <p>This is fine for some quick testing or for large bulk commits of code that you wrote.</p> <p>We ask that your commits include special tagging to appropriately credit the patch. @@ -329,7 +351,7 @@ should actually look like this:</p> <p>Use of the special fields will enable processing by scripts like the <a href="http://www.red-bean.com/svnproject/contribulyzer/">contribulyzer</a> to help quickly identify contributors.</p> -<h2 id="wzxhzdk40wzxhzdk41committing-changes-by-others"><a id="committing_changes_by_others"></a>Committing Changes By Others</h2> +<h2 id="committing-changes-by-others"><a id="committing_changes_by_others"></a>Committing Changes By Others<a class="headerlink" href="#committing-changes-by-others" title="Permanent link">¶</a></h2> <p>See the <a href="http://www.apache.org/dev/committers.html#applying-patches">Applying Patches</a> section of the Committer FAQ page. Please use the special fields described in the previous Commit Message section to commit changes supplied by others. </p> <p>Example similar to one on Committer FAQ:</p> @@ -348,32 +370,30 @@ described in the previous Commit Message </pre></div> -<h2 id="wzxhzdk42wzxhzdk43creating-and-submitting-patches"><a id="creating_and_submitting_patches"></a>Creating and Submitting Patches</h2> +<h2 id="creating-and-submitting-patches"><a id="creating_and_submitting_patches"></a>Creating and Submitting Patches<a class="headerlink" href="#creating-and-submitting-patches" title="Permanent link">¶</a></h2> <p>See the <a href="http://www.apache.org/dev/contributors.html#patches">Sending in Patches</a> section on the Contributors Tech Guide page.</p> <p>Create the patch file from <code>svn diff</code> where <code>your-patch-name.patch</code> is the full path to the patch file to create.</p> <div class="codehilite"><pre><span class="n">svn</span> <span class="n">diff</span> <span class="o">></span> <span class="n">your</span><span class="o">-</span><span class="n">patch</span><span class="o">-</span><span class="n">name</span><span class="p">.</span><span class="n">patch</span> </pre></div> -<h2 id="wzxhzdk44wzxhzdk45merging-changes-to-a-branch"><a id="merging_changes"></a>Merging changes to a branch</h2> -<p>New development is done in the trunk of the tree. With few exceptions you do <strong>NOT</strong> do direct commits to the stable -branches: you normally only commit your changes to the stable branch after other developers have been -given enough time to test the changes don't break anything in the trunk.</p> -<p>In case there are impending security issues, or if the code in the branch has diverged significantly to the -code in the trunk you may commit the code directly but it is a good idea to let -other developers know about such changes.</p> -<p>You usually don't need to apply patches or add new files to merge your changes, instead you use the "svn merge" -command which finds out the specific changes and replays them. SVN also keeps a record +<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, +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> -<p>The first step is to do a check out of the specific branch. You can do a complete -checkout or you can save some space by using the "--depth=empty" option:</p> +<p>The first step is to do a check out of the stable, release, branch. The following examples use the AOO34 release branch, and assume +you want to apply changes from trunk for a new release, maybe AOO341.</p> +<p>You can do a complete checkout of the release branch or you can save some space by using the "--depth=empty" option:</p> <div class="codehilite"><pre> <span class="c">% svn co --depth=empty https://svn.apache.org/repos/asf/openoffice/branches/AOO34 aoo-stable</span> <span class="n">U</span> <span class="n">aoo</span><span class="o">-</span><span class="n">stable</span> <span class="n">Checked</span> <span class="n">out</span> <span class="n">revision</span> 1347362<span class="p">.</span> </pre></div> -<p>You can keep saving space (rather convenient) until you reach the directory where you want to make changes:</p> +<p>This will put a placeholder branch for the AOO34 in directory "aoo-stable".</p> +<p>In the aoo-stable directory, you can keep saving space (rather convenient) until you reach the directory where you want to make changes:</p> <div class="codehilite"><pre> <span class="c">% svn up --depth=empty main</span> <span class="n">Updating</span> <span class="s">'main'</span><span class="p">:</span> <span class="n">A</span> <span class="n">main</span> @@ -385,6 +405,7 @@ checkout or you can save some space by u </pre></div> +<p>At this point, there are svn placeholder entries for /main/jvmfwk.</p> <p>To do a complete checkout from there:</p> <div class="codehilite"><pre> <span class="n">svn</span> <span class="n">up</span> <span class="o">--</span><span class="n">set</span><span class="o">-</span><span class="n">depth</span><span class="p">=</span><span class="n">infinity</span> <span class="n">Updating</span> <span class="s">'.'</span><span class="p">:</span> @@ -402,8 +423,9 @@ checkout or you can save some space by u </pre></div> +<p>At this point, you have merged r1333165 into r1347366. (For release from trunk to a new release, it's likely you would be merging a higher revision to a lower existing release revision.)</p> <p>After you finish merging, check your changes with "svn status" and "svn diff" -and commit:</p> +and commit from the aoo-update directory:</p> <div class="codehilite"><pre> <span class="n">svn</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> "<span class="n">Merge</span> <span class="n">r1329539</span><span class="p">,</span> <span class="n">r1329547</span><span class="p">,</span> 1333165 <span class="o">-</span> <span class="n">Add</span> <span class="n">Oracle</span> <span class="n">as</span> <span class="n">a</span> <span class="n">Java</span> <span class="n">vendor</span> <span class="n">on</span> <span class="n">unix</span><span class="p">.</span>" <span class="n">distributions</span><span class="o">/</span><span class="n">OpenOfficeorg</span><span class="o">/</span><span class="n">javavendors_unx</span><span class="p">.</span><span class="n">xml</span> <span class="n">distributions</span><span class="o">/</span><span class="n">OpenOfficeorg</span><span class="o">/</span><span class="n">javavendors_freebsd</span><span class="p">.</span><span class="n">xml</span> <span class="n">Sending</span> <span class="n">distributions</span><span class="o">/</span><span class="n">OpenOfficeorg</span><span class="o">/</span><span class="n">javavendors_freebsd</span><span class="p">.</span><span class="n">xml</span> <span class="n">Sending</span> <span class="n">distributions</span><span class="o">/</span><span class="n">OpenOfficeorg</span><span class="o">/</span><span class="n">javavendors_unx</span><span class="p">.</span><span class="n">xml</span> @@ -412,7 +434,7 @@ and commit:</p> </pre></div> -<h2 id="wzxhzdk46wzxhzdk47further-information"><a id="further_information"></a>Further Information</h2> +<h2 id="further-information"><a id="further_information"></a>Further Information<a class="headerlink" href="#further-information" title="Permanent link">¶</a></h2> <p>For more information see: </p> <ul> <li><a href="http://subversion.apache.org">Apache Subversion Project</a></li>