diff options
| author | Greg Noel <GregNoel@tigris.org> | 2009-05-10 20:02:08 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2009-05-10 20:02:08 (GMT) |
| commit | 6cab1d1b6453171260e46f9cf0aab09cad62c34c (patch) | |
| tree | 4487fbf5504eb8a14aba02072b28031dfbbe90e0 | |
| parent | 8c2d6900c2e4a7b8917e1fb70efb0c18a1b385cd (diff) | |
| download | SCons-6cab1d1b6453171260e46f9cf0aab09cad62c34c.zip SCons-6cab1d1b6453171260e46f9cf0aab09cad62c34c.tar.gz SCons-6cab1d1b6453171260e46f9cf0aab09cad62c34c.tar.bz2 | |
Remove unused file
| -rw-r--r-- | www/branching.html | 213 | ||||
| -rw-r--r-- | www/project_tools.html | 3 |
2 files changed, 1 insertions, 215 deletions
diff --git a/www/branching.html b/www/branching.html deleted file mode 100644 index 84aaa07..0000000 --- a/www/branching.html +++ /dev/null @@ -1,213 +0,0 @@ -<html> -<head> -<title>SCons Branching and Merging</title> -<meta http-equiv="refresh" content="0;url=http://scons.org/wiki/BranchAndMerge"/> -</head> -<body> - -<div id="apphead"> -<h1><small>scons</small><br />SCons Branching and Merging</h1> -</div> - -<p> -This page covers how we handle branching and merging -in the SCons development tree. -We'll use -<a href="http://www.dellroad.org/svnmerge/index">svnmerge</a> -to keep track of what changes haven't been merged in each direction. -Some of the concepts and steps below have been -swiped from a pretty decent -<a href="http://kenkinder.com/svnmerge/">svnmerge howto</a> -created by Ken Kinder, -with liberal help from our Gary Oberbrunner. -</p> - -<div class="h2 app" style="border-left: 0px" id="branches"> - -<h2>Branches</h2> - -<p> -These are the SCons development branches and their intended uses. -</p> - -<ul> - -<li> -<strong><tt>trunk</tt></strong> -<p> -The main development branch for changes to -the SCons infrastructure. -This branch is thelatest-and-greatest checked-in source, -where SK checks in most of the stuff he's working on -and which gets sent for review to the scons-dev mailing list. -This is also where we check in -web site changes into the <tt>www/</tt> subdirectory -for the <a href="http://scons.tigris.org/">tigris.org</a> -web site. -</p> -</li> - -<li> -<strong><tt>checkpoint</tt></strong> -<p> -The branch from which we release checkpoints and release candidates. -These are considered beta releases to be reviewed by the community. -This branch lags patches that the mailing list -discussions describe as "checked in to Subversion." -This branch's parent is <tt>trunk</tt>. -</p> -</li> - -<li> -<strong><tt>release</tt></strong> -<p> -The main code line from which SCons gets released. -Once a release candidate in the <tt>checkpoint</tt> branch -has achieved sufficient stability, -it is promoted into this branch. -This branch's parent is <tt>checkpoint</tt>. -</p> -</li> - -<li> -<strong><tt>branches/packaging</tt></strong> -<p> -Development branch for the packaging work -that Philipp Scholl is working on -as a Google Summer of Code project. -</p> -</li> - -<li> -<strong><tt>branches/sigrefactor</tt></strong> -<p> -Development branch for the Big Signature Refactoring -that SK has been working on since the last ice age. -This branch's parent is <tt>branches/core</tt>. -</p> -</li> - -<li> -<strong><tt>branches/testing</tt></strong> -<p> -A branch for work on the SCons testing infrastructure. -This branch's parent is <tt>branches/core</tt>. -Not very active at the moment, -because most of that work is just going in right in -<tt>branches/core</tt>. -</p> -</li> - -<li> -<strong><tt>branches/tools</tt></strong> -<p> -The branch intended for people to check in new features to Tool modules. -If you want to contribute a change here, -go see the -<a href="tools-changes.html">step-by-step instructions</a> -for doing so. -This branch's parent is <tt>trunk</tt>. -</p> -</li> - -</ul> - -<p> -</p> - -<h2 id="rebase">How to create a branch off the trunk and initialize it for bi-directional merging</h2> - -<p> -This should take place between any branch and its parent -to set up to <tt>svnmerge</tt> to handle the -tracking as we go forward. -</p> - -<pre> -$ export SVN=http://scons.tigris.org/svn/scons -$ cd my_working_directory/trunk -$ svn cp $SVN/trunk $SVN/branches/new_branch -$ svn commit -$ cd .. -$ svn co $SVN/branches/new_branch -$ cd new_branch -$ svnmerge init -f commit.txt $SVN/trunk -$ cd ../../trunk -$ svnmerge init -f commit.txt $SVN/branches/new_branch -$ svn commit -F commit.txt && rm commit.txt -$ cd ../branches/new_branch -$ svn commit -F commit.txt && rm commit.txt -</pre> - -<p> -You can actually do both the <tt>svnmerge init</tt> -and <tt>svn commit</tt> on one branch (in one directory) -and then do both on the other branch, -but doing it this way makes both of them end up with -the same revision number in the <tt>svnmerge</tt> property, -which is nice and symmetric. -</p> - -<h2>How to merge changes from the trunk to a development branch</h2> - -<p> -This brings a branch in sync with the latest changes that -have made it into the trunk for release -(usually by being promoted from other branches, -we typically don't do work directly on the trunk). -</p> - -<pre> -$ export SVN=http://scons.tigris.org/svn/scons -$ cd my_working_directory/new_branch -$ svn up -$ svnmerge avail -b -S $SVN/trunk -l -$ svnmerge merge -b -S $SVN/trunk -f commit.txt -$ svn resolved . -$ svn diff -$ python runtest.py -a -$ svn commit -F commit.txt && rm commit.txt -</pre> - -<p> -The <tt>svn resolved .</tt> is there because there may be a -conflict on the <tt>svnmerge-integrated</tt>property -that's attached to the directory to track what changes -have or have not already been merged from the trunk. -</p> - -<h2>How to merge changes from a development branch to the trunk</h2> - -<p> -This promotes the branch changes into the trunk. -Note that you should <emphasis>really</emphasis> -first make sure that your branch has already -merged any changes from the trunk -(see previous section) before doing this, -or else you're likely to overwrite any work -that's already been submitted up. -</p> - -<pre> -$ export SVN=http://scons.tigris.org/svn/scons -$ cd my_working_directory/trunk -$ svn up -$ svnmerge avail -b -S $SVN/branches/new_branch -l -$ svnmerge merge -b -S $SVN/branches/new_branch -f commit.txt -$ svn resolved . -$ svn diff -$ python runtest.py -a -$ svn commit -F commit.txt && rm commit.txt -</pre> - -<p> -The <tt>svn resolved .</tt> is there because there may be a -conflict on the <tt>svnmerge-integrated</tt>property -that's attached to the directory to track what changes -have or have not already been merged from the development branch. -</p> - -</div> - -</body> -</html> diff --git a/www/project_tools.html b/www/project_tools.html index 1dfe875..8d4b963 100644 --- a/www/project_tools.html +++ b/www/project_tools.html @@ -18,10 +18,9 @@ The main changes are: <dd> <li><a href="/servlets/ProjectMemberList">Project Membership</a></li> <li><a href="/servlets/ProjectNewsList">Announcements</a></li> -<li><a href="/ds/viewForums.do">Mailing lists/fora</a></li> +<li><a href="/ds/viewForums.do">Discussion lists/fora</a></li> <!-- <li><a href="/servlets/ProjectMailingListList">Mailing lists</a></li> --> <li><a href="/servlets/ProjectDocumentList">Documents & files</a></li> -<li><a href="/wiki/">Project Wiki</a></li> <li><a href="/source/browse/scons/">Browse source code</a></li> <li><a href="/servlets/ReportingHome?scope=Project">Project metrics</a></li> </dd> |