<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE glossary SYSTEM "../dtd/dblite.dtd">
<!--
 Enter Glossary definitions in alphabetical Order!
 DocBook doesn't sort them automatically.
-->
<glossary id="tsvn-glossary">
  <title>Glossary</title>
  <glossentry>
    <glossterm>Add</glossterm>
    <glossdef>
      <para>
        A Subversion command that is used to add a
        file or directory to your working copy.
        The new items are added to the repository when you commit.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>BASE revision</glossterm>
    <glossdef>
      <para>
        The current base revision of a file or folder in your <emphasis>working copy</emphasis>.
        This is the revision the file or folder was in, when the last checkout,
        update or commit was run. The BASE revision is normally not equal to the
        HEAD revision.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Blame</glossterm>
    <glossdef>
      <para>
        This command is for text files only, and it annotates every line to
        show the repository revision in which it was last changed, and the
        author who made that change. Our GUI implementation is called
        TortoiseBlame and it also shows the commit date/time and the
        log message when you hover the mouse of the revision number.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Branch</glossterm>
    <glossdef>
      <para>
        A term frequently used in revision control systems to describe
        what happens when development forks at a particular point and
        follows 2 separate paths. You can create a branch off the main
        development line so as to develop a new feature without rendering
        the main line unstable. Or you can branch a stable release to which
        you make only bug fixes, while new developments take place on the
        unstable trunk. In Subversion a branch is implemented as a
        <quote>cheap copy</quote>.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Checkout</glossterm>
    <glossdef>
      <para>
        A Subversion command which creates a local working copy in an empty
        directory by downloading versioned files from the repository.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Cleanup</glossterm>
    <glossdef>
      <para>
        To quote from the Subversion book:
        <quote>
          Recursively clean up the working copy, removing locks and resuming
          unfinished operations. If you ever get a
          <emphasis>working copy locked</emphasis> error,
          run this command to remove stale locks and get your working copy
          into a usable state again.
        </quote>
        Note that in this context <emphasis>lock</emphasis> refers to local filesystem
        locking, not repository locking.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Commit</glossterm>
    <glossdef>
      <para>
        This Subversion command is used to pass the changes in your local
        working copy back into the repository, creating a new repository
        revision.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Conflict</glossterm>
    <glossdef>
      <para>
        When changes from the repository are merged with local changes,
        sometimes those changes occur on the same lines. In this case
        Subversion cannot automatically decide which version to use and
        the file is said to be in conflict. You have to edit the file manually
        and resolve the conflict before you can commit any further changes.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Copy</glossterm>
    <glossdef>
      <para>
        In a Subversion repository you can create a copy of a single file
        or an entire tree. These are implemented as <quote>cheap copies</quote>
        which act a bit like a link to the original in that they take up
        almost no space. Making a copy preserves the history of the item
        in the copy, so you can trace changes made before the copy was made.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Delete</glossterm>
    <glossdef>
      <para>
        When you delete a versioned item (and commit the change) the item
        no longer exists in the repository after the committed revision.
        But of course it still exists in earlier repository revisions,
        so you can still access it. If necessary, you can copy a deleted
        item and <quote>resurrect</quote> it complete with history.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Diff</glossterm>
    <glossdef>
      <para>
        Shorthand for <quote>Show Differences</quote>. Very useful when
        you want to see exactly what changes have been made.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Export</glossterm>
    <glossdef>
      <para>
        This command produces a copy of a versioned folder,
        just like a working copy, but without the local
        <literal>.svn</literal> folders.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>FSFS</glossterm>
    <glossdef>
      <para>
        A proprietary Subversion filesystem backend for repositories.
        Can be used on network shares. Default for 1.2 and newer repositories.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>GPO</glossterm>
    <glossdef>
      <para>
        Group policy object.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>HEAD revision</glossterm>
    <glossdef>
      <para>
        The latest revision of a file or folder in the <emphasis>repository</emphasis>.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Import</glossterm>
    <glossdef>
      <para>
        Subversion command to import an entire folder hierarchy into the repository
        in a single revision.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Lock</glossterm>
    <glossdef>
      <para>
        When you take out a lock on a versioned item, you mark it in
        the repository as non-committable, except from the working copy
        where the lock was taken out.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Log</glossterm>
    <glossdef>
      <para>
        Show the revision history of a file or folder.
        Also known as <quote>History</quote>.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>History</glossterm>
    <glossdef>
      <para>
        Show the revision history of a file or folder.
        Also known as <quote>Log</quote>.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Merge</glossterm>
    <glossdef>
      <para>
        The process by which changes from the repository are added to your
        working copy without disrupting any changes you have already made
        locally. Sometimes these changes cannot be reconciled automatically
        and the working copy is said to be in conflict.
      </para>
      <para>
        Merging happens automatically when you update your working copy.
        You can also merge specific changes from another branch using
        TortoiseSVN's Merge command.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Patch</glossterm>
    <glossdef>
      <para>
        If a working copy has changes to text files only, it is possible
        to use Subversion's Diff command to generate a single file summary
        of those changes in Unified Diff format. A file of this type is often
        referred to as a <quote>Patch</quote>, and it can be emailed to someone
        else (or to a mailing list) and applied to another working copy.
        Someone without commit access can make changes and submit a patch
        file for an authorized committer to apply. Or if you are unsure about
        a change you can submit a patch for others to review.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Property</glossterm>
    <glossdef>
      <para>
        In addition to versioning your directories and files, Subversion allows
        you to add versioned metadata - referred to as <quote>properties</quote>
        to each of your versioned directories and files. Each property has a
        name and a value, rather like a registry key. Subversion has some
        special properties which it uses internally, such as
        <literal>svn:eol-style</literal>. TortoiseSVN has some too, such as
        <literal>tsvn:logminsize</literal>. You can add your own properties
        with any name and value you choose.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Relocate</glossterm>
    <glossdef>
      <para>
        If your repository moves, perhaps because you have moved it to
        a different directory on your server, or the server domain name
        has changed, you need to <quote>relocate</quote> your working copy
        so that its repository URLs point to the new location.
      </para>
      <para>
        Note: you should only use this command if your working copy is
        referring to the same location in the same repository, but the
        repository itself has moved. In any other circumstance you
        probably need the <quote>Switch</quote> command instead.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Repository</glossterm>
    <glossdef>
      <para>
        A repository is a central place where data is stored and maintained.
        A repository can be a place where multiple databases or files are located for
        distribution over a network, or a repository can be a location that is
        directly accessible to the user without having to travel across a network.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Resolve</glossterm>
    <glossdef>
      <para>
        When files in a working copy are left in a conflicted state following
        a merge, those conflicts must be sorted out by a human using an editor
        (or perhaps TortoiseMerge). This process is referred to as
        <quote>Resolving Conflicts</quote>. When this is complete you can mark
        the conflicted files as being resolved, which allows them to be committed.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Revert</glossterm>
    <glossdef>
      <para>
        Subversion keeps a local <quote>pristine</quote> copy of each file as
        it was when you last updated your working copy. If you have made changes
        and decide you want to undo them, you can use the <quote>revert</quote>
        command to go back to the pristine copy.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Revision</glossterm>
    <glossdef>
      <para>
        Every time you commit a set of changes, you create one new
        <quote>revision</quote> in the repository. Each revision represents
        the state of the repository tree at a certain point in its history.
        If you want to go back in time you can examine the repository as
        it was at revision N.
      </para>
      <para>
        In another sense, a revision can refer to the set of changes that
        were made when that revision was created.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Revision Property (revprop)</glossterm>
    <glossdef>
      <para>
        Just as files can have properties, so can each revision in the
        repository. Some special revprops are added automatically
        when the revision is created, namely:
        <literal>svn:date svn:author svn:log</literal> which represent
        the commit date/time, the committer and the log message
        respectively. These properties can be edited, but they are not
        versioned, so any change is permanent and cannot be undone.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>SVN</glossterm>
    <glossdef>
      <para>
        A frequently-used abbreviation for Subversion.
      </para>
      <para>
        The name of the Subversion custom protocol used by the
        <quote>svnserve</quote> repository server.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Switch</glossterm>
    <glossdef>
      <para>
        Just as <quote>Update-to-revision</quote> changes the time
        window of a working copy to look at a different point in history,
        so <quote>Switch</quote> changes the space window of a working copy
        so that it points to a different part of the repository.
        It is particularly useful when working on trunk and branches where
        only a few files differ. You can switch your working copy between
        the two and only the changed files will be transferred.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Update</glossterm>
    <glossdef>
      <para>
        This Subversion command pulls down the latest changes from the
        repository into your working copy, merging any changes made by
        others with local changes in the working copy.
      </para>
    </glossdef>
  </glossentry>
  <glossentry>
    <glossterm>Working Copy</glossterm>
    <glossdef>
      <para>
        This is your local <quote>sandbox</quote>, the area where you
        work on the versioned files, and it normally resides on your
        local hard disk. You create a working copy by doing a
        <quote>Checkout</quote> from a repository, and you feed your
        changes back into the repository using <quote>Commit</quote>.
      </para>
    </glossdef>
  </glossentry>
</glossary>
<!--
local variables:
sgml-parent-document: ("book.xml" "glossary")
end:
-->
