You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2012/06/04 22:19:30 UTC
svn commit: r820266 - in /websites/staging/openofficeorg/trunk/content: ./
openofficeorg/svn-basics.html
Author: buildbot
Date: Mon Jun 4 20:19:30 2012
New Revision: 820266
Log:
Staging update by buildbot for openofficeorg
Modified:
websites/staging/openofficeorg/trunk/content/ (props changed)
websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html
Propchange: websites/staging/openofficeorg/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 4 20:19:30 2012
@@ -1 +1 @@
-1346087
+1346145
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/svn-basics.html Mon Jun 4 20:19:30 2012
@@ -110,10 +110,10 @@
<li><a href="#creating_and_submitting_patches">Creating and Submitting Patches</a></li>
<li><a href="#further_information">Further Information</a></li>
</ul>
-<h2 id="wzxhzdk19wzxhzdk20overview"><a id="overview"></a>Overview</h2>
+<h2 id="wzxhzdk20wzxhzdk21overview"><a id="overview"></a>Overview</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="wzxhzdk21wzxhzdk22sub-commands-and-abbreviations"><a id="sub-commands_and_abbreviations"></a>Sub-commands and Abbreviations</h2>
+<h2 id="wzxhzdk22wzxhzdk23sub-commands-and-abbreviations"><a id="sub-commands_and_abbreviations"></a>Sub-commands and Abbreviations</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="nv">$</span> <span class="nv">svn</span> <span class="o">--</span><span class="n">version</span>
@@ -141,14 +141,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="wzxhzdk23wzxhzdk24client-configuration"><a id="client_configuration"></a>Client Configuration</h2>
+<h2 id="wzxhzdk24wzxhzdk25client-configuration"><a id="client_configuration"></a>Client Configuration</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="nv">$</span> <span class="nv">export</span> <span class="n">EDITOR</span><span class="o">=</span><span class="sr">/usr/</span><span class="n">bin</span><span class="o">/</span><span class="n">vim</span>
</pre></div>
-<h2 id="wzxhzdk25wzxhzdk26repository-layout"><a id="repository_layout"></a>Repository Layout</h2>
+<h2 id="wzxhzdk26wzxhzdk27repository-layout"><a id="repository_layout"></a>Repository Layout</h2>
<p>The OOo 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>
@@ -172,7 +172,7 @@ For more information see the <a href="ht
<p>"A" indicates file or directory is "Added" to working copy</p>
-<h2 id="wzxhzdk27wzxhzdk28basic-work-cycle"><a id="basic_work_cycle"></a>Basic Work Cycle</h2>
+<h2 id="wzxhzdk28wzxhzdk29basic-work-cycle"><a id="basic_work_cycle"></a>Basic Work Cycle</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>
@@ -290,7 +290,7 @@ Select: (p) postpone, (df) diff-full, (e
<p>"G" indicates "merGed"</p>
-<h2 id="wzxhzdk29wzxhzdk30committing-changes"><a id="committing_changes"></a>Committing Changes</h2>
+<h2 id="wzxhzdk30wzxhzdk31committing-changes"><a id="committing_changes"></a>Committing Changes</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="nv">$</span> <span class="nv">svn</span> <span class="n">commit</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</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="s">"added new line"</span>
@@ -301,7 +301,7 @@ Select: (p) postpone, (df) diff-full, (e
<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="wzxhzdk31wzxhzdk32commit-message"><a id="commit_message"></a>Commit Message</h2>
+<h2 id="wzxhzdk32wzxhzdk33commit-message"><a id="commit_message"></a>Commit Message</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. However, we ask that
your commits include special tagging to appropriately credit the patch.
@@ -310,7 +310,7 @@ Conventions of the Apache Subversion pro
<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="wzxhzdk33wzxhzdk34committing-changes-by-others"><a id="committing_changes_by_others"></a>Committing Changes By Others</h2>
+<h2 id="wzxhzdk34wzxhzdk35committing-changes-by-others"><a id="committing_changes_by_others"></a>Committing Changes By Others</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>
@@ -323,14 +323,20 @@ described in the previous Commit Message
<!-- Using the `-m (--message)` option only allows a single line log message. To commit a multi-line message use the `-F (--file)` option (with a previously created file) or use neither -m or -F and an editor will be started. -->
-<h2 id="wzxhzdk35wzxhzdk36creating-and-submitting-patches"><a id="creating_and_submitting_patches"></a>Creating and Submitting Patches</h2>
+<p>An alternative way is the following command. It adds a new line with "\n":</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="nv">$</span><span class="err">'</span><span class="nv">Issue</span> <span class="c1">#43835:\nAdded some cool new feature.\nSubmitted /</span>
+ <span class="n">by:</span> <span class="n">John</span> <span class="n">Doe</span> <span class="sr"><john.doe.at.null.org></span><span class="err">'</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+</pre></div>
+
+
+<h2 id="wzxhzdk36wzxhzdk37creating-and-submitting-patches"><a id="creating_and_submitting_patches"></a>Creating and Submitting Patches</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="o">.</span><span class="n">patch</span>
</pre></div>
-<h2 id="wzxhzdk37wzxhzdk38further-information"><a id="further_information"></a>Further Information</h2>
+<h2 id="wzxhzdk38wzxhzdk39further-information"><a id="further_information"></a>Further Information</h2>
<p>For more information see: </p>
<ul>
<li><a href="http://subversion.apache.org">Apache Subversion Project</a></li>