path: root/doc/gettext/ru/cvs-tutorial.xml.po

msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2010-10-21 23:56+0600\n"
"PO-Revision-Date: 2010-10-21 23:46+0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(guide:link):6
msgid "/doc/en/cvs-tutorial.xml"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):8
msgid "Gentoo Linux CVS Tutorial"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(author:title):10
msgid "Author"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(mail:link):11
msgid "drobbins@gentoo.org"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(mail):11
msgid "Daniel Robbins"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(author:title):13
msgid "Editor"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(mail:link):14
msgid "neysx@gentoo.org"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(mail):14
msgid "Xavier Neys"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(abstract):17
msgid ""
"This tutorial introduces readers to CVS, the Concurrent Versions System, "
"used by developers around the world to develop software in a flexible and "
"collaborative manner. Intended for those new to CVS, this tutorial will get "
"both general users and new developers up to speed quickly. Whether you'd "
"like to use CVS to \"check out\" the latest sources of a particular software "
"package, or whether you'd like to begin using CVS as a full-fledged "
"developer, this tutorial is for you."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(version):27
msgid "1.9"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(date):28
msgid "2008-05-20"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):31
msgid "Introduction"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):33
msgid "Tutorial layout"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):36
msgid ""
"This tutorial has two parts. The first shows you how to use CVS as a non-"
"developer, i.e. how to get sources from CVS and keep them updated. The "
"second part introduces you to using CVS as a developer, showing you how to "
"modify, add and remove files on CVS and perform other developer-related "
"tasks. If you are new to CVS, it's recommended that you begin in the first "
"section and proceed to the second section; if you have some basic CVS "
"experience but are going to be using CVS as a full-fledged developer for the "
"first time, you should find everything you need in the second section, but "
"you may want to go through the first section as a review."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):51
msgid "What is CVS and what does it do?"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):54
msgid ""
"CVS is a client/server system allowing developers to store their projects in "
"a central location, called a repository. Using the cvs client tools, "
"developers can make changes to the contents of the repository. In turn, the "
"cvs repository tracks every change made to every file, creating a complete "
"history of the evolution of the development project. Developers can request "
"older versions of a particular source file, view a log of changes, and "
"perform other useful tasks as needed."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):67
msgid "The role of CVS"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):70
msgid ""
"A lot of open software projects have their own CVS servers, which are used "
"by the project developers as a central repository for all their work. "
"Developers often make improvements to the sources in the CVS repository on a "
"daily basis; and often, these developers are scattered around the world, yet "
"CVS provides the necessary mechanism to unite their project into a "
"centralized, cohesive whole. CVS creates the \"organizational glue\" that "
"allows these developers to make improvements to the code without stepping on "
"each other's toes, losing important data or missing each other's critical "
"updates to particular source files."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):85
msgid "CVS -- the latest developer sources"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):88
msgid ""
"When the developers are ready, they'll roll some their current work on CVS "
"into a .tar.gz file and release it as a new official version of their "
"software package. However, the latest official release sometimes isn't "
"recent enough, for a variety of possible reasons. In the first section of "
"this tutorial, I'll show you how to use CVS for this purpose -- acquiring "
"the latest and greatest developer version of the sources for your own "
"personal use."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):100
#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):107
msgid "Installing CVS"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):103
msgid "To install cvs, just type in <c>emerge cvs</c>:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):107
#, no-wrap
msgid ""
"\n"
"# <i>emerge cvs</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):114
msgid "The CVSROOT"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):117
msgid ""
"Before we begin, there are a few CVS fundamentals that you need to know. The "
"first is that in order to connect to a CVS repository, you first need to "
"know a path called the \"CVSROOT\". The CVSROOT is a string, like a URL, "
"that tells the cvs command where the remote repository is and how we'd like "
"to connect to it. Just to make things interesting, CVS has a number of "
"CVSROOT formats, depending on whether the CVS repository is local or remote "
"and what method you're going to use to connect to it. Here are some example "
"CVSROOTs, along with explanations..."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):131
msgid "A local CVSROOT"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):134
msgid "Setting CVSROOT"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):134
#, no-wrap
msgid ""
"\n"
"CVSROOT=/var/cvsroot\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):138
msgid ""
"This is an example of a local CVSROOT path; you'd use a CVSROOT like this if "
"you wanted to connect to a local repository that exists at /var/cvsroot; or "
"maybe you have a repository mounted via NFS at /var/cvsroot."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):147
msgid "A remote password server CVSROOT"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):150
msgid "Setting CVSROOT with authentification"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):150
#, no-wrap
msgid ""
"\n"
"CVSROOT=:pserver:cvs@foo.bar.com:/var/cvsroot\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):154
msgid ""
"Here's an example of a CVSROOT for a remote repository that exists on the "
"foo.bar.com host and lives in the /var/cvsroot directory on that machine. "
"The leading \":pserver:\" part tells our client to connect to this remote "
"machine using the CVS password server protocol, a protocol that's built-in "
"to CVS. Typically, public CVS repositories use the password server protocol "
"to allow access to anonymous users."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):166
msgid "A remote rsh/ssh CVSROOT"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):169
msgid "RSH/SSH CVSROOT"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):169
#, no-wrap
msgid ""
"\n"
"CVSROOT=drobbins@foo.bar.com:/data/cvs\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):173
msgid ""
"Here's an example of a CVSROOT that uses the RSH or SSH protocol; in this "
"example, the CVS server will attempt to access the repository on foo.bar.com "
"using the drobbins account. If the CVS_RSH environment variable is set to "
"\"ssh\", then our cvs client will attempt to use ssh to connect; otherwise "
"rsh will be used. The ssh access method is popular with those who are "
"concerned about security; however, neither the RSH or SSH method provides a "
"way for anonymous users to get the sources. In order to use this method, you "
"must have a login account at foo.bar.com."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):187
msgid "A few more things..."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):190
msgid ""
"In addition to the CVSROOT, you'll also need to know the name of the module "
"(collection of sources) that you'd like to check out, as well as an "
"anonymous password that you'll need to log in to the CVS password server. "
"Unlike anonymous ftp, there is no \"standard\" format for the anonymous "
"password, so you'll need to get the specific password from the developer web "
"site or the developers themselves. Once you have all this info, you're ready "
"to begin."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):202
msgid "Interacting with CVS, part 1"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):205
msgid ""
"Grabbing the sources is a two-stage process. First, we log in to the "
"password server. Then, we grab the sources with a <c>checkout</c> command. "
"Here's an example set of commands that can be used to check out the latest "
"Samba sources, a popular UNIX/Windows integration project:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):212
msgid "Setting up CVSROOT"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):212
#, no-wrap
msgid ""
"\n"
"# <i>export CVSROOT=:pserver:cvs@pserver.samba.org:/cvsroot</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):216
msgid ""
"This first command sets the CVSROOT environment variable. If you don't set "
"this variable, the following two commands will require an additional <c>-d :"
"pserver:cvs@pserver.samba.org:/cvsroot</c> following the <c>cvs</c> command. "
"Exporting the CVSROOT saves a us bit of typing."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):226
msgid "Interacting with CVS, part 2"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):229
msgid ""
"Here are the commands needed to get a current copy of the developer sources. "
"You may want to jump forward to the next panel to read the explanation of "
"these commands, and then jump back here:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):235
msgid "Checking out sources"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):235
#, no-wrap
msgid ""
"\n"
"# <i>cvs login</i>\n"
"(Logging in to cvs@pserver.samba.org)\n"
"CVS password: <comment>(enter password here)</comment>\n"
"\n"
"# <i>cvs -z5 co samba</i>\n"
"U samba/COPYING\n"
"U samba/Manifest\n"
"U samba/README\n"
"U samba/Read-Manifest-Now\n"
"U samba/Roadmap\n"
"U samba/WHATSNEW.txt\n"
"<comment>(this is just a snippet of the complete cvs co output)</comment>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):253
msgid "Interacting with CVS -- the explanation"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):256
msgid ""
"The first cvs command above logs us in to the pserver, and the second tells "
"our CVS client to check out (\"co\") the samba module using a gzip "
"compression level of 5 (\"-z5\") to speed up the transfer over a slow link. "
"For every new file that is created locally, cvs prints out a \"U [path]\" "
"indicating that this particular file has been updated on disk."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):267
msgid "Checkout complete"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):270
msgid ""
"Once the checkout command completes, you'll see a \"samba\" directory in "
"your current working directory that contains the latest sources. You'll also "
"notice that all the directories have a \"CVS\" directory inside them -- CVS "
"stores accounting information inside these directories, and they can safely "
"be ignored. From this point forward, we don't need to worry about having the "
"CVSROOT environment variable set nor do we need to specify it on the command "
"line because it's now cached inside all those extra \"CVS\" directories. "
"Remember -- you only need to have the CVSROOT set for the initial login and "
"checkout."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):284
msgid "Updating the sources"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):287
msgid ""
"Well, there you are -- fresh sources! Now that you have the sources, you can "
"go ahead and compile and install them, inspect them, or do whatever you like "
"with them."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):293
msgid ""
"Every now and then, you may want to bring your checked-out source directory "
"in-sync with the current version on CVS. To do this, you don't need to log "
"in to the pserver again; your authentication info is also cached by cvs "
"inside those \"CVS\" accounting directories. First, enter the main checked-"
"out directory (in this case \"samba\"), and type:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):301
msgid "Updating your sources"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):301
#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):358
#, no-wrap
msgid ""
"\n"
"# <i>cvs update -dP</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):308
msgid "Looking at \"cvs update\", part 1"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):311
msgid ""
"If there are any new files, cvs will output \"U [path]\" lines for each one "
"as it updates them. Also, if you compiled the sources, you will probably see "
"a lot of \"? [path]\" lines; these are object files that cvs notices are not "
"from the remote repository."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):321
msgid "Looking at \"cvs update\", part 2"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):324
msgid ""
"Also, notice the two command-line options we used for \"cvs update\". \"-d\" "
"tells cvs to create any new directories that may have been added to the "
"repository (this doesn't happen by default), and \"-P\" tells cvs to remove "
"any empty directories from your locally checked-out copy of the sources. \"-P"
"\" is a good idea, because cvs has a tendency to collect a lot of empty "
"(once used, but now abandoned) directory trees over time."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):333
msgid ""
"When it comes to simply grabbing the latest sources, that's about all you "
"need to know. Now, we take a look at how to interact with CVS as a developer."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):343
msgid "CVS for developers"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):345
msgid "Modifying files"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):348
msgid ""
"As a developer, you'll need to modify files on CVS. To do this, simply make "
"the appropriate changes to your local copy of the repository. The changes "
"you make to the sources are not applied to the remote repository until you "
"explictly tell cvs to \"commit\" your changes. When you've tested all your "
"modifications to ensure that they work properly and you're ready to apply "
"your changes to the repository, follow this two-step process. First, update "
"your sources by typing the following command in your main source directory:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):358
msgid "Updating sources and directories"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):365
msgid "CVS merges others' changes"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):368
msgid ""
"As we've seen earlier, \"cvs update\" will bring your sources up-to-date "
"with the current version in the repository -- but what happens to the "
"changes you've made? Don't worry, they aren't thrown away. If another "
"developer made changes to a file that you haven't touched, your local file "
"will be updated so that it's in-sync with the version on the repository."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):376
msgid ""
"And, if you modified lines 1-10 of a local file, and another developer "
"deleted lines 40-50, added 12 new lines at the end of the file, modified "
"lines 30-40 and then committed their changes to the repository before you, "
"cvs will intelligently merge these changes into your locally modified copy "
"so that none of your changes are lost. This allows two or more developers to "
"work on different parts of the same file at the same time."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):388
msgid "Merging isn't perfect"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):391
msgid ""
"However, if two or more developers have made changes to the <e>same region "
"of the same file</e>, then things get a bit more complicated. If that "
"happens, then cvs will tell you that there's been a conflict. No work will "
"be lost, but a bit of manual intervention will be required, since cvs now "
"requires your input on how to merge the conflicting changes."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):402
msgid "The commit"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):405
msgid ""
"We'll look at exactly how conflicts can be resolved in just a little bit, "
"but for now, let's assume that there are no conflicts after you typed \"cvs "
"update -dP\" -- there usually aren't. With no conflicts, your local sources "
"are up-to-date, and you're ready to commit your changes to the repository by "
"typing the following command in your main source directory:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):413
msgid "Committing changes"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):413
#, no-wrap
msgid ""
"\n"
"# <i>cvs commit</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):420
msgid "What commit does"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):423
msgid ""
"\"cvs commit\" doesn't <e>just</e> apply your changes to the repository. "
"Before actually committing your changes to the remote repository, cvs will "
"fire up your default editor so that you can type in a description of your "
"modifications. Once you've entered your comments, saved the file and exited "
"the editor, your changes (and comments) will be applied to the remote "
"repository and will be available to the other developers in your team."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):435
msgid "Viewing the log"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):438
msgid ""
"It's really easy to view the complete history of a particular file, along "
"with any comments that the developers (including you) may have made when "
"committing. To view this information, type:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):444
msgid "View log information"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):444
#, no-wrap
msgid ""
"\n"
"# <i>cvs log myfile.c</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):448
msgid ""
"The \"cvs log\" command is recursive, so if you want to see the complete log "
"for an entire directory tree, just enter the directory and type:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):453
msgid "View log information with a pager"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):453
#, no-wrap
msgid ""
"\n"
"# <i>cvs log | less</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):460
msgid "Commit options"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):463
msgid ""
"You may want to use another editor than the one cvs starts by default when "
"you type \"cvs commit\". If so, simply set the EDITOR environment variable "
"to the name of the editor you want to use. Putting a setting such as this "
"one in your <path>~/.bashrc</path> would be a good idea:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):470
msgid "Setting your editor"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):470
#, no-wrap
msgid ""
"\n"
"export EDITOR=jpico\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):474
msgid ""
"Alternatively, you can also specify a log message as a command line option "
"so that cvs doesn't need to load up an editor in the first place:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):479
msgid "Committing changes with a small log information"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):479
#, no-wrap
msgid ""
"\n"
"# <i>cvs commit -m 'I fixed a few silly bugs in portage.py'</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):486
msgid "The .cvsrc file"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):489
msgid ""
"Before we continue looking at more cvs commands, I recommend setting up a "
"<path>~/.cvsrc</path> file. By creating a <path>.cvsrc</path> file in your "
"home directory, you can tell cvs to use preferred command-line options by "
"default so that you don't have to remember to type them in each time. Here's "
"a recommended default <path>.cvsrc</path> file:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):497
msgid "Recommended defaults"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):497
#, no-wrap
msgid ""
"\n"
"cvs -q\n"
"diff -u -b -B\n"
"checkout -P\n"
"update -d -P\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):507
msgid "The .cvsrc file, continued"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):510
msgid ""
"In addition to setting useful options for a bunch of cvs commands, the first "
"line of the <path>.cvsrc</path> puts cvs into quiet mode, which has the "
"primary benefit of making the <c>cvs update</c> output more consise and "
"readable. Also, once you have this .cvsrc in place, you can type <c>cvs "
"update</c> instead of typing <c>cvs update -dP</c>."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):521
msgid "Adding a file to the repository"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):524
msgid ""
"It's really easy to add a source file to CVS. First, create the file with "
"your favorite text editor. Then, type the following:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):529
msgid "Adding a file"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):529
#, no-wrap
msgid ""
"\n"
"# <i>cvs add myfile.c</i>\n"
"cvs server: use 'cvs commit' to add this file permanently\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):534
msgid ""
"This will tell cvs to add this file to the repository the next time you do a "
"<c>cvs commit</c>. Until then, other developers won't be able to see it."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):542
msgid "Adding a directory to the repository"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):545
msgid "The process of adding a directory to CVS is similar:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):549
msgid "Adding a directory"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):549
#, no-wrap
msgid ""
"\n"
"# <i>mkdir foo</i>\n"
"# <i>cvs add foo</i>\n"
"Directory /var/cvsroot/mycode/foo added to the repository\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):555
msgid ""
"Unlike adding a file, when you add a directory it appears on the repository "
"immediately; a cvs commit isn't required. Once you add a local directory to "
"cvs, you'll notice that a \"CVS\" directory will be created inside it to "
"serve as a container for cvs accounting data. Thus, you can easily tell if a "
"particluar directory has been added to cvs by looking inside it for a \"CVS"
"\" directory."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):566
msgid "\"cvs add\" notes"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):569
msgid ""
"Oh, and as you might guess, before you add a file or directory to the "
"repository, you must make sure that its parent directory has already been "
"added to CVS. Otherwise, you'll get an error that looks like this:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):575
msgid "Adding a file, but receive a failure"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):575
#, no-wrap
msgid ""
"\n"
"# <i>cvs add myfile.c</i>\n"
"cvs add: cannot open CVS/Entries for reading: No such file or directory\n"
"cvs [add aborted]: no repository\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):584
msgid "Getting familiar with \"cvs update\", part 1"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):587
msgid ""
"Before we take a look at how to resolve conflicts, let's get familiar with "
"the output of the \"cvs update\" command. If you created a ~/.cvsrc file "
"that contains a \"cvs -q\" line, you'll find \"cvs update\" output a lot "
"easier to read. \"cvs update\" informs you of what it does and sees by "
"printing out a single character, a space, and a filename; as an example:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):595
msgid "Updating CVS"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):595
#, no-wrap
msgid ""
"\n"
"# <i>cvs update -dP</i>\n"
"? distfiles\n"
"? packages\n"
"? profiles\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):605
msgid "Getting familiar with \"cvs update\", part 2"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):608
msgid ""
"\"cvs update\" uses the \"?\" character to tell you that it doesn't know "
"anything about these particular files that it finds in the local copy of "
"your repository. They're not officially part of the repository, nor have "
"they been scheduled for addition. Here's a list of all the other single-"
"character informational messages that CVS uses:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):616
msgid "Informational message: U"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):616
#, no-wrap
msgid ""
"\n"
"U [path]\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):620
msgid ""
"Used when a new file is created in your local repository, or an untouched "
"(by you) file has been updated."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):625
msgid "Informational message: A"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):625
#, no-wrap
msgid ""
"\n"
"A [path]\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):629
msgid ""
"This file is scheduled for addition and will be officially added to the "
"repository when you do a <c>cvs commit</c>."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):637
msgid "Getting familiar with \"cvs update\", part 3"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):640
msgid "Informational message: R"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):640
#, no-wrap
msgid ""
"\n"
"R [path]\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):644
msgid ""
"Like \"A\", an \"R\" lets you know that this file is scheduled for removal. "
"The file will be removed from the repository as soon as you <c>cvs commit</"
"c>."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):649
msgid "Informational message: M"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):649
#, no-wrap
msgid ""
"\n"
"M [path]\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):653
msgid ""
"This means that this file has been modified by you; additionally, it's "
"possible that new changes from the repository were merged into this file "
"successfully."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):658
msgid "Informational message: C"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):658
#, no-wrap
msgid ""
"\n"
"C [path]\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):662
msgid ""
"The \"C\" character indicates that this file has a conflict and requires "
"manual fixing before you can \"cvs commit\" your changes."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):670
msgid "Resolving conflicts intro"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):673
msgid ""
"Now, let's take a look at how to resolve a conflict. I'm very involved in "
"the Gentoo Linux project, and we have our own cvs server set up at cvs."
"gentoo.org. We developers spend most of our time hacking away at the sources "
"inside the \"gentoo-x86\" module. Inside the gentoo-x86 module, we have a "
"file called \"ChangeLog\" that houses (you guessed it) a description of the "
"major changes we make to the files in the repository."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):685
msgid "An example conflict"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):688
msgid ""
"Because this file is modified nearly every time a developer makes a major "
"change to CVS, it's a primary source of conflicts -- here's an example "
"conflict. Let's say I add the following lines to the top of the ChangeLog:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):695
#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):778
msgid "ChangeLog entry"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):695
#, no-wrap
msgid ""
"\n"
"date 25 Feb 2001\n"
"\n"
"This is the thing I added myself\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):701
msgid ""
"However, let's say that before I'm able to commit these three new lines, "
"another developer adds these lines to the top of the ChangeLog and commits "
"their changes:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):707
msgid "ChangeLog entry 2"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):707
#, no-wrap
msgid ""
"\n"
"date 25 Feb 2001\n"
"\n"
"This is the part added by another developer\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):717
msgid "An example conflict, continued"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):720
msgid ""
"Now, when I run <c>cvs update -dP</c> (as you should before every commit), "
"cvs isn't able to merge the changes into my local copy of ChangeLog because "
"we both have added lines to the exact same part of the file -- how is cvs to "
"know which version to use? So, I get the following error from CVS:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):727
msgid "CVS error"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):727
#, no-wrap
msgid ""
"\n"
"RCS file: /var/cvsroot/gentoo-x86/ChangeLog,v\n"
"retrieving revision 1.362\n"
"retrieving revision 1.363\n"
"Merging differences between 1.362 and 1.363 into ChangeLog\n"
"rcsmerge: warning: conflicts during merge\n"
"cvs server: conflicts found in ChangeLog\n"
"C ChangeLog\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):740
msgid "Conflict resolution, part 1"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):743
msgid ""
"Argh -- a conflict! Fortunately, fixing conflicts is easy. If I fire up my "
"favorite text editor, I see the following text at the top of the ChangeLog "
"file:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):749
msgid "ChangeLog conflict"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):749
#, no-wrap
msgid ""
"\n"
"&lt;&lt;&lt;&lt;&lt;&lt;&lt; ChangeLog\n"
"date 25 Feb 2001\n"
"\n"
"This is the thing I added myself\n"
"\n"
"=======\n"
"date 25 Feb 2001\n"
"\n"
"This is the part added by another developer\n"
"\n"
"&gt;&gt;&gt;&gt;&gt;&gt;&gt; 1.363\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):767
msgid "Conflict resolution, part 2"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):770
msgid ""
"Instead of choosing one version over the other, cvs has added both versions "
"to the ChangeLog file, and surrounded them with special separators to "
"clearly mark the conflict in question. Now, it's up to me to replace this "
"region with the text that <e>should</e> appear in ChangeLog; in this case, "
"the replacement text is neither one or the other version but a combination "
"of both:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):778
#, no-wrap
msgid ""
"\n"
"date 25 Feb 2001\n"
"\n"
"This is the thing I added myself\n"
"\n"
"This is the part added by another developer\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):786
msgid ""
"Now that I've replaced the conflicting region of the file with the "
"appropriate text (and removed the \"=======\", etc markers), I can now "
"commit my changes to cvs without any problems."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):795
msgid "Conflict resolution tips"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):798
msgid ""
"Whenever you need to edit a file for conflicts, make sure that you scan the "
"entire file so that you catch all of them; if you forget to address a "
"particular conflict, cvs won't allow you to commit until it's resolved! It's "
"also obviously very important to remove the special markers that cvs added "
"to the conflicting file. Another tip -- if you make a mistake while fixing "
"the conflict and then (\"D'oh!\") accidentally save your changes, you can "
"find an original copy of your version in the file \".#filename.version\"."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):811
#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):821
msgid "Removing a file"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):814
msgid ""
"Now, it's time to learn our final CVS skill -- removing files from the "
"repository. Removing a file is a two-stage process. First, delete the file "
"from your local copy of the sources, and then execute the appropriate <c>cvs "
"remove</c> command:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):821
#, no-wrap
msgid ""
"\n"
"# <i>rm myoldfile.c</i>\n"
"# <i>cvs remove myoldfile.c</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):829
msgid "Removing a file, continued"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):832
msgid ""
"The file will then be scheduled for removal from the repository the next "
"time you do a commit. Once committed, the file will be officially deleted "
"from the current version of the repository. However, cvs won't throw this "
"file away, and will still keep a complete record of its contents and its "
"history, just in case you need it back in the future. This is just one of "
"the many ways that cvs protects your valuable source code."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):841
msgid ""
"<c>cvs remove</c> is recursive, which means that you can delete a bunch of "
"files, and then run the <c>cvs remove</c> command with no other arguments "
"from a parent directory. Doing this will cause all of the deleted files to "
"be tagged for removal at the next commit."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):851
#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):859
#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):882
msgid "Removing a directory"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):854
msgid ""
"If you'd like to remove an entire directory, I recommend the following "
"process. First, physically delete and \"cvs remove\" all files in the "
"directory:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):859
#, no-wrap
msgid ""
"\n"
"# <i>rm *.c</i>\n"
"# <i>cvs remove</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):867
msgid "Removing a directory, continued"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):870
msgid "Then, perform a commit:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):874
msgid "Commit your changes"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):874
#, no-wrap
msgid ""
"\n"
"# cvs commit\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):878
msgid ""
"Here comes the trick. Perform the following steps to delete the directory:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):882
#, no-wrap
msgid ""
"\n"
"# <i>cd ..</i>\n"
"# <i>cvs remove mydir</i>\n"
"# <i>rm -rf mydir</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):888
msgid ""
"Notice that removing the directory didn't require another commit -- "
"directories are added to and removed from the repository in real-time."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):896
msgid "Retrieving an older version"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):899
msgid ""
"CVS wouldn't be a good versioning system if you can't retrieve older "
"versions from the repository. You can pull back files based on a specific "
"date, but of course also on the revision number. The next example pulls back "
"revision 1.202 of <path>filename</path> and overwrites the current "
"<path>filename</path> with this version:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre:caption):907
msgid "Retrieving a file based on the revision number"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(pre):907
#, no-wrap
msgid ""
"\n"
"$ <i>cvs update -p -r 1.202 filename &gt; filename</i>\n"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):911
msgid ""
"If you want to pull back files based on their date, use the <c>-D</c> "
"argument. You can use entire date/timestamps, but also relative names such "
"as <e>yesterday</e> or <e>last week</e>."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):920
msgid "Complete!"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):923
msgid ""
"Your introduction to CVS is complete -- I hope that this tutorial has been "
"helpful. There's much more to CVS than I've been able to cover in this "
"introductory tutorial, but thankfully there are a bunch of great CVS "
"resources you can use to further expand your CVS knowledge:"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(li):931
msgid ""
"<uri>http://www.cvshome.org</uri> is the home of CVS development, and offers "
"a bunch of documentation on CVS, including the <uri link=\"http://www."
"cvshome.org/docs/manual\">official CVS documentation online</uri>"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(li):937
msgid ""
"The <uri link=\"http://www.durak.org/cvswebsites/\">CVS Version Control for "
"Web Site Projects site</uri> has good info on how to use CVS for developing "
"web sites"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(li):942
msgid ""
"Karl Fogel has written a book called <uri link=\"http://cvsbook.red-bean.com/"
"\">Open Source Development with CVS</uri>. A number of chapters are "
"available for free from the website."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(li):947
msgid ""
"<uri link=\"http://www.freebsd.org/projects/cvsweb.html\">cvsweb</uri> is a "
"really great CGI script that provides a web interface to your CVS "
"repository; excellent for browsing."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(li):952
msgid ""
"The <uri link=\"http://www.loria.fr/~molli/cvs-index.html\">CVS Bubbles</"
"uri> site has a bunch of good resources including a CVS FAQ-o-matic."
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):961
msgid "About this document"
msgstr ""

#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(p):964
msgid ""
"The original version of this article was first published on IBM "
"developerWorks, and is property of Westtech Information Services. This "
"document is an updated version of the original article, and contains various "
"improvements made by the Gentoo Linux documentation team."
msgstr ""

#. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL
#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(None):0
msgid "translator-credits"
msgstr ""