incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1347382 - /incubator/ooo/site/trunk/content/openofficeorg/svn-basics.mdtext
Date Thu, 07 Jun 2012 04:13:53 GMT
Author: pfg
Date: Thu Jun  7 04:13:52 2012
New Revision: 1347382

URL: http://svn.apache.org/viewvc?rev=1347382&view=rev
Log:
Minor fixes

Modified:
    incubator/ooo/site/trunk/content/openofficeorg/svn-basics.mdtext

Modified: incubator/ooo/site/trunk/content/openofficeorg/svn-basics.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/svn-basics.mdtext?rev=1347382&r1=1347381&r2=1347382&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/svn-basics.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/svn-basics.mdtext Thu Jun  7 04:13:52 2012
@@ -30,6 +30,7 @@ This page gives instructions on performi
 * [Commit Message](#commit_message)
 * [Committing Changes By Others](#committing_changes_by_others)
 * [Creating and Submitting Patches](#creating_and_submitting_patches)
+* [Merging changes to a branch] (#merging_changes)
 * [Further Information](#further_information)
 
 ## <a id="overview"></a>Overview
@@ -290,13 +291,16 @@ Create the patch file from `svn diff` wh
 
 New development is done in the trunk of the tree. With few exceptions you do **NOT** 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.
+given enough time to test the changes don't break anything in the trunk.
 
 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.
 
+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.
+
 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:
 
@@ -315,7 +319,8 @@ You can keep saving space (rather conven
      A    jvmfwk
      Updated to revision 1347366.
 
-And do a complete checkout from there:
+To do a complete checkout from there:
+
      svn up --set-depth=infinity
      Updating '.':
      A    source
@@ -323,13 +328,13 @@ And do a complete checkout from there:
      A    source/fwkbase.cxx
      ... (and so on)
 
-Now merge the specific revision(s) you want, in this case 1333165:
+Now merge the specific revision(s) you want (in this case r1333165):
 
      svn merge -c1333165 https://svn.apache.org/repos/asf/incubator/ooo/trunk/main/jvmfwk
.
      --- Merging r1333165 into '.':
      U    distributions/OpenOfficeorg/javavendors_unx.xml
 
-After you finish merging check your changes with "svn status" and "svn diff"
+After you finish merging, check your changes with "svn status" and "svn diff"
 and commit:
 
      svn commit -m "Merge r1329539, r1329547, 1333165 - Add Oracle as a Java vendor on unix."
distributions/OpenOfficeorg/javavendors_unx.xml distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -338,10 +343,6 @@ and commit:
      Transmitting file data ..
      Committed revision 1347377.
 
-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.
-
-
 ## <a id="further_information"></a>Further Information
 
 For more information see: 



Mime
View raw message