<?xml version="1.0" encoding="iso-8859-1"?>
<!-- name="generator" content="pyblosxom/1.3.2 2/13/2006" -->
<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN" "http://my.netscape.com/publish/formats/rss-0.91.dtd">

<rss version="0.91">
<channel>
<title>Diane's World 12 Oct 2005</title>
<link>http://woldlab.caltech.edu/~diane/index.cgi</link>
<description>I take the 5th</description>
<language>en</language>
<item>
  <title>* Showed up at Tony&apos;s place and chatted about Arma</title>
  <link>http://woldlab.caltech.edu/~diane/index.cgi/study/arma/2004-10-22.html</link>
  <description><![CDATA[

<div class="document">
<blockquote>
<ul class="simple">
<li>practical &quot;blunts&quot; cassi?</li>
<li>what was the name of the guy who made the really good wasters.</li>
<li>balance was only an inch or two above the hilt, the pommel was
much narrower than mine. beautifully smoothed.<ul>
<li>should take picture of it before leaving.</li>
</ul>
</li>
</ul>
</blockquote>
</div>

]]></description>
</item>

<item>
  <title>SVN</title>
  <link>http://woldlab.caltech.edu/~diane/index.cgi/work/svn.html</link>
  <description><![CDATA[

<div class="document">
<ul>
<li><p class="first">Subversion</p>
<blockquote>
<p>The full documentation for subversion can be found at
<a class="reference" href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a>
However here's a quick introduction.</p>
<p>Subversion is a version control system designed to fix several issues that
were found in cvs, such as being able to rename files and process binary
files more efficiently.</p>
<p>Version control systems allow one to keep track of how a file changes
over time, and help multiple people who are modifying the same file.
For instance if two people had copies of a file and each
independently added some text, if they wanted to merge the file one
of them would have to take the others file and attempt to identify
the differences and merge the two together.</p>
<p>Subversion, however, would attempt to merge the two chunks
automatically. It does this by seeing if the changes touch the same
line of text, if they do it will generate a conflict, otherwise it
will go ahead and merge them.</p>
<p>It will also help you roll back to a previous change, or compare how
a file has changed over the past few months.</p>
</blockquote>
</li>
</ul>
<blockquote>
<ul>
<li><p class="first">Subversion Quick Start</p>
<p>svn co &lt;svn url&gt; [destination]
(checks out a subversion url to either the name of the last part
of the url or the optional destination name).</p>
<p>svn update
when run in a project directory will update to the latest version of
that project.</p>
<p>svn status
will show you what changes you've made to the directory try</p>
<p>svn status -u
will check the network to see if there are an updates</p>
<p>svn commit [filename filename ...]
will commit either everything (when there are no files, or the
specific file list to the archive)</p>
</li>
<li><p class="first">OS X Subversion</p>
<p>Command line copy of subversion built for OS X is available at
<a class="reference" href="http://metissian.com/projects/macosx/subversion/">http://metissian.com/projects/macosx/subversion/</a> or
<a class="reference" href="http://www.codingmonkeys.de/mbo/">http://www.codingmonkeys.de/mbo/</a></p>
<dl class="docutils">
<dt>Documentation on installing a Mac OS X subversion client is availabe at</dt>
<dd><p class="first last"><a class="reference" href="http://weblogs.uncc.edu/blog/jwedgeco/2004/08/17/mac_os_x_subversion_client_works">http://weblogs.uncc.edu/blog/jwedgeco/2004/08/17/mac_os_x_subversion_client_works</a></p>
</dd>
</dl>
</li>
</ul>
</blockquote>
</div>

]]></description>
</item>

</channel>
</rss>
