subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r1407359 - /subversion/site/publish/docs/community-guide/general.part.html
Date Fri, 09 Nov 2012 04:52:09 GMT
Author: danielsh
Date: Fri Nov  9 04:52:09 2012
New Revision: 1407359

* docs/community-guide/general.part.html: Disintegrate references to 
    the "--reintegrate" command-line option, which is to be deprecated.


Modified: subversion/site/publish/docs/community-guide/general.part.html
--- subversion/site/publish/docs/community-guide/general.part.html (original)
+++ subversion/site/publish/docs/community-guide/general.part.html Fri Nov  9 04:52:09 2012
@@ -391,13 +391,11 @@ central place to describe the following 
        describe the situation.</p></li>
 <li><p>What style of branch management you are using: is this a
-       reintegrate-able branch that will regularly be kept in sync
-       with its source branch and ultimately merged back to that
-       source branch using <tt>svn merge --reintegrate</tt>?  Or is it
-       not reintegrate-able, managed in total disregard to new changes
-       made to the source branch, and expected to be merged back to
-       that source without the <tt>--reintegrate</tt> option <tt>svn
-       merge</tt>?</p></li>
+       feature branch that will regularly be kept in sync
+       with its parent branch and ultimately reintegrated back to that
+       parent branch?  Is it a fork that is not expected to be merged back
+       to its parent branch in the foreseeable future?  Does it relate
+       to any other branches?</p></li>
 <li><p>What tasks remain for you to accomplish on your branch?  Are
        those tasks claimed by someone?  Do they need more design
@@ -410,9 +408,9 @@ talking about:</p>
 <pre style="margin-left: 0.25in;">
 This branch exists for the resolution of issue #8810, per the ideas
-documented in /trunk/notes/frobnobbing-feature.txt.  It is being
-managed as a reintegrate-able branch, with regular catch-up merges
-from the trunk.
+documented in /trunk/notes/frobnobbing-feature.txt.  It is a feature
+branch, receiving regular sync merges from /trunk, and expected to be
+reintegrated back thereto.

View raw message