incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r793236 - in /websites/production/openofficeorg: ./ content/openofficeorg/svn-basics.html
Date Sun, 24 Jul 2011 02:11:44 GMT
Author: cmarcum
Date: Sun Jul 24 02:11:44 2011
New Revision: 793236

publish changes to svn-basics

    websites/production/openofficeorg/   (props changed)

Propchange: websites/production/openofficeorg/
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 24 02:11:44 2011
@@ -1 +1 @@

Modified: websites/production/openofficeorg/content/openofficeorg/svn-basics.html
--- websites/production/openofficeorg/content/openofficeorg/svn-basics.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/svn-basics.html Sun Jul 24 02:11:44
@@ -74,17 +74,28 @@
     <h1 class="title">Subversion Basics</h1>
     <p>We use <a href="">Apache Subversion</a>
for version control. For a complete reference on Subversion see the <a href="">Subversion
Book</a>. You can <a href="">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>
+<li><a href="#overview">Overview</a> </li>
+<li><a href="#sub-commands_and_abbreviations">Sub-commands and Abbreviations</a>
+<li><a href="#client_configuration">Client Configuration</a></li>
+<li><a href="#repository_layout">Repository Layout</a></li>
+<li><a href="#getting_the_source_code">Getting the source code</a></li>
+<li><a href="#basic_work_cycle">Basic Work Cycle</a></li>
+<li><a href="#committing_changes_by_others">Committing Changes By Others</a></li>
+<li><a href="#creating_and_submitting_patches">Creating and Submitting Patches</a></li>
+<li><a href="#further_information">Further Information</a></li>
 <h2 id="overview">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="sub-commands_and_abbreviations">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>to see the program version and modules</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>
-<p>or a sub-command</p>
+<p>Run a sub-command</p>
 <div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span>
<span class="sr">&lt;subcommand&gt;</span> <span class="p">[</span><span
class="n">options</span><span class="p">]</span> <span class="p">[</span><span
class="n">args</span><span class="p">]</span>
@@ -265,10 +276,30 @@ Select: (p) postpone, (df) diff-full, (e
 <p>For further information see the <a href="">Basic
Work Cycle</a> page from <a href="">Subversion Book</a>.</p>
-<h2 id="submitting_changes_by_others">Submitting Changes By Others</h2>
-<p>Coming Soon</p>
+<h2 id="committing_changes_by_others">Committing Changes By Others</h2>
+<p>See the <a href="">Applying
Patches</a> section of the Committer FAQ page.</p>
+<p>Example similar to one on Committer FAQ:</p>
+<div class="codehilite"><pre><span class="n">Issue</span> <span
+<span class="n">Added</span> <span class="n">some</span> <span
class="n">cool</span> <span class="k">new</span> <span class="n">feature</span><span
+<span class="n">Submitted</span> <span class="n">by:</span> <span
class="n">John</span> <span class="n">Doe</span> <span class="sr">&lt;;</span>
+<p>Using the <code>-m (--message)</code> option only allows a single line
log message. To commit a multi-line message use the <code>-F (--file)</code> option
(with a previously created file) or use neither -m or -F and an editor will be started.</p>
 <h2 id="creating_and_submitting_patches">Creating and Submitting Patches</h2>
-<p>Coming Soon</p>
+<p>See the <a href="">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">&gt;</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>
+<h2 id="further_information">Further Information</h2>
+<p>For more information see: </p>
+<li><a href="">Apache Subversion Project</a></li>
+<li><a href="">Subversion Book</a></li>
+<li><a href="">Apache Developer Information</a></li>
   <div id="footer">

View raw message