Author: buildbot
Date: Mon May 28 19:08:12 2012
New Revision: 819411
Log:
Staging update by buildbot for rave
Added:
websites/staging/rave/trunk/content/docs/practices/
websites/staging/rave/trunk/content/docs/practices/branching.html
Modified:
websites/staging/rave/trunk/content/ (props changed)
Propchange: websites/staging/rave/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon May 28 19:08:12 2012
@@ -1 +1 @@
-1340094
+1343359
Added: websites/staging/rave/trunk/content/docs/practices/branching.html
==============================================================================
--- websites/staging/rave/trunk/content/docs/practices/branching.html (added)
+++ websites/staging/rave/trunk/content/docs/practices/branching.html Mon May
28 19:08:12 2012
@@ -0,0 +1,109 @@
+<!doctype html>
+<html>
+<head>
+ <meta charset="UTF-8"/>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE- 2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+ <link rel="shortcut icon" href="/images/RAVE-favicon.ico"
type="image/x-icon"/>
+ <link rel="stylesheet" href="//www.google.com/cse/style/look/default.css"/>
+ <link href="/css/rave.css" rel="stylesheet"/>
+ <title>Branch Management</title>
+</head>
+
+<body>
+ <div id="banner">
+ <img id="logo" alt="Apache Rave"
src="/images/RAVE-logo_main-logo-small.png"/>
+ </div>
+
+ <div id="navigation">
+ <div id="cse-search-form">Loading <!-- Placeholder for Google Search Form
--></div>
+ <h1 id="general">General</h1>
+<ul>
+<li><a href="/index.html">About</a></li>
+<li><a href="/documentation/index.html">Documentation</a></li>
+<li><a href="/downloads.html">Downloads</a></li>
+<li><a href="/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/get-involved.html">Get Involved</a></li>
+<li><a href="/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/people.html">People</a></li>
+<li><a href="http://wiki.apache.org/rave/";>Wiki</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/source.html">Getting Started</a></li>
+<li><a href="/ide-settings-and-debugging.html">IDE Settings and
debugging</a></li>
+<li><a href="/release-management.html">Release Management</a></li>
+<li><a href="/issue-management.html">Issue Tracker</a></li>
+<li><a href="https://builds.apache.org/hudson/view/M-R/view/Rave/";>Continuous
Integration</a></li>
+<li><a href="https://analysis.apache.org/dashboard/index/58996";>Sonar
Dashboard</a></li>
+<li><a href="/edit-website.html">Website</a></li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org";>Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html";>Become a
Sponsor</a></li>
+<li><a href="http://www.apache.org/security/";>Security</a></li>
+</ul>
+ </div>
+
+ <div id="content">
+ <h1 class="title">Branch Management</h1>
+ <p>Typically, development in Rave is done against trunk; however,
occasions arise where significant modifications to the code base are to be made
or there is a desire to keep working on an older version of trunk. In these
instances, a branch should be created to support committing incremental changes
that might leave the codebase in a non-ideal state or provide support for an
older version.<br />
+</p>
+<p>This page describes how branches are managed in Rave</p>
+<h4 id="creating-a-new-branch">Creating a new branch</h4>
+<p>Branches should be created sparingly and for valid cause. The committer
proposing the branch should announce their intention to create the branch,
provide a rationale and use <a href="../governance/lazyConsensus.html">lazy
consensus</a> before creating the branch.</p>
+<p>The actual task of creating a branch can be accomplished in many ways, one
of which is documented in the <a
href="http://svnbook.red-bean.com/en/1.7/svn.branchmerge.html";>svn book</a></p>
+<h4 id="keeping-the-branch-up-to-date">Keeping the branch up to date</h4>
+<p>If the purpose of the branch is to develop large sets of modifications
intended to be integrated into trunk, it is crucial that a working branch
continually merge changes in from trunk. Merging instructions can be found in
the aforementioned svn book.</p>
+<h4 id="integrating-the-branch-into-trunk">Integrating the branch into
trunk</h4>
+<p>Before merging changes from the branch back to trunk, the committer should
seek lazy consensus. The period for this consensus should vary depending on
the nature of the changes and the degree to which they will modify the
codebase. If the committer is unable to determine an appropriate time, 72hrs
can be used to be sure that the entire community has the opportunity to review
the changes.</p>
+<p>Branches that are to be merged back into trunk should use the --reintegrate
flag when merging the changes from the branch to trunk. See the svn book for
more details on the operation of merging.</p>
+<h4 id="branch-removal">Branch Removal</h4>
+<p>Removal of a branch should be evaluated on a case-by-case basis. In
general, if a branch was created for the sole purpose of making large code
changes, it is a potential candidate for removal. Again, use the lazy
consensus model to give everyone the opportunity to provide feedback.</p>
+ </div>
+
+ <div id="footer">
+ <div class="copyright">
+ <p>
+ Copyright © 2012 The Apache Software Foundation, Licensed under
+ the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache
License, Version 2.0</a>.
+ <br />
+ Apache Rave, Apache, the Apache feather logo, and the Apache Rave
project logos are trademarks of The Apache Software Foundation.
+ All other marks mentioned may be trademarks or registered trademarks
of their respective owners.
+ </p>
+ </div>
+ </div>
+ <script src="//www.google.com/jsapi"></script>
+ <script>
+ google.load('search', '1', {language : 'en'});
+ google.setOnLoadCallback(function() {
+ var customSearchOptions = {}; var customSearchControl = new
google.search.CustomSearchControl(
+ '009412755592933514871:wrsgblows4o', customSearchOptions);
+
customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
+ var options = new google.search.DrawOptions();
+
options.enableSearchboxOnly("http://www.google.com/cse?cx=009412755592933514871:wrsgblows4o";);
+ customSearchControl.draw('cse-search-form', options);
+ }, true);
+ </script>
+</body>
+</html>
