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/07 06:13:57 UTC
svn commit: r820617 - in /websites/staging/openofficeorg/trunk/content: ./
openofficeorg/svn-basics.html
Author: buildbot
Date: Thu Jun 7 04:13:57 2012
New Revision: 820617
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 Thu Jun 7 04:13:57 2012
@@ -1 +1 @@
-1347379
+1347382
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 Thu Jun 7 04:13:57 2012
@@ -108,12 +108,13 @@
<li><a href="#commit_message">Commit Message</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>[Merging changes to a branch] (#merging_changes)</li>
<li><a href="#further_information">Further Information</a></li>
</ul>
-<h2 id="wzxhzdk25wzxhzdk26overview"><a id="overview"></a>Overview</h2>
+<h2 id="wzxhzdk26wzxhzdk27overview"><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="wzxhzdk27wzxhzdk28sub-commands-and-abbreviations"><a id="sub-commands_and_abbreviations"></a>Sub-commands and Abbreviations</h2>
+<h2 id="wzxhzdk28wzxhzdk29sub-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 +142,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="wzxhzdk29wzxhzdk30client-configuration"><a id="client_configuration"></a>Client Configuration</h2>
+<h2 id="wzxhzdk30wzxhzdk31client-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="wzxhzdk31wzxhzdk32repository-layout"><a id="repository_layout"></a>Repository Layout</h2>
+<h2 id="wzxhzdk32wzxhzdk33repository-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 +173,7 @@ For more information see the <a href="ht
<p>"A" indicates file or directory is "Added" to working copy</p>
-<h2 id="wzxhzdk33wzxhzdk34basic-work-cycle"><a id="basic_work_cycle"></a>Basic Work Cycle</h2>
+<h2 id="wzxhzdk34wzxhzdk35basic-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 +291,7 @@ Select: (p) postpone, (df) diff-full, (e
<p>"G" indicates "merGed"</p>
-<h2 id="wzxhzdk35wzxhzdk36committing-changes"><a id="committing_changes"></a>Committing Changes</h2>
+<h2 id="wzxhzdk36wzxhzdk37committing-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">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="s">"added new C file"</span>
@@ -304,7 +305,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="wzxhzdk37wzxhzdk38commit-message"><a id="commit_message"></a>Commit Message</h2>
+<h2 id="wzxhzdk38wzxhzdk39commit-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 of code that you wrote.</p>
<p>We ask that your commits include special tagging to appropriately credit the patch.
@@ -325,7 +326,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="wzxhzdk39wzxhzdk40committing-changes-by-others"><a id="committing_changes_by_others"></a>Committing Changes By Others</h2>
+<h2 id="wzxhzdk40wzxhzdk41committing-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>
@@ -345,21 +346,23 @@ described in the previous Commit Message
</pre></div>
-<h2 id="wzxhzdk41wzxhzdk42creating-and-submitting-patches"><a id="creating_and_submitting_patches"></a>Creating and Submitting Patches</h2>
+<h2 id="wzxhzdk42wzxhzdk43creating-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="wzxhzdk43wzxhzdk44merging-changes-to-a-branch"><a id="merging_changes"></a>Merging changes to a branch</h2>
+<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. SVN also keeps a record
-of the specific commit that have been merged so the changes are much easier to track down.</p>
+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
+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>
<div class="codehilite"><pre> <span class="c">% svn co --depth=empty https://svn.apache.org/repos/asf/incubator/ooo/branches/AOO34 aoo-stable</span>
@@ -380,21 +383,24 @@ checkout or you can save some space by u
</pre></div>
-<p>And do a complete checkout from there:
- svn up --set-depth=infinity
- Updating '.':
- A source
- A source/elements.hxx
- A source/fwkbase.cxx
- ... (and so on)</p>
-<p>Now merge the specific revision(s) you want, in this case 1333165:</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="o">=</span><span class="n">infinity</span>
+ <span class="n">Updating</span> <span class="s">'.'</span><span class="p">:</span>
+ <span class="n">A</span> <span class="n">source</span>
+ <span class="n">A</span> <span class="n">source</span><span class="o">/</span><span class="n">elements</span><span class="o">.</span><span class="n">hxx</span>
+ <span class="n">A</span> <span class="n">source</span><span class="o">/</span><span class="n">fwkbase</span><span class="o">.</span><span class="n">cxx</span>
+ <span class="o">...</span> <span class="p">(</span><span class="ow">and</span> <span class="n">so</span> <span class="n">on</span><span class="p">)</span>
+</pre></div>
+
+
+<p>Now merge the specific revision(s) you want (in this case r1333165):</p>
<div class="codehilite"><pre> <span class="n">svn</span> <span class="n">merge</span> <span class="o">-</span><span class="n">c1333165</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/incubator/ooo/trunk/m</span><span class="n">ain</span><span class="o">/</span><span class="n">jvmfwk</span> <span class="o">.</span>
<span class="o">---</span> <span class="n">Merging</span> <span class="n">r1333165</span> <span class="n">into</span> <span class="s">'.'</span><span class="p">:</span>
<span class="n">U</span> <span class="n">distributions</span><span class="sr">/OpenOfficeorg/</span><span class="n">javavendors_unx</span><span class="o">.</span><span class="n">xml</span>
</pre></div>
-<p>After you finish merging check your changes with "svn status" and "svn diff"
+<p>After you finish merging, check your changes with "svn status" and "svn diff"
and commit:</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="s">"Merge r1329539, r1329547, 1333165 - Add Oracle as a Java vendor on unix."</span> <span class="n">distributions</span><span class="sr">/OpenOfficeorg/</span><span class="n">javavendors_unx</span><span class="o">.</span><span class="n">xml</span> <span class="n">distributions</span><span class="sr">/OpenOfficeorg/</span><span class="n">javavendors_freebsd</span><span class="o">.</span><span class="n">xml</span>
<span class="n">Sending</span> <span class="n">distributions</span><span class="sr">/OpenOfficeorg/</span><span class="n">javavendors_freebsd</span><span class="o">.</span><span class="n">xml</span>
@@ -404,9 +410,7 @@ and commit:</p>
</pre></div>
-<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.</p>
-<h2 id="wzxhzdk45wzxhzdk46further-information"><a id="further_information"></a>Further Information</h2>
+<h2 id="wzxhzdk46wzxhzdk47further-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>