#: ../en/book/appa-quickstart.xml:3 #, fuzzy #| msgid "Subversion in Action" msgid "Subversion Quick-Start Guide" msgstr "Subversion in Action" # type: Content of: <appendix><para> #: ../en/book/appa-quickstart.xml:6 msgid "" "If you're eager to get Subversion up and running (and you enjoy learning by " "experimentation), this appendix will show you how to create a repository, " "import code, and then check it back out again as a working copy. Along the " "way, we give links to the relevant chapters of this book." msgstr "" # type: Content of: <appendix><warning><para> #: ../en/book/appa-quickstart.xml:13 msgid "" "If you're new to the entire concept of version control or to the <quote>copy-" "modify-merge</quote> model used by both CVS and Subversion, you should read " "<xref linkend=\"svn.basic\"/> before going any further." msgstr "" # type: Content of: <preface><sect1><title> #: ../en/book/appa-quickstart.xml:25 #, fuzzy #| msgid "What Is Subversion?" msgid "Installing Subversion" msgstr "Was ist Subversion?" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:27 msgid "" "Subversion is built on a portability layer called APR—the Apache " "Portable Runtime library. The APR library provides all the interfaces that " "Subversion needs to function on different operating systems: disk access, " "network access, memory management, and so on. While Subversion is able to " "use Apache as one of its network server programs, its dependence on APR " "<emphasis>does not</emphasis> mean that Apache is a required component. APR " "is a standalone library usable by any application. It does mean, however, " "that like Apache, Subversion clients and servers run on any operating system " "that the Apache <command>httpd</command> server runs on: Windows, Linux, all " "flavors of BSD, Mac OS X, NetWare, and others." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:40 msgid "" "The easiest way to get Subversion is to download a binary package built for " "your operating system. Subversion's web site (<ulink url=\"http://" "subversion.tigris.org\"/>) often has these packages available for download, " "posted by volunteers. The site usually contains graphical installer " "packages for users of Microsoft operating systems. If you run a Unix-like " "operating system, you can use your system's native package distribution " "system (RPMs, DEBs, the ports tree, etc.) to get Subversion." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:50 msgid "" "Alternatively, you can build Subversion directly from source code, though " "it's not always an easy task. (If you're not experienced at building open " "source software packages, you're probably better off downloading a binary " "distribution instead!) From the Subversion web site, download the latest " "source code release. After unpacking it, follow the instructions in the " "<filename>INSTALL</filename> file to build it. Note that a released source " "package may not contain everything you need to build a command-line client " "capable of talking to a remote repository. Starting with Subversion 1.4 and " "later, the libraries Subversion depends on (apr, apr-util, and neon) are " "distributed in a separate source package suffixed with <filename>-deps</" "filename>. These libraries are now common enough that they may already be " "installed on your system. If not, you'll need to unpack the dependency " "package into the same directory where you unpacked the main Subversion " "source. Regardless, it's possible that you may want to fetch other optional " "dependencies such as Berkeley DB and possibly Apache <command>httpd</" "command>. If you want to do a complete build, make sure you have all of the " "packages documented in the <filename>INSTALL</filename> file." msgstr "" # type: Content of: <appendix><sect1><para><footnote> #: ../en/book/appa-quickstart.xml:72 msgid "" "If you're one of those folks that likes to use bleeding-edge software, you " "can also get the Subversion source code from the Subversion repository in " "which it lives. Obviously, you'll need to already have a Subversion client " "on hand to do this. But once you do, you can check out a working copy of " "the Subversion source repository from <ulink url=\"http://svn.collab.net/" "repos/svn/trunk/\"/>: <footnote>" msgstr "" # type: Content of: <appendix><sect1><para><footnote><para> #: ../en/book/appa-quickstart.xml:79 msgid "" "Note that the URL checked out in the example ends not with <literal>svn</" "literal>, but with a subdirectory thereof called <literal>trunk</literal>. " "See our discussion of Subversion's branching and tagging model for the " "reasoning behind this." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/appa-quickstart.xml:84 ../en/book/appb-svn-for-cvs-users.xml:370 #: ../en/book/ch00-preface.xml:461 ../en/book/ch02-basic-usage.xml:583 #: ../en/book/ch02-basic-usage.xml:685 ../en/book/ch02-basic-usage.xml:2141 #: ../en/book/ch03-advanced-topics.xml:511 #: ../en/book/ch03-advanced-topics.xml:947 #: ../en/book/ch03-advanced-topics.xml:2773 #: ../en/book/ch03-advanced-topics.xml:4083 #: ../en/book/ch04-branching-and-merging.xml:1045 #: ../en/book/ch04-branching-and-merging.xml:1337 #: ../en/book/ch04-branching-and-merging.xml:1548 #: ../en/book/ch04-branching-and-merging.xml:2184 #: ../en/book/ch04-branching-and-merging.xml:2900 #: ../en/book/ch05-repository-admin.xml:231 #: ../en/book/ch05-repository-admin.xml:264 #: ../en/book/ch06-server-configuration.xml:1184 #: ../en/book/ch06-server-configuration.xml:1989 #: ../en/book/ch06-server-configuration.xml:2959 #: ../en/book/ch07-customizing-svn.xml:1159 #: ../en/book/ch08-embedding-svn.xml:760 ../en/book/ch09-reference.xml:9211 msgid "</footnote>" msgstr "</footnote>" # type: Content of: <chapter><sect1><screen> #: ../en/book/appa-quickstart.xml:87 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.collab.net/repos/svn/trunk subv\n" #| "A subv/Makefile.in\n" #| "A subv/ac-helpers\n" #| "A subv/ac-helpers/install.sh\n" #| "A subv/ac-helpers/install-sh\n" #| "A subv/build.conf\n" #| "…\n" #| "Checked out revision 8810.\n" msgid "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk subversion\n" "A subversion/HACKING\n" "A subversion/INSTALL\n" "A subversion/README\n" "A subversion/autogen.sh\n" "A subversion/build.conf\n" "…\n" msgstr "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk subv\n" "A subv/Makefile.in\n" "A subv/ac-helpers\n" "A subv/ac-helpers/install.sh\n" "A subv/ac-helpers/install-sh\n" "A subv/build.conf\n" "…\n" "Checked out revision 8810.\n" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:97 msgid "" "The preceding command will create a working copy of the latest (unreleased) " "Subversion source code into a subdirectory named <filename>subversion</" "filename> in your current working directory. You can adjust that last " "argument as you see fit. Regardless of what you call the new working copy " "directory, though, after this operation completes, you will now have the " "Subversion source code. Of course, you will still need to fetch a few " "helper libraries (apr, apr-util, etc.)—see the <filename>INSTALL</" "filename> file in the top level of the working copy for details." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appa-quickstart.xml:115 msgid "High-Speed Tutorial" msgstr "" # type: Content of: <appendix><sect1><blockquote><para> #: ../en/book/appa-quickstart.xml:118 msgid "" "<quote>Please make sure your seat backs are in their full, upright position " "and that your tray tables are stored. Flight attendants, prepare for take-" "off….</quote>" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:123 msgid "" "What follows is a quick tutorial that walks you through some basic " "Subversion configuration and operation. When you finish it, you should have " "a general understanding of Subversion's typical usage." msgstr "" # type: Content of: <appendix><sect1><note><para> #: ../en/book/appa-quickstart.xml:129 msgid "" "The examples used in this appendix assume that you have <command>svn</" "command>, the Subversion command-line client, and <command>svnadmin</" "command>, the administrative tool, ready to go on a Unix-like operating " "system. (This tutorial also works at the Windows command-line prompt, " "assuming you make some obvious tweaks.) We also assume you are using " "Subversion 1.2 or later (run <userinput>svn --version</userinput> to check.)" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:139 msgid "" "Subversion stores all versioned data in a central repository. To begin, " "create a new repository:" msgstr "" # type: Content of: <appendix><sect1><screen> #: ../en/book/appa-quickstart.xml:142 #, no-wrap msgid "" "\n" "$ svnadmin create /var/svn/repos\n" "$ ls /var/svn/repos\n" "conf/ dav/ db/ format hooks/ locks/ README.txt\n" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:148 msgid "" "This command creates a new directory, <filename>/var/svn/repos</filename>, " "which contains a Subversion repository. This new directory contains (among " "other things) a collection of database files. You won't see your versioned " "files if you peek inside. For more information about repository creation " "and maintenance, see <xref linkend=\"svn.reposadmin\"/>." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:156 msgid "" "Subversion has no concept of a <quote>project.</quote> The repository is " "just a virtual versioned filesystem, a large tree that can hold anything you " "wish. Some administrators prefer to store only one project in a repository, " "and others prefer to store multiple projects in a repository by placing them " "into separate directories. We discuss the merits of each approach in <xref " "linkend=\"svn.reposadmin.projects.chooselayout\"/>. Either way, the " "repository manages only files and directories, so it's up to humans to " "interpret particular directories as <quote>projects.</quote> So while you " "might see references to projects throughout this book, keep in mind that " "we're only ever talking about some directory (or collection of directories) " "in the repository." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:170 msgid "" "In this example, we assume you already have some sort of project (a " "collection of files and directories) that you wish to import into your newly " "created Subversion repository. Begin by organizing your data into a single " "directory called <filename>myproject</filename> (or whatever you wish). For " "reasons explained in <xref linkend=\"svn.branchmerge\"/>, your project's " "tree structure should contain three top-level directories named " "<filename>branches</filename>, <filename>tags</filename>, and " "<filename>trunk</filename>. The <filename>trunk</filename> directory should " "contain all of your data, and the <filename>branches</filename> and " "<filename>tags</filename> directories should be empty:" msgstr "" # type: Content of: <appendix><sect1><screen> #: ../en/book/appa-quickstart.xml:183 #, no-wrap msgid "" "\n" "/tmp/myproject/branches/\n" "/tmp/myproject/tags/\n" "/tmp/myproject/trunk/\n" " foo.c\n" " bar.c\n" " Makefile\n" " …\n" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:193 msgid "" "The <filename>branches</filename>, <filename>tags</filename>, and " "<filename>trunk</filename> subdirectories aren't actually required by " "Subversion. They're merely a popular convention that you'll most likely " "want to use later on." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:198 msgid "" "Once you have your tree of data ready to go, import it into the repository " "with the <command>svn import</command> command (see <xref linkend=\"svn.tour." "importing\"/>):" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/appa-quickstart.xml:202 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svnadmin create /var/svn/newrepos\n" #| "$ svn import mytree file:///var/svn/newrepos/some/project \\\n" #| " -m \"Initial import\"\n" #| "Adding mytree/foo.c\n" #| "Adding mytree/bar.c\n" #| "Adding mytree/subdir\n" #| "Adding mytree/subdir/quux.h\n" #| "\n" #| "Committed revision 1.\n" msgid "" "\n" "$ svn import /tmp/myproject file:///var/svn/repos/myproject -m \"initial import\"\n" "Adding /tmp/myproject/branches\n" "Adding /tmp/myproject/tags\n" "Adding /tmp/myproject/trunk\n" "Adding /tmp/myproject/trunk/foo.c\n" "Adding /tmp/myproject/trunk/bar.c\n" "Adding /tmp/myproject/trunk/Makefile\n" "…\n" "Committed revision 1.\n" "$ \n" msgstr "" "\n" "$ svnadmin create /var/svn/newrepos\n" "$ svn import mytree file:///var/svn/newrepos/some/project \\\n" " -m \"Initial import\"\n" "Adding mytree/foo.c\n" "Adding mytree/bar.c\n" "Adding mytree/subdir\n" "Adding mytree/subdir/quux.h\n" "\n" "Committed revision 1.\n" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:215 msgid "" "Now the repository contains this tree of data. As mentioned earlier, you " "won't see your files by directly peeking into the repository; they're all " "stored within a database. But the repository's imaginary filesystem now " "contains a top-level directory named <filename>myproject</filename>, which " "in turn contains your data." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:222 msgid "" "Note that the original <filename>/tmp/myproject</filename> directory is " "unchanged; Subversion is unaware of it. (In fact, you can even delete that " "directory if you wish.) To start manipulating repository data, you need to " "create a new <quote>working copy</quote> of the data, a sort of private " "workspace. Ask Subversion to <quote>check out</quote> a working copy of the " "<filename>myproject/trunk</filename> directory in the repository:" msgstr "" # type: Content of: <appendix><sect1><screen> #: ../en/book/appa-quickstart.xml:231 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos/myproject/trunk myproject\n" "A myproject/foo.c\n" "A myproject/bar.c\n" "A myproject/Makefile\n" "…\n" "Checked out revision 1.\n" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:240 msgid "" "Now you have a personal copy of part of the repository in a new directory " "named <filename>myproject</filename>. You can edit the files in your " "working copy and then commit those changes back into the repository." msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appa-quickstart.xml:247 msgid "Enter your working copy and edit a file's contents." msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appa-quickstart.xml:251 msgid "" "Run <userinput>svn diff</userinput> to see unified diff output of your " "changes." msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appa-quickstart.xml:255 msgid "" "Run <userinput>svn commit</userinput> to commit the new version of your file " "to the repository." msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appa-quickstart.xml:259 msgid "" "Run <userinput>svn update</userinput> to bring your working copy <quote>up " "to date</quote> with the repository." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:264 msgid "" "For a full tour of all the things you can do with your working copy, read " "<xref linkend=\"svn.tour\"/>." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:267 msgid "" "At this point, you have the option of making your repository available to " "others over a network. See <xref linkend=\"svn.serverconfig\"/> to learn " "about the different sorts of server processes available and how to configure " "them." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/appb-svn-for-cvs-users.xml:2 #, fuzzy #| msgid "Subversion Repository URLs" msgid "Subversion for CVS Users" msgstr "Subversion-Repository-URLs" # type: Content of: <appendix><para> #: ../en/book/appb-svn-for-cvs-users.xml:4 msgid "" "This appendix is a guide for CVS users new to Subversion. It's essentially " "a list of differences between the two systems as <quote>viewed from 10,000 " "feet.</quote> For each section, we provide references to relevant chapters " "when possible." msgstr "" # type: Content of: <appendix><para> #: ../en/book/appb-svn-for-cvs-users.xml:10 msgid "" "Although the goal of Subversion is to take over the current and future CVS " "user base, some new features and design changes were required to fix certain " "<quote>broken</quote> behaviors that CVS had. This means that, as a CVS " "user, you may need to break habits—ones that you forgot were odd to " "begin with." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:22 msgid "Revision Numbers Are Different Now" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:24 msgid "" "In CVS, revision numbers are per file. This is because CVS stores its data " "in RCS files; each file has a corresponding RCS file in the repository, and " "the repository is roughly laid out according to the structure of your " "project tree." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:29 msgid "" "In Subversion, the repository looks like a single filesystem. Each commit " "results in an entirely new filesystem tree; in essence, the repository is an " "array of trees. Each of these trees is labeled with a single revision " "number. When someone talks about <quote>revision 54</quote>, he's talking " "about a particular tree (and indirectly, the way the filesystem looked after " "the 54th commit)." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:37 msgid "" "Technically, it's not valid to talk about <quote>revision 5 of <filename>foo." "c</filename>.</quote> Instead, one would say <quote><filename>foo.c</" "filename> as it appears in revision 5.</quote> Also, be careful when making " "assumptions about the evolution of a file. In CVS, revisions 5 and 6 of " "<filename>foo.c</filename> are always different. In Subversion, it's most " "likely that <filename>foo.c</filename> did <emphasis>not</emphasis> change " "between revisions 5 and 6." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:47 msgid "" "Similarly, in CVS, a tag or branch is an annotation on the file or on the " "version information for that individual file, whereas in Subversion, a tag " "or branch is a copy of an entire tree (by convention, into the <filename>/" "branches</filename> or <filename>/tags</filename> directories that appear at " "the top level of the repository, beside <filename>/trunk</filename>). In the " "repository as a whole, many versions of each file may be visible: the latest " "version on each branch, every tagged version, and of course the latest " "version on the trunk itself. So, to refine the terms even further, one would " "often say <quote><filename>foo.c</filename> as it appears in <filename>/" "branches/REL1</filename> in revision 5.</quote>" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:61 msgid "" "For more details on this topic, see <xref linkend=\"svn.basic.in-action.revs" "\" />." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:70 msgid "Directory Versions" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:72 msgid "" "Subversion tracks tree structures, not just file contents. It's one of the " "biggest reasons Subversion was written to replace CVS." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:76 msgid "Here's what this means to you, as a former CVS user:" msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:80 msgid "" "The <command>svn add</command> and <command>svn delete</command> commands " "work on directories now, just as they work on files. So do <command>svn " "copy</command> and <command>svn move</command>. However, these commands do " "<emphasis>not</emphasis> cause any kind of immediate change in the " "repository. Instead, the working items are simply <quote>scheduled</quote> " "for addition or deletion. No repository changes happen until you run " "<userinput>svn commit</userinput>." msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:91 msgid "" "Directories aren't dumb containers anymore; they have revision numbers like " "files. (Or more properly, it's correct to talk about <quote>directory " "<filename>foo/</filename> in revision 5.</quote>)" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:98 msgid "" "Let's talk more about that last point. Directory versioning is a hard " "problem; because we want to allow mixed-revision working copies, there are " "some limitations on how far we can abuse this model." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:103 msgid "" "From a theoretical point of view, we define <quote>revision 5 of directory " "<filename>foo</filename></quote> to mean a specific collection of directory " "entries and properties. Now suppose we start adding and removing files from " "<filename>foo</filename>, and then commit. It would be a lie to say that we " "still have revision 5 of <filename>foo</filename>. However, if we bumped " "<filename>foo</filename>'s revision number after the commit, that would be a " "lie too; there may be other changes to <filename>foo</filename> we haven't " "yet received, because we haven't updated yet." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:115 msgid "" "Subversion deals with this problem by quietly tracking committed adds and " "deletes in the <filename>.svn</filename> area. When you eventually run " "<userinput>svn update</userinput>, all accounts are settled with the " "repository, and the directory's new revision number is set correctly. " "<emphasis>Therefore, only after an update is it truly safe to say that you " "have a <quote>perfect</quote> revision of a directory.</emphasis> Most of " "the time, your working copy will contain <quote>imperfect</quote> directory " "revisions." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:125 msgid "" "Similarly, a problem arises if you attempt to commit property changes on a " "directory. Normally, the commit would bump the working directory's local " "revision number. But again, that would be a lie, as there may be adds or " "deletes that the directory doesn't yet have, because no update has " "happened. <emphasis>Therefore, you are not allowed to commit property " "changes on a directory unless the directory is up to date.</emphasis>" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:134 msgid "" "For more discussion about the limitations of directory versioning, see <xref " "linkend=\"svn.basic.in-action.mixedrevs\"/>." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:144 msgid "More Disconnected Operations" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:146 msgid "" "In recent years, disk space has become outrageously cheap and abundant, but " "network bandwidth has not. Therefore, the Subversion working copy has been " "optimized around the scarcer resource." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:151 msgid "" "The <filename>.svn</filename> administrative directory serves the same " "purpose as the <filename>CVS</filename> directory, except that it also " "stores read-only, <quote>pristine</quote> copies of your files. This allows " "you to do many things offline:" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:160 #: ../en/book/ch02-basic-usage.xml:415 msgid "<command>svn status</command>" msgstr "<command>svn status</command>" # type: Content of: <appendix><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:162 msgid "" "Shows you any local changes you've made (see <xref linkend=\"svn.tour.cycle." "examine.status\"/>)" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:168 #: ../en/book/ch02-basic-usage.xml:418 ../en/book/ch02-basic-usage.xml:1736 msgid "<command>svn diff</command>" msgstr "<command>svn diff</command>" # type: Content of: <appendix><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:170 msgid "" "Shows you the details of your changes (see <xref linkend=\"svn.tour.cycle." "examine.diff\"/>)" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:176 #: ../en/book/ch02-basic-usage.xml:427 msgid "<command>svn revert</command>" msgstr "<command>svn revert</command>" # type: Content of: <appendix><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:178 msgid "" "Removes your local changes (see <xref linkend=\"svn.tour.cycle.revert\"/>)" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:185 msgid "" "Also, the cached pristine files allow the Subversion client to send " "differences when committing, which CVS cannot do." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:188 msgid "" "The last subcommand in the list—<command>svn revert</command>—is " "new. It will not only remove local changes, but also unschedule operations " "such as adds and deletes. Although deleting the file and then running " "<userinput>svn update</userinput> will still work, doing so distorts the " "true purpose of updating. And, while we're on this subject…" msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:203 msgid "Distinction Between Status and Update" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:205 msgid "" "Subversion attempts to erase a lot of the confusion between the <command>cvs " "status</command> and <command>cvs update</command> commands." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:209 msgid "" "The <command>cvs status</command> command has two purposes: first, to show " "the user any local modifications in the working copy, and second, to show " "the user which files are out of date. Unfortunately, because of CVS's hard-" "to-read status output, many CVS users don't take advantage of this command " "at all. Instead, they've developed a habit of running <userinput>cvs " "update</userinput> or <userinput>cvs -n update</userinput> to quickly see " "their changes. If users forget to use the <option>-n</option> option, this " "has the side effect of merging repository changes they may not be ready to " "deal with." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:221 msgid "" "Subversion removes this muddle by making the output of <command>svn status</" "command> easy to read for both humans and parsers. Also, <command>svn " "update</command> prints only information about files that are updated, " "<emphasis>not</emphasis> local modifications." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:228 #: ../en/book/ch09-reference.xml:8969 msgid "Status" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:230 msgid "" "<command>svn status</command> prints all files that have local " "modifications. By default, the repository is not contacted. While this " "subcommand accepts a fair number of options, the following are the most " "commonly used ones:" msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:237 msgid "<option>-u</option>" msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:239 msgid "" "Contact the repository to determine, and then display, out-of-dateness " "information." msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:245 msgid "<option>-v</option>" msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:247 msgid "Show <emphasis>all</emphasis> entries under version control." msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:253 msgid "<option>-N</option>" msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:255 msgid "Run nonrecursively (do not descend into subdirectories)." msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:261 msgid "" "The <command>svn status</command> command has two output formats. In the " "default <quote>short</quote> format, local modifications look like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/appb-svn-for-cvs-users.xml:265 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn status stuff/fish.c\n" #| "D stuff/fish.c\n" msgid "" "\n" "$ svn status\n" "M foo.c\n" "M bar/baz.c\n" msgstr "" "\n" "$ svn status stuff/fish.c\n" "D stuff/fish.c\n" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:271 msgid "" "If you specify the <option>--show-updates</option> (<option>-u</option>) " "option, a longer output format is used:" msgstr "" # type: Content of: <appendix><sect1><sect2><screen> #: ../en/book/appb-svn-for-cvs-users.xml:275 #, no-wrap msgid "" "\n" "$ svn status -u\n" "M 1047 foo.c\n" " * 1045 faces.html\n" " * bloo.png\n" "M 1050 bar/baz.c\n" "Status against revision: 1066\n" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:284 msgid "" "In this case, two new columns appear. The second column contains an " "asterisk if the file or directory is out of date. The third column shows " "the working copy's revision number of the item. In the previous example, " "the asterisk indicates that <filename>faces.html</filename> would be patched " "if we updated, and that <filename>bloo.png</filename> is a newly added file " "in the repository. (The absence of any revision number next to " "<filename>bloo.png</filename> means that it doesn't yet exist in the working " "copy.)" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:302 msgid "" "At this point, you should take a quick look at the list of all possible " "status codes in <xref linkend=\"svn.ref.svn.c.status\"/>. Here are a few of " "the more common status codes you'll see:" msgstr "" # type: Content of: <appendix><sect1><sect2><screen> #: ../en/book/appb-svn-for-cvs-users.xml:307 #, no-wrap msgid "" "\n" "A Resource is scheduled for Addition\n" "D Resource is scheduled for Deletion\n" "M Resource has local Modifications\n" "C Resource has Conflicts (changes have not been completely merged\n" " between the repository and working copy version)\n" "X Resource is eXternal to this working copy (may come from another\n" " repository). See <xref linkend=\"svn.advanced.externals\" />\n" "? Resource is not under version control\n" "! Resource is missing or incomplete (removed by a tool other than\n" " Subversion)\n" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:320 msgid "" "For a more detailed discussion of <command>svn status</command>, see <xref " "linkend=\"svn.tour.cycle.examine.status\" />." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:326 #: ../en/book/ch09-reference.xml:8991 msgid "Update" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:328 msgid "" "<command>svn update</command> updates your working copy, and prints only " "information about files that it updates." msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:331 msgid "" "Subversion has combined CVS's <literal>P</literal> and <literal>U</literal> " "codes into just <literal>U</literal>. When a merge or conflict occurs, " "Subversion simply prints <literal>G</literal> or <literal>C</literal>, " "rather than a whole sentence about it." msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:337 msgid "" "For a more detailed discussion of <command>svn update</command>, see <xref " "linkend=\"svn.tour.cycle.update\" />." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:348 msgid "Branches and Tags" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:350 msgid "" "Subversion doesn't distinguish between filesystem space and <quote>branch</" "quote> space; branches and tags are ordinary directories within the " "filesystem. This is probably the single biggest mental hurdle that a CVS " "user will need to cross. Read all about it in <xref linkend=\"svn." "branchmerge\"/>." msgstr "" # type: Content of: <appendix><sect1><warning><para><footnote> #: ../en/book/appb-svn-for-cvs-users.xml:358 msgid "" "Since Subversion treats branches and tags as ordinary directories, your " "project's various lines of development probably live in subdirectories of " "the main project directory. So remember to check out using the URL of the " "subdirectory that contains the particular line of development you want, not " "the project's root URL. If you make the mistake of checking out the root of " "the project, you may very well wind up with a working copy that contains a " "complete copy of your project's content for each and every one of its " "branches and tags. <footnote>" msgstr "" # type: Content of: <appendix><sect1><warning><para><footnote><para> #: ../en/book/appb-svn-for-cvs-users.xml:368 msgid "" "That is, providing you don't run out of disk space before your checkout " "finishes." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:381 msgid "Metadata Properties" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:383 msgid "" "A new feature of Subversion is that you can attach arbitrary metadata (or " "<quote>properties</quote>) to files and directories. Properties are " "arbitrary name/value pairs associated with files and directories in your " "working copy." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:389 msgid "" "To set or get a property name, use the <command>svn propset</command> and " "<command>svn propget</command> subcommands. To list all properties on an " "object, use <command>svn proplist</command>." msgstr "" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:394 #, fuzzy #| msgid "<xref linkend=\"svn.advanced\"/>" msgid "For more information, see <xref linkend=\"svn.advanced.props\"/>." msgstr "<xref linkend=\"svn.advanced\"/>" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/appb-svn-for-cvs-users.xml:402 #, fuzzy #| msgid "Postponing conflict resolution" msgid "Conflict Resolution" msgstr "Aufschieben der Konfliktauflösung" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:404 msgid "" "CVS marks conflicts with inline <quote>conflict markers,</quote> and then " "prints a <literal>C</literal> during an update or merge operation. " "Historically, this has caused problems, because CVS isn't doing enough. " "Many users forget about (or don't see) the <literal>C</literal> after it " "whizzes by on their terminal. They often forget that the conflict markers " "are even present, and then accidentally commit files containing those " "conflict markers." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:413 msgid "" "Subversion solves this problem in a pair of ways. First, when a conflict " "occurs in a file, Subversion records the fact that the file is in a state of " "conflict, and won't allow you to commit changes to that file until you " "explicitly resolve the conflict. Second, Subversion 1.5 provides " "interactive conflict resolution, which allows you to resolve conflicts as " "they happen instead of having to go back and do so after the update or merge " "operation completes. See <xref linkend=\"svn.tour.cycle.resolve\" /> for " "more about conflict resolution in Subversion." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:430 msgid "Binary Files and Translation" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:432 msgid "" "In the most general sense, Subversion handles binary files more gracefully " "than CVS does. Because CVS uses RCS, it can only store successive full " "copies of a changing binary file. Subversion, however, expresses " "differences between files using a binary differencing algorithm, regardless " "of whether they contain textual or binary data. That means all files are " "stored differentially (compressed) in the repository." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:440 msgid "" "CVS users have to mark binary files with <option>-kb</option> flags to " "prevent data from being garbled (due to keyword expansion and line-ending " "translations). They sometimes forget to do this." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:445 msgid "" "Subversion takes the more paranoid route. First, it never performs any kind " "of keyword or line-ending translation unless you explicitly ask it to do so " "(see <xref linkend=\"svn.advanced.props.special.keywords\"/> and <xref " "linkend=\"svn.advanced.props.special.eol-style\"/> for more details). By " "default, Subversion treats all file data as literal byte strings, and files " "are always stored in the repository in an untranslated state." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:454 msgid "" "Second, Subversion maintains an internal notion of whether a file is " "<quote>text</quote> or <quote>binary</quote> data, but this notion is " "<emphasis>only</emphasis> extant in the working copy. During an " "<command>svn update</command>, Subversion will perform contextual merges on " "locally modified text files, but will not attempt to do so for binary files." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:461 msgid "" "To determine whether a contextual merge is possible, Subversion examines the " "<literal>svn:mime-type</literal> property. If the file has no <literal>svn:" "mime-type</literal> property, or has a MIME type that is textual (e.g., " "<literal>text/*</literal>), Subversion assumes it is text. Otherwise, " "Subversion assumes the file is binary. Subversion also helps users by " "running a binary-detection algorithm in the <command>svn import</command> " "and <command>svn add</command> commands. These commands will make a good " "guess and then (possibly) set a binary <literal>svn:mime-type</literal> " "property on the file being added. (If Subversion guesses wrong, the user " "can always remove or hand-edit the property.)" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:482 #, fuzzy #| msgid "Versioning Models" msgid "Versioned Modules" msgstr "Versionierungsmodelle" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:484 msgid "" "Unlike CVS, a Subversion working copy is aware that it has checked out a " "module. That means if somebody changes the definition of a module (e.g., " "adds or removes components), a call to <command>svn update</command> will " "update the working copy appropriately, adding and removing components." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:490 msgid "" "Subversion defines modules as a list of directories within a directory " "property; see <xref linkend=\"svn.advanced.externals\"/>." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:500 msgid "Authentication" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:502 msgid "" "With CVS's pserver, you are required to log in to the server (using the " "<command>cvs login</command> command) before performing any read or write " "operation—you sometimes even have to log in for anonymous operations. " "With a Subversion repository using Apache <command>httpd</command> or " "<command>svnserve</command> as the server, you don't provide any " "authentication credentials at the outset—if an operation that you " "perform requires authentication, the server will challenge you for your " "credentials (whether those credentials are username and password, a client " "certificate, or even both). So if your repository is world-readable, you " "will not be required to authenticate at all for read operations." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:515 msgid "" "As with CVS, Subversion still caches your credentials on disk (in your " "<filename>~/.subversion/auth/</filename> directory) unless you tell it not " "to by using the <option>--no-auth-cache</option> option." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:520 msgid "" "The exception to this behavior, however, is in the case of accessing an " "<command>svnserve</command> server over an SSH tunnel, using the <literal>svn" "+ssh://</literal> URL scheme. In that case, the <command>ssh</command> " "program unconditionally demands authentication just to start the tunnel." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:533 msgid "Converting a Repository from CVS to Subversion" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:535 msgid "" "Perhaps the most important way to familiarize CVS users with Subversion is " "to let them continue to work on their projects using the new system. And " "while that can be somewhat accomplished using a flat import into a " "Subversion repository of an exported CVS repository, the more thorough " "solution involves transferring not just the latest snapshot of their data, " "but all the history behind it as well, from one system to another. This is " "an extremely difficult problem to solve; it involves deducing changesets in " "the absence of atomicity and translating between the systems' completely " "orthogonal branching policies, among other complications. Still, a handful " "of tools claim to at least partially support the ability to convert existing " "CVS repositories into Subversion ones." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:549 msgid "" "The most popular (and mature) conversion tool is cvs2svn (<ulink url=" "\"http://cvs2svn.tigris.org/\"/>), a Python script originally created by " "members of Subversion's own development community. This tool is meant to " "run exactly once: it scans your CVS repository multiple times and attempts " "to deduce commits, branches, and tags as best it can. When it finishes, the " "result is either a Subversion repository or a portable Subversion dump file " "representing your code's history. See the web site for detailed " "instructions and caveats." msgstr "" # type: Content of: <appendix><title> #: ../en/book/appc-webdav.xml:2 msgid "WebDAV and Autoversioning" msgstr "" # type: Content of: <appendix><para> #: ../en/book/appc-webdav.xml:4 msgid "" "WebDAV is an extension to HTTP, and it is growing more and more popular as a " "standard for file sharing. Today's operating systems are becoming extremely " "web-aware, and many now have built-in support for mounting <quote>shares</" "quote> exported by WebDAV servers." msgstr "" # type: Content of: <appendix><para> #: ../en/book/appc-webdav.xml:10 msgid "" "If you use Apache as your Subversion network server, to some extent you are " "also running a WebDAV server. This appendix gives some background on the " "nature of this protocol, how Subversion uses it, and how well Subversion " "interoperates with other software that is WebDAV-aware." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appc-webdav.xml:21 msgid "What Is WebDAV?" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:23 msgid "" "<firstterm>DAV</firstterm> stands for <quote>Distributed Authoring and " "Versioning.</quote> RFC 2518 defines a set of concepts and accompanying " "extension methods to HTTP 1.1 that make the Web a more universal read/write " "medium. The basic idea is that a WebDAV-compliant web server can act like a " "generic file server; clients can <quote>mount</quote> shared folders over " "HTTP that behave much like other network filesystems (such as NFS or SMB)." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:32 msgid "" "The tragedy, though, is that despite the acronym, the RFC specification " "doesn't actually describe any sort of version control. Basic WebDAV clients " "and servers assume that only one version of each file or directory exists, " "and that it can be repeatedly overwritten." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:38 msgid "" "Because RFC 2518 left out versioning concepts, another committee was left " "with the responsibility of writing RFC 3253 a few years later. The new RFC " "adds versioning concepts to WebDAV, placing the <quote>V</quote> back in " "<quote>DAV</quote>—hence the term <quote>DeltaV.</quote> WebDAV/DeltaV " "clients and servers are often called just <quote>DeltaV</quote> programs, " "since DeltaV implies the existence of basic WebDAV." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:47 msgid "" "The original WebDAV standard has been widely successful. Every modern " "computer operating system has a general WebDAV client built in (details to " "follow), and a number of popular standalone applications are also able to " "speak WebDAV—Microsoft Office, Dreamweaver, and Photoshop, to name a " "few. On the server end, Apache HTTP Server has been able to provide WebDAV " "services since 1998 and is considered the de facto open source standard. " "Several other commercial WebDAV servers are available, including Microsoft's " "own IIS." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:58 msgid "" "DeltaV, unfortunately, has not been so successful. It's very difficult to " "find any DeltaV clients or servers. The few that do exist are relatively " "unknown commercial products, and thus it's very difficult to test " "interoperability. It's not entirely clear as to why DeltaV has remained " "stagnant. Some opine that the specification is just too complex. Others " "argue that while WebDAV's features have mass appeal (even the least " "technical users appreciate network file sharing), its version control " "features just aren't interesting or necessary for most users. Finally, some " "believe that DeltaV remains unpopular because there's still no open source " "server product that implements it well." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:71 msgid "" "When Subversion was still in its design phase, it seemed like a great idea " "to use Apache as a network server. It already had a module to provide " "WebDAV services. DeltaV was a relatively new specification. The hope was " "that the Subversion server module (<command>mod_dav_svn</command>) would " "eventually evolve into an open source DeltaV reference implementation. " "Unfortunately, DeltaV has a very specific versioning model that doesn't " "quite line up with Subversion's model. Some concepts were mappable; others " "were not." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:81 msgid "What does this mean, then?" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:83 msgid "" "First, the Subversion client is not a fully implemented DeltaV client. It " "needs certain types of things from the server that DeltaV itself cannot " "provide, and thus is largely dependent on a number of Subversion-specific " "HTTP <literal>REPORT</literal> requests that only <command>mod_dav_svn</" "command> understands." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:90 msgid "" "Second, <command>mod_dav_svn</command> is not a fully realized DeltaV " "server. Many portions of the DeltaV specification were irrelevant to " "Subversion, and thus were left unimplemented." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:95 msgid "" "There is still some debate in the developer community as to whether or not " "it's worthwhile to remedy either of these situations. It's fairly " "unrealistic to change Subversion's design to match DeltaV, so there's " "probably no way the client can ever learn to get everything it needs from a " "general DeltaV server. On the other hand, <command>mod_dav_svn</command> " "<emphasis>could</emphasis> be further developed to implement all of DeltaV, " "but it's hard to find motivation to do so—there are almost no DeltaV " "clients to interoperate with." msgstr "" # type: Content of: <preface><sect1><sect2><para><indexterm><primary> #: ../en/book/appc-webdav.xml:112 #, fuzzy #| msgid "Subversion" msgid "Autoversioning" msgstr "Subversion" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:114 msgid "" "While the Subversion client is not a full DeltaV client, and the Subversion " "server is not a full DeltaV server, there's still a glimmer of WebDAV " "interoperability to be happy about: <firstterm>autoversioning</firstterm>." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:119 msgid "" "Autoversioning is an optional feature defined in the DeltaV standard. A " "typical DeltaV server will reject an ignorant WebDAV client attempting to do " "a <literal>PUT</literal> to a file that's under version control. To change " "a version-controlled file, the server expects a series of proper versioning " "requests: something like <literal>MKACTIVITY</literal>, <literal>CHECKOUT</" "literal>, <literal>PUT</literal>, <literal>CHECKIN</literal>. But if the " "DeltaV server supports autoversioning, write requests from basic WebDAV " "clients are accepted. The server behaves as though the client " "<emphasis>had</emphasis> issued the proper series of versioning requests, " "performing a commit under the hood. In other words, it allows a DeltaV " "server to interoperate with ordinary WebDAV clients that don't understand " "versioning." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:134 msgid "" "Because so many operating systems already have integrated WebDAV clients, " "the use case for this feature can be incredibly appealing to administrators " "working with non-technical users. Imagine an office of ordinary users " "running Microsoft Windows or Mac OS. Each user <quote>mounts</quote> the " "Subversion repository, which appears to be an ordinary network folder. They " "use the shared folder as they always do: open files, edit them, and save " "them. Meanwhile, the server is automatically versioning everything. Any " "administrator (or knowledgeable user) can still use a Subversion client to " "search history and retrieve older versions of data." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:146 msgid "" "This scenario isn't fiction—it's real and it works, as of Subversion " "1.2 and later. To activate autoversioning in <command>mod_dav_svn</" "command>, use the <literal>SVNAutoversioning</literal> directive within the " "<filename>httpd.conf</filename> <literal>Location</literal> block, like so:" msgstr "" # type: Content of: <appendix><sect1><screen> #: ../en/book/appc-webdav.xml:153 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNPath /var/svn/repository\n" " SVNAutoversioning on\n" "</Location>\n" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:161 msgid "" "When Subversion autoversioning is active, write requests from WebDAV clients " "result in automatic commits. A generic log message is automatically " "generated and attached to each revision." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:166 msgid "" "Before activating this feature, however, understand what you're getting " "into. WebDAV clients tend to do <emphasis>many</emphasis> write requests, " "resulting in a huge number of automatically committed revisions. For " "example, when saving data, many clients will do a <literal>PUT</literal> of " "a 0-byte file (as a way of reserving a name) followed by another " "<literal>PUT</literal> with the real file data. The single file-write " "results in two separate commits. Also consider that many applications auto-" "save every few minutes, resulting in even more commits." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:177 msgid "" "If you have a post-commit hook program that sends email, you may want to " "disable email generation either altogether or on certain sections of the " "repository; it depends on whether you think the influx of emails will still " "prove to be valuable notifications or not. Also, a smart post-commit hook " "program can distinguish between a transaction created via autoversioning and " "one created through a normal Subversion commit operation. The trick is to " "look for a revision property named <literal>svn:autoversioned</literal>. If " "present, the commit was made by a generic WebDAV client." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:188 msgid "" "Another feature that may be a useful complement for Subversion's " "autoversioning comes from Apache's <literal>mod_mime</literal> module. If a " "WebDAV client adds a new file to the repository, there's no opportunity for " "the user to set the the <literal>svn:mime-type</literal> property. This " "might cause the file to appear as a generic icon when viewed within a WebDAV " "shared folder, not having an association with any application. One remedy " "is to have a sysadmin (or other Subversion-knowledgeable person) check out a " "working copy and manually set the <literal>svn:mime-type</literal> property " "on necessary files. But there's potentially no end to such cleanup tasks. " "Instead, you can use the <literal>ModMimeUsePathInfo</literal> directive in " "your Subversion <literal><Location></literal> block:" msgstr "" # type: Content of: <appendix><sect1><screen> #: ../en/book/appc-webdav.xml:203 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNPath /var/svn/repository\n" " SVNAutoversioning on\n" "\n" " ModMimeUsePathInfo on\n" "\n" "</Location>\n" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:214 msgid "" "This directive allows <literal>mod_mime</literal> to attempt automatic " "deduction of the MIME type on new files that enter the repository via " "autoversioning. The module looks at the file's named extension and possibly " "the contents as well; if the file matches some common patterns, the file's " "<literal>svn:mime-type</literal> property will be set automatically." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appc-webdav.xml:228 msgid "Client Interoperability" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:230 msgid "" "All WebDAV clients fall into one of three categories—standalone " "applications, file-explorer extensions, or filesystem implementations. " "These categories broadly define the types of WebDAV functionality available " "to users. <xref linkend=\"svn.webdav.clients.tbl-1\"/> gives our " "categorization as well as a quick description of some common pieces of " "WebDAV-enabled software. You can find more details about these software " "offerings, as well as their general category, in the sections that follow." msgstr "" # type: Content of: <appendix><sect1><table><title> #: ../en/book/appc-webdav.xml:241 msgid "Common WebDAV clients" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><thead><row><entry> #: ../en/book/appc-webdav.xml:245 msgid "Software" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><thead><row><entry> #: ../en/book/appc-webdav.xml:246 msgid "Type" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><thead><row><entry> #: ../en/book/appc-webdav.xml:247 msgid "Windows" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><thead><row><entry> #: ../en/book/appc-webdav.xml:248 msgid "Mac" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><thead><row><entry> #: ../en/book/appc-webdav.xml:249 msgid "Linux" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/appc-webdav.xml:250 ../en/book/ch09-reference.xml:731 #: ../en/book/ch09-reference.xml:840 ../en/book/ch09-reference.xml:976 #: ../en/book/ch09-reference.xml:1057 ../en/book/ch09-reference.xml:1151 #: ../en/book/ch09-reference.xml:1298 ../en/book/ch09-reference.xml:1375 #: ../en/book/ch09-reference.xml:1516 ../en/book/ch09-reference.xml:1721 #: ../en/book/ch09-reference.xml:1835 ../en/book/ch09-reference.xml:2158 #: ../en/book/ch09-reference.xml:2272 ../en/book/ch09-reference.xml:2322 #: ../en/book/ch09-reference.xml:2429 ../en/book/ch09-reference.xml:2615 #: ../en/book/ch09-reference.xml:2758 ../en/book/ch09-reference.xml:2852 #: ../en/book/ch09-reference.xml:3164 ../en/book/ch09-reference.xml:3310 #: ../en/book/ch09-reference.xml:3383 ../en/book/ch09-reference.xml:3466 #: ../en/book/ch09-reference.xml:3596 ../en/book/ch09-reference.xml:3675 #: ../en/book/ch09-reference.xml:3752 ../en/book/ch09-reference.xml:3850 #: ../en/book/ch09-reference.xml:3954 ../en/book/ch09-reference.xml:4090 #: ../en/book/ch09-reference.xml:4222 ../en/book/ch09-reference.xml:4316 #: ../en/book/ch09-reference.xml:4428 ../en/book/ch09-reference.xml:4875 #: ../en/book/ch09-reference.xml:5068 ../en/book/ch09-reference.xml:5156 #: ../en/book/ch09-reference.xml:5523 ../en/book/ch09-reference.xml:5571 #: ../en/book/ch09-reference.xml:5650 ../en/book/ch09-reference.xml:5690 #: ../en/book/ch09-reference.xml:5792 ../en/book/ch09-reference.xml:5824 #: ../en/book/ch09-reference.xml:5877 ../en/book/ch09-reference.xml:5910 #: ../en/book/ch09-reference.xml:5958 ../en/book/ch09-reference.xml:6024 #: ../en/book/ch09-reference.xml:6078 ../en/book/ch09-reference.xml:6124 #: ../en/book/ch09-reference.xml:6201 ../en/book/ch09-reference.xml:6246 #: ../en/book/ch09-reference.xml:6301 ../en/book/ch09-reference.xml:6362 #: ../en/book/ch09-reference.xml:6418 ../en/book/ch09-reference.xml:6473 #: ../en/book/ch09-reference.xml:6540 ../en/book/ch09-reference.xml:6712 #: ../en/book/ch09-reference.xml:6758 ../en/book/ch09-reference.xml:6816 #: ../en/book/ch09-reference.xml:6940 ../en/book/ch09-reference.xml:6986 #: ../en/book/ch09-reference.xml:7058 ../en/book/ch09-reference.xml:7104 #: ../en/book/ch09-reference.xml:7144 ../en/book/ch09-reference.xml:7207 #: ../en/book/ch09-reference.xml:7258 ../en/book/ch09-reference.xml:7310 #: ../en/book/ch09-reference.xml:7356 ../en/book/ch09-reference.xml:7411 #: ../en/book/ch09-reference.xml:7475 ../en/book/ch09-reference.xml:7535 #: ../en/book/ch09-reference.xml:7578 ../en/book/ch09-reference.xml:7761 #: ../en/book/ch09-reference.xml:7829 ../en/book/ch09-reference.xml:7870 #: ../en/book/ch09-reference.xml:7947 ../en/book/ch09-reference.xml:8303 #: ../en/book/ch09-reference.xml:8367 ../en/book/ch09-reference.xml:8431 #: ../en/book/ch09-reference.xml:8475 ../en/book/ch09-reference.xml:8628 #: ../en/book/ch09-reference.xml:9022 ../en/book/ch09-reference.xml:9327 #: ../en/book/ch09-reference.xml:9390 ../en/book/ch09-reference.xml:9445 #: ../en/book/ch09-reference.xml:9502 ../en/book/ch09-reference.xml:9574 #: ../en/book/ch09-reference.xml:9648 ../en/book/ch09-reference.xml:9707 #: ../en/book/ch09-reference.xml:9765 ../en/book/ch09-reference.xml:9825 msgid "Description" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:255 msgid "Adobe Photoshop" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:256 ../en/book/appc-webdav.xml:265 #: ../en/book/appc-webdav.xml:274 ../en/book/appc-webdav.xml:282 #: ../en/book/appc-webdav.xml:291 msgid "Standalone WebDAV application" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:257 ../en/book/appc-webdav.xml:267 #: ../en/book/appc-webdav.xml:268 ../en/book/appc-webdav.xml:275 #: ../en/book/appc-webdav.xml:276 ../en/book/appc-webdav.xml:277 #: ../en/book/appc-webdav.xml:283 ../en/book/appc-webdav.xml:292 #: ../en/book/appc-webdav.xml:302 ../en/book/appc-webdav.xml:313 #: ../en/book/appc-webdav.xml:322 ../en/book/appc-webdav.xml:330 #: ../en/book/appc-webdav.xml:338 ../en/book/appc-webdav.xml:347 #: ../en/book/appc-webdav.xml:359 msgid "X" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:260 msgid "" "Image editing software, allowing direct opening from, and writing to, WebDAV " "URLs" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:264 msgid "cadaver" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:269 msgid "" "Command-line WebDAV client supporting file transfer, tree, and locking " "operations" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:273 msgid "DAV Explorer" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:278 msgid "Java GUI tool for exploring WebDAV shares" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:281 msgid "Macromedia Dreamweaver" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:286 msgid "" "Web production software able to directly read from and write to WebDAV URLs" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:290 msgid "Microsoft Office" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:295 msgid "" "Office productivity suite with several components able to directly read from " "and write to WebDAV URLs" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:300 ../en/book/appc-webdav.xml:477 msgid "Microsoft Web Folders" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:301 ../en/book/appc-webdav.xml:310 #: ../en/book/appc-webdav.xml:319 msgid "File-explorer WebDAV extension" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:305 msgid "" "GUI file explorer program able to perform tree operations on a WebDAV share" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:309 msgid "GNOME Nautilus" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:314 ../en/book/appc-webdav.xml:323 msgid "GUI file explorer able to perform tree operations on a WebDAV share" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:318 msgid "KDE Konqueror" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:327 ../en/book/appc-webdav.xml:618 msgid "Mac OS X" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:328 ../en/book/appc-webdav.xml:337 #: ../en/book/appc-webdav.xml:346 ../en/book/appc-webdav.xml:356 msgid "WebDAV filesystem implementation" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:332 msgid "Operating system that has built-in support for mounting WebDAV shares." msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:336 msgid "Novell NetDrive" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:341 msgid "" "Drive-mapping program for assigning Windows drive letters to a mounted " "remote WebDAV share" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:345 msgid "SRT WebDrive" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:350 msgid "" "File transfer software, which, among other things, allows the assignment of " "Windows drive letters to a mounted remote WebDAV share" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:355 msgid "davfs2" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:360 msgid "Linux filesystem driver that allows you to mount a WebDAV share" msgstr "" # type: Content of: <appendix><sect1><sect2><title> #: ../en/book/appc-webdav.xml:370 msgid "Standalone WebDAV Applications" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appc-webdav.xml:372 msgid "" "A WebDAV application is a program that speaks WebDAV protocols with a WebDAV " "server. We'll cover some of the most popular programs with this kind of " "WebDAV support." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:378 msgid "Microsoft Office, Dreamweaver, Photoshop" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para><footnote> #: ../en/book/appc-webdav.xml:380 msgid "" "On Windows, several well-known applications contain integrated WebDAV client " "functionality, such as Microsoft's Office, <footnote>" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para><footnote><para> #: ../en/book/appc-webdav.xml:384 msgid "" "WebDAV support was removed from Microsoft Access for some reason, but it " "exists in the rest of the Office suite." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:387 msgid "" "</footnote> Adobe's Photoshop, and Macromedia's Dreamweaver programs. " "They're able to directly open and save to URLs, and tend to make heavy use " "of WebDAV locks when editing a file." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:392 msgid "" "Note that while many of these programs also exist for Mac OS X, they do not " "appear to support WebDAV directly on that platform. In fact, on Mac OS X, " "the <guimenu>File→Open</guimenu> dialog box doesn't allow one to type a " "path or URL at all. It's likely that the WebDAV features were deliberately " "left out of Macintosh versions of these programs, since OS X already " "provides such excellent low-level filesystem support for WebDAV." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:405 msgid "cadaver, DAV Explorer" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:407 msgid "" "cadaver is a bare-bones Unix command-line program for browsing and changing " "WebDAV shares. Like the Subversion client, it uses the neon HTTP " "library—not surprisingly, since both neon and cadaver are written by " "the same author. cadaver is free software (GPL license) and is available at " "<ulink url=\"http://www.webdav.org/cadaver/\"/>." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:415 msgid "" "Using cadaver is similar to using a command-line FTP program, and thus it's " "extremely useful for basic WebDAV debugging. It can be used to upload or " "download files in a pinch, to examine properties, and to copy, move, lock, " "or unlock files:" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><screen> #: ../en/book/appc-webdav.xml:421 #, no-wrap msgid "" "\n" "$ cadaver http://host/repos\n" "dav:/repos/> ls\n" "Listing collection `/repos/': succeeded.\n" "Coll: > foobar 0 May 10 16:19\n" " > playwright.el 2864 May 4 16:18\n" " > proofbypoem.txt 1461 May 5 15:09\n" " > westcoast.jpg 66737 May 5 15:09\n" "\n" "dav:/repos/> put README\n" "Uploading README to `/repos/README':\n" "Progress: [=============================>] 100.0% of 357 bytes succeeded.\n" "\n" "dav:/repos/> get proofbypoem.txt\n" "Downloading `/repos/proofbypoem.txt' to proofbypoem.txt:\n" "Progress: [=============================>] 100.0% of 1461 bytes succeeded.\n" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:439 msgid "" "DAV Explorer is another standalone WebDAV client, written in Java. It's " "under a free Apache-like license and is available at <ulink url=\"http://www." "ics.uci.edu/~webdav/\"/>. It does everything cadaver does, but has the " "advantages of being portable and being a more user-friendly GUI " "application. It's also one of the first clients to support the new WebDAV " "Access Control Protocol (RFC 3744)." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:447 msgid "" "Of course, DAV Explorer's ACL support is useless in this case, since " "<command>mod_dav_svn</command> doesn't support it. The fact that both " "cadaver and DAV Explorer support some limited DeltaV commands isn't " "particularly useful either, since they don't allow <literal>MKACTIVITY</" "literal> requests. But it's not relevant anyway; we're assuming all of " "these clients are operating against an autoversioning repository." msgstr "" # type: Content of: <appendix><sect1><sect2><title> #: ../en/book/appc-webdav.xml:461 msgid "File-Explorer WebDAV Extensions" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appc-webdav.xml:463 msgid "" "Some popular file explorer GUI programs support WebDAV extensions that allow " "a user to browse a DAV share as though it was just another directory on the " "local computer, and to perform basic tree editing operations on the items in " "that share. For example, Windows Explorer is able to browse a WebDAV server " "as a <quote>network place.</quote> Users can drag files to and from the " "desktop, or can rename, copy, or delete files in the usual way. But because " "it's only a feature of the file explorer, the DAV share isn't visible to " "ordinary applications. All DAV interaction must happen through the explorer " "interface." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:479 msgid "" "Microsoft was one of the original backers of the WebDAV specification, and " "first started shipping a client in Windows 98, which was known as Web " "Folders. This client was also shipped in Windows NT 4.0 and Windows 2000." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:484 msgid "" "The original Web Folders client was an extension to Explorer, the main GUI " "program used to browse filesystems. It works well enough. In Windows 98, " "the feature might need to be explicitly installed if Web Folders aren't " "already visible inside My Computer. In Windows 2000, simply add a new " "<quote>network place,</quote> enter the URL, and the WebDAV share will pop " "up for browsing." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:492 msgid "" "With the release of Windows XP, Microsoft started shipping a new " "implementation of Web Folders, known as the WebDAV Mini-Redirector. The new " "implementation is a filesystem-level client, allowing WebDAV shares to be " "mounted as drive letters. Unfortunately, this implementation is incredibly " "buggy. The client usually tries to convert HTTP URLs (<literal>http://host/" "repos</literal>) into UNC share notation (<literal>\\\\host\\repos</" "literal>); it also often tries to use Windows Domain authentication to " "respond to basic-auth HTTP challenges, sending usernames as <literal>HOST" "\\username</literal>. These interoperability problems are severe and are " "documented in numerous places around the Web, to the frustration of many " "users. Even Greg Stein, the original author of Apache's WebDAV module, " "bluntly states that XP Web Folders simply can't operate against an Apache " "server." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:509 msgid "" "Windows Vista's initial implementation of Web Folders seems to be almost the " "same as XP's, so it has the same sort of problems. With luck, Microsoft " "will remedy these issues in a Vista Service Pack." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:514 msgid "" "However, there seem to be workarounds for both XP and Vista that allow Web " "Folders to work against Apache. Users have mostly reported success with " "these techniques, so we'll relay them here." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:519 msgid "" "On Windows XP, you have two options. First, search Microsoft's web site for " "update KB90730, <quote>Software Update for Web Folders.</quote> This may fix " "all your problems. If it doesn't, it seems that the original pre-XP Web " "Folders implementation is still buried within the system. You can unearth " "it by going to Network Places and adding a new network place. When " "prompted, enter the URL of the repository, but <emphasis>include a port " "number</emphasis> in the URL. For example, you should enter " "<userinput>http://host/repos</userinput> as <userinput>http://host:80/repos</" "userinput> instead. Respond to any authentication prompts with your " "Subversion credentials." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:533 msgid "" "On Windows Vista, the same KB90730 update may clear everything up. But " "there may still be other issues. Some users have reported that Vista " "considers all <literal>http://</literal> connections insecure, and thus will " "always fail any authentication challenges from Apache unless the connection " "happens over <literal>https://</literal>. If you're unable to connect to " "the Subversion repository via SSL, you can tweak the system registry to turn " "off this behavior. Just change the value of the <literal>HKEY_LOCAL_MACHINE" "\\SYSTEM\\CurrentControlSet\\Services\\WebClient\\Parameters" "\\BasicAuthLevel</literal> key from <userinput>1</userinput> to " "<userinput>2</userinput>. A final warning: be sure to set up the Web Folder " "to point to the repository's root directory (<filename>/</filename>), rather " "than some subdirectory such as <filename>/trunk</filename>. Vista Web " "Folders seems to work only against repository roots." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:549 msgid "" "In general, while these workarounds may function for you, you might get a " "better overall experience using a third-party WebDAV client such as WebDrive " "or NetDrive." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:557 msgid "Nautilus, Konqueror" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:559 msgid "" "Nautilus is the official file manager/browser for the GNOME desktop (<ulink " "url=\"http://www.gnome.org\"/>), and Konqueror is the manager/browser for " "the KDE desktop (<ulink url=\"http://www.kde.org\"/>). Both of these " "applications have an explorer-level WebDAV client built in, and they operate " "just fine against an autoversioning repository." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:566 msgid "" "In GNOME's Nautilus, select the <guimenuitem>File→Open location</" "guimenuitem> menu item and enter the URL in the dialog box presented. The " "repository should then be displayed like any other filesystem." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:571 msgid "" "In KDE's Konqueror, you need to use the <literal>webdav://</literal> scheme " "when entering the URL in the location bar. If you enter an <literal>http://" "</literal> URL, Konqueror will behave like an ordinary web browser. You'll " "likely see the generic HTML directory listing produced by " "<command>mod_dav_svn</command>. When you enter <userinput>webdav://host/" "repos</userinput> instead of <userinput>http://host/repos</userinput>, " "Konqueror becomes a WebDAV client and displays the repository as a " "filesystem." msgstr "" # type: Content of: <appendix><sect1><sect2><title> #: ../en/book/appc-webdav.xml:587 msgid "WebDAV Filesystem Implementation" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appc-webdav.xml:589 msgid "" "The WebDAV filesystem implementation is arguably the best sort of WebDAV " "client. It's implemented as a low-level filesystem module, typically within " "the operating system's kernel. This means that the DAV share is mounted " "like any other network filesystem, similar to mounting an NFS share on Unix " "or attaching an SMB share as a drive letter in Windows. As a result, this " "sort of client provides completely transparent read/write WebDAV access to " "all programs. Applications aren't even aware that WebDAV requests are " "happening." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:602 msgid "WebDrive, NetDrive" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:604 msgid "" "Both WebDrive and NetDrive are excellent commercial products that allow a " "WebDAV share to be attached as drive letters in Windows. As a result, you " "can operate on the contents of these WebDAV-backed pseudodrives as easily as " "you can against real local hard drives, and in the same ways. You can " "purchase WebDrive from South River Technologies (<ulink url=\"http://www." "southrivertech.com\"/>). Novell's NetDrive is freely available online, but " "requires users to have a NetWare license." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:620 msgid "" "Apple's OS X operating system has an integrated filesystem-level WebDAV " "client. From the Finder, select the <guimenuitem>Go→Connect to Server</" "guimenuitem> menu item. Enter a WebDAV URL, and it appears as a disk on the " "desktop, just like any other mounted volume. You can also mount a WebDAV " "share from the Darwin terminal by using the <literal>webdav</literal> " "filesystem type with the <command>mount</command> command:" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><screen> #: ../en/book/appc-webdav.xml:629 #, no-wrap msgid "" "\n" "$ mount -t webdav http://svn.example.com/repos/project /some/mountpoint\n" "$\n" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:634 msgid "" "Note that if your <command>mod_dav_svn</command> is older than version 1.2, " "OS X will refuse to mount the share as read/write; it will appear as read-" "only. This is because OS X insists on locking support for read/write " "shares, and the ability to lock files first appeared in Subversion 1.2." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:641 msgid "" "Also, OS X's WebDAV client can sometimes be overly sensitive to HTTP " "redirects. If OS X is unable to mount the repository at all, you may need " "to enable the <literal>BrowserMatch</literal> directive in the Apache " "server's <filename>httpd.conf</filename>:" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><screen> #: ../en/book/appc-webdav.xml:647 #, no-wrap msgid "" "\n" "BrowserMatch \"^WebDAVFS/1.[012]\" redirect-carefully\n" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:655 msgid "Linux davfs2" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:657 msgid "" "Linux davfs2 is a filesystem module for the Linux kernel, whose development " "is organized at <ulink url=\"http://dav.sourceforge.net/\"/>. Once you " "install davfs2, you can mount a WebDAV network share using the usual Linux " "mount command:" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><screen> #: ../en/book/appc-webdav.xml:663 #, no-wrap msgid "" "\n" "$ mount.davfs http://host/repos /mnt/dav\n" msgstr "" # type: Content of: <book><title> #: ../en/book/book.xml:25 msgid "Version Control with Subversion" msgstr "Version Control with Subversion" # type: Content of: <book><bookinfo><subtitle> #: ../en/book/book.xml:29 msgid "For Subversion 1.5" msgstr "For Subversion 1.5" # type: Content of: <book><bookinfo><subtitle> #: ../en/book/book.xml:33 msgid "(Compiled from &svn.l10n_revision;&svn.version;)" msgstr "(Übersetzt aus der &svn.l10n_revision; &svn.version;)" # type: Content of: <book><bookinfo><pubdate> #: ../en/book/book.xml:62 msgid "(TBA)" msgstr "(TBA)" # type: Content of: <book><bookinfo><copyright><holder> #: ../en/book/book.xml:72 msgid "Ben Collins-Sussman" msgstr "Ben Collins-Sussman" # type: Content of: <book><bookinfo><copyright><holder> #: ../en/book/book.xml:73 msgid "Brian W. Fitzpatrick" msgstr "Brian W. Fitzpatrick" # type: Content of: <book><bookinfo><copyright><holder> #: ../en/book/book.xml:74 msgid "C. Michael Pilato" msgstr "C. Michael Pilato" # type: Content of: <book><bookinfo><legalnotice><para> #: ../en/book/book.xml:77 msgid "" "This work is licensed under the Creative Commons Attribution License. To " "view a copy of this license, visit <ulink url=\"http://creativecommons.org/" "licenses/by/2.0/\"/> or send a letter to Creative Commons, 559 Nathan Abbott " "Way, Stanford, California 94305, USA." msgstr "" "This work is licensed under the Creative Commons Attribution License. To " "view a copy of this license, visit <ulink url=\"http://creativecommons.org/" "licenses/by/2.0/\"/> or send a letter to Creative Commons, 559 Nathan Abbott " "Way, Stanford, California 94305, USA." # type: Content of: <preface><title> #: ../en/book/ch00-preface.xml:2 msgid "Preface" msgstr "Vorwort" # type: Content of: <preface><blockquote><attribution> #: ../en/book/ch00-preface.xml:5 msgid "Greg Hudson, Subversion developer" msgstr "Greg Hudson, Subversion-Entwickler" # type: Content of: <preface><blockquote><para> #: ../en/book/ch00-preface.xml:6 msgid "" "<quote>It is important not to let the perfect become the enemy of the good, " "even when you can agree on what perfect is. Doubly so when you can't. As " "unpleasant as it is to be trapped by past mistakes, you can't make any " "progress by being afraid of your own shadow during design.</quote>" msgstr "" "<quote>Es ist wichtig, die Vollkommenheit nicht zum Feind des Guten werden " "zu lassen, selbst dann, wenn darüber Einigkeit besteht, was Vollkommenheit " "ist. Erst recht, wenn man sich nicht darüber einig ist. So unangenehm es " "ist, durch vergangene Fehler gefangen zu sein, kann man während des Entwurfs " "keinen Fortschritt erzielen, wenn man Angst vor dem eigenen Schatten hat.</" "quote>" # type: Content of: <preface><sect1><sect2><para><indexterm> #: ../en/book/ch00-preface.xml:14 ../en/book/ch00-preface.xml:827 #: ../en/book/ch03-advanced-topics.xml:75 #: ../en/book/ch03-advanced-topics.xml:182 #: ../en/book/ch03-advanced-topics.xml:280 ../en/book/ch09-reference.xml:715 #: ../en/book/ch09-reference.xml:824 ../en/book/ch09-reference.xml:960 #: ../en/book/ch09-reference.xml:1040 ../en/book/ch09-reference.xml:1136 #: ../en/book/ch09-reference.xml:1283 ../en/book/ch09-reference.xml:1360 #: ../en/book/ch09-reference.xml:1498 ../en/book/ch09-reference.xml:1704 #: ../en/book/ch09-reference.xml:1817 ../en/book/ch09-reference.xml:2142 #: ../en/book/ch09-reference.xml:2257 ../en/book/ch09-reference.xml:2306 #: ../en/book/ch09-reference.xml:2413 ../en/book/ch09-reference.xml:2600 #: ../en/book/ch09-reference.xml:2741 ../en/book/ch09-reference.xml:2836 #: ../en/book/ch09-reference.xml:3146 ../en/book/ch09-reference.xml:3292 #: ../en/book/ch09-reference.xml:3367 ../en/book/ch09-reference.xml:3451 #: ../en/book/ch09-reference.xml:3580 ../en/book/ch09-reference.xml:3657 #: ../en/book/ch09-reference.xml:3736 ../en/book/ch09-reference.xml:3834 #: ../en/book/ch09-reference.xml:3937 ../en/book/ch09-reference.xml:4074 #: ../en/book/ch09-reference.xml:4205 ../en/book/ch09-reference.xml:4301 #: ../en/book/ch09-reference.xml:4413 ../en/book/ch09-reference.xml:4856 #: ../en/book/ch09-reference.xml:5053 ../en/book/ch09-reference.xml:5141 #: ../en/book/ch09-reference.xml:5508 ../en/book/ch09-reference.xml:5556 #: ../en/book/ch09-reference.xml:5635 ../en/book/ch09-reference.xml:5675 #: ../en/book/ch09-reference.xml:5777 ../en/book/ch09-reference.xml:5808 #: ../en/book/ch09-reference.xml:5860 ../en/book/ch09-reference.xml:5893 #: ../en/book/ch09-reference.xml:5942 ../en/book/ch09-reference.xml:6009 #: ../en/book/ch09-reference.xml:6063 ../en/book/ch09-reference.xml:6103 #: ../en/book/ch09-reference.xml:6185 ../en/book/ch09-reference.xml:6231 #: ../en/book/ch09-reference.xml:6286 ../en/book/ch09-reference.xml:6347 #: ../en/book/ch09-reference.xml:6403 ../en/book/ch09-reference.xml:6457 #: ../en/book/ch09-reference.xml:6525 ../en/book/ch09-reference.xml:6697 #: ../en/book/ch09-reference.xml:6743 ../en/book/ch09-reference.xml:6801 #: ../en/book/ch09-reference.xml:6925 ../en/book/ch09-reference.xml:6971 #: ../en/book/ch09-reference.xml:7043 ../en/book/ch09-reference.xml:7090 #: ../en/book/ch09-reference.xml:7127 ../en/book/ch09-reference.xml:7191 #: ../en/book/ch09-reference.xml:7242 ../en/book/ch09-reference.xml:7294 #: ../en/book/ch09-reference.xml:7340 ../en/book/ch09-reference.xml:7395 #: ../en/book/ch09-reference.xml:7460 ../en/book/ch09-reference.xml:7519 #: ../en/book/ch09-reference.xml:7563 ../en/book/ch09-reference.xml:7744 #: ../en/book/ch09-reference.xml:7814 ../en/book/ch09-reference.xml:7854 #: ../en/book/ch09-reference.xml:7931 ../en/book/ch09-reference.xml:8288 #: ../en/book/ch09-reference.xml:8351 ../en/book/ch09-reference.xml:8416 #: ../en/book/ch09-reference.xml:8459 ../en/book/ch09-reference.xml:9315 #: ../en/book/ch09-reference.xml:9378 ../en/book/ch09-reference.xml:9433 #: ../en/book/ch09-reference.xml:9489 ../en/book/ch09-reference.xml:9561 #: ../en/book/ch09-reference.xml:9636 ../en/book/ch09-reference.xml:9695 #: ../en/book/ch09-reference.xml:9753 ../en/book/ch09-reference.xml:9813 msgid "<indexterm>" msgstr "<indexterm>" # type: Content of: <preface><para><indexterm><primary> #: ../en/book/ch00-preface.xml:15 msgid "Concurrent Versions System (CVS)" msgstr "Concurrent Versions System (CVS)" # type: Content of: <preface><para> #: ../en/book/ch00-preface.xml:16 msgid "" "</indexterm> In the world of open source software, the Concurrent Versions " "System (CVS) was the tool of choice for version control for many years. And " "rightly so. CVS was open source software itself, and its nonrestrictive " "modus operandi and support for networked operation allowed dozens of " "geographically dispersed programmers to share their work. It fit the " "collaborative nature of the open source world very well. CVS and its semi-" "chaotic development model have since become cornerstones of open source " "culture." msgstr "" "</indexterm> In der Welt der Open-Source-Software war das Concurrent " "Versions System (CVS) für viele Jahre das Werkzeug der Wahl für " "Versionskontrolle. Und das zu Recht. CVS war selbst Open-Source-Software und " "seine nicht-einschränkende Vorgehensweise und Unterstützung für " "netzbasierten Einsatz erlaubte dutzenden geografisch verteilten " "Programmierern, ihre Arbeit zu teilen. Es passte sehr gut zur kollaborativen " "Natur der Open-Source-Welt. CVS und sein halb chaotisches Entwicklungsmodell " "sind seitdem zu Eckpfeilern der Open-Source-Kultur geworden." # type: Content of: <preface><para> #: ../en/book/ch00-preface.xml:28 msgid "" "But CVS was not without its flaws, and simply fixing those flaws promised to " "be an enormous effort. Enter Subversion. Subversion was designed to be a " "successor to CVS, and its originators set out to win the hearts of CVS users " "in two ways—by creating an open source system with a design (and " "<quote>look and feel</quote>) similar to CVS, and by attempting to avoid " "most of CVS's noticeable flaws. While the result isn't necessarily the next " "great evolution in version control design, Subversion <emphasis>is</" "emphasis> very powerful, very usable, and very flexible. And for the most " "part, almost all newly started open source projects now choose Subversion " "instead of CVS." msgstr "" "Jedoch war CVS nicht makellos, und diese Makel einfach zu beseitigen, " "versprach einen enormen Aufwand. Bühne frei für Subversion. Subversion " "wurde als Nachfolger für CVS entworfen, und seine Schöpfer zogen los, um auf " "zwei Wegen die Herzen der CVS-Benutzer zu gewinnen – indem ein Open-" "Source-System erschaffen wurde, dessen Design (und <quote>look and feel</" "quote>) ähnlich wie CVS war, und indem versucht wurde, die auffälligsten " "Makel von CVS zu vermeiden. Obwohl das Ergebnis nicht notwendigerweise den " "nächsten Evolutionsschritt in Sachen Versionskontrolle darstellt, " "<emphasis>ist</emphasis> Subversion sehr mächtig, sehr brauchbar und sehr " "flexibel. Und größtenteils wählen nun fast alle neuen Open-Source-Projekte " "Subversion statt CVS." # type: Content of: <preface><para> #: ../en/book/ch00-preface.xml:40 msgid "" "This book is written to document the 1.5 series of the Subversion version " "control system. We have made every attempt to be thorough in our coverage. " "However, Subversion has a thriving and energetic development community, so " "already a number of features and improvements are planned for future " "versions that may change some of the commands and specific notes in this " "book." msgstr "" "Dieses Buch ist geschrieben worden, um die Serie 1.5 des Subversion " "Versionskontrollsystems zu dokumentieren. Wir haben stets versucht, die " "Themen gründlich zu behandeln. Jedoch hat Subversion eine florierende und " "tatkräftige Entwicklergemeinde, so dass bereits eine Menge an Features und " "Verbesserungen für künftige Versionen von Subversion geplant sind, die " "Änderungen mancher Kommandos und bestimmter Anmerkungen in diesem Buch " "bewirken könnten." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:54 msgid "Audience" msgstr "Publikum" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:56 msgid "" "This book is written for computer-literate folk who want to use Subversion " "to manage their data. While Subversion runs on a number of different " "operating systems, its primary user interface is command-line-based. That " "command-line tool (<command>svn</command>), and some auxiliary programs, are " "the focus of this book." msgstr "" "Dieses Buch ist für computerkundige Leute geschrieben, die mit Subversion " "ihre Daten verwalten wollen. Obwohl Subversion unter verschiedenen " "Betriebssystemen läuft, ist die primäre Benutzerschnittstelle " "kommandozeilenbasiert. Dieses Kommandozeilenwerkzeug (<command>svn</" "command>) und einige Hilfsprogramme stehen im Mittelpunkt dieses Buches." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:63 msgid "" "For consistency, the examples in this book assume that the reader is using a " "Unix-like operating system and is relatively comfortable with Unix and " "command-line interfaces. That said, the <command>svn</command> program also " "runs on non-Unix platforms such as Microsoft Windows. With a few minor " "exceptions, such as the use of backward slashes (<literal>\\</literal>) " "instead of forward slashes (<literal>/</literal>) for path separators, the " "input to and output from this tool when run on Windows are identical to its " "Unix counterpart." msgstr "" "Aus Gründen der Vereinheitlichung gehen die Beispiele in diesem Buch davon " "aus, dass der Leser ein unixähnliches Betriebssystem benutzt und mit Unix " "und Kommandozeilenschnittstellen verhältnismäßig gut zurechtkommt. " "Nichtsdestotrotz läuft <command>svn</command> auch unter anderen " "Betriebssystemen als Unix, etwa Microsoft Windows. Bis auf ein paar " "Ausnahmen, wie z.B. die Verwendung umgekehrter Schrägstriche (<literal>\\</" "literal>) statt Schrägstrichen (<literal>/</literal>) als Pfadtrenner, sind " "die Ein- und Ausgaben dieses Werkzeugs unter Windows identisch zur Unix-" "Version." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:73 msgid "" "Most readers are probably programmers or system administrators who need to " "track changes to source code. This is the most common use for Subversion, " "and therefore it is the scenario underlying all of the book's examples. But " "Subversion can be used to manage changes to any sort of information—" "images, music, databases, documentation, and so on. To Subversion, all data " "is just data." msgstr "" "Die meisten Leser sind wahrscheinlich Programmierer oder " "Systemadministratoren, die Änderungen an Quellcode verfolgen müssen. Das " "ist der am meisten verbreitete Einsatzzweck von Subversion, so dass alle " "Beispiele in diesem Buch auf diesem Szenario beruhen. Doch Subversion kann " "gleichwohl dazu benutzt werden, Änderungen an allerlei Arten von " "Informationen zu verwalten – Bilder, Musik, Datenbanken, Dokumentation " "usw. Für Subversion sind alle Daten einfach Daten." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:81 msgid "" "While this book is written with the assumption that the reader has never " "used a version control system, we've also tried to make it easy for users of " "CVS (and other systems) to make a painless leap into Subversion. Special " "sidebars may mention other version control systems from time to time, and " "Appendix B summarizes many of the differences between CVS and Subversion." msgstr "" "Obwohl dieses Buch unter der Annahme geschrieben worden ist, dass der Leser " "noch nie ein Versionskontrollsystem benutzt hat, haben wir auch versucht, " "für Anwender von CVS (und anderen Systemen) den Sprung zu Subversion so " "schmerzlos wie möglich zu machen. Ab und zu werden in Randnotizen andere " "Versionskontrollsysteme erwähnt, und ein besonderer Anhang fasst viele der " "Unterschiede zwischen CVS und Subversion zusammen." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:89 msgid "" "Note also that the source code examples used throughout the book are only " "examples. While they will compile with the proper compiler incantations, " "they are intended to illustrate a particular scenario and not necessarily to " "serve as examples of good programming style or practices." msgstr "" "Es sei angemerkt, dass es sich bei den Quelltexten in diesem Buch nur um " "Beispiele handelt. Obwohl sie sich mit den passenden Compiler-Aufrufen " "übersetzen ließen, sollen sie lediglich ein besonderes Szenario illustrieren " "und nicht als Vorlage für guten Programmierstil oder gute Programmierpraxis " "dienen." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:101 msgid "How to Read This Book" msgstr "Wie dieses Buch zu lesen ist" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:103 msgid "" "Technical books always face a certain dilemma: whether to cater to " "<firstterm>top-down</firstterm> or to <firstterm>bottom-up</firstterm> " "learners. A top-down learner prefers to read or skim documentation, getting " "a large overview of how the system works; only then does she actually start " "using the software. A bottom-up learner is a <quote>learn by doing</quote> " "person—someone who just wants to dive into the software and figure it " "out as she goes, referring to book sections when necessary. Most books tend " "to be written for one type of person or the other, and this book is " "undoubtedly biased toward top-down learners. (And if you're actually " "reading this section, you're probably already a top-down learner yourself!) " "However, if you're a bottom-up person, don't despair. While the book may be " "laid out as a broad survey of Subversion topics, the content of each section " "tends to be heavy with specific examples that you can try-by-doing. For the " "impatient folks who just want to get going, you can jump right to <xref " "linkend=\"svn.intro\"/>." msgstr "" "Technische Bücher stehen immer vor einem bestimmten Dilemma: ob sie " "<firstterm>von-oben</firstterm> oder <firstterm>von-unten</firstterm> " "Lernenden entgegenkommen sollen. Ein von-oben Lernender bevorzugt es, " "Dokumentation zu lesen oder zu überfliegen und dabei einen groben Überblick " "über das Funktionieren des Systems zu erhalten, bevor er beginnt, die " "Software zu verwenden. Ein von-unten Lernender ist eine Person, für die " "<quote>Lernen durch Ausprobieren</quote> gilt, jemand, der in die Software " "eintauchen möchte, um beim Ausprobieren herauszufinden, wie sie " "funktioniert, und wenn nötig Abschnitte im Buch nachschlägt. Die meisten " "Bücher werden für die eine oder andere Art dieser Personen geschrieben, " "wobei dieses Buch zweifellos den von-oben Lernenden entgegenkommt. (Und wenn " "Sie gerade diesen Abschnitt lesen, sind Sie wahrscheinlich selber ein von-" "oben Lernender!) Verzweifeln Sie jedoch nicht, falls Sie ein von-unten " "Lerner sind. Während dieses Buch als eine breite Betrachtung der Themen rund " "um Subversion gestaltet ist, beinhaltet jeder Abschnitt eine reichhaltige " "Auswahl an Beispielen, die sie ausprobieren können. Die Ungeduldigen, die " "einfach weitermachen wollen, können sofort zu <xref linkend=\"svn.intro\"/> " "springen." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:122 msgid "" "Regardless of your learning style, this book aims to be useful to people of " "widely different backgrounds—from those with no previous experience in " "version control to experienced system administrators. Depending on your own " "background, certain chapters may be more or less important to you. The " "following can be considered a <quote>recommended reading list</quote> for " "various types of readers:" msgstr "" "Ungeachtet Ihrer Lernmethode zielt dieses Buch darauf ab, für Menschen " "unterschiedlicher Herkunft nützlich zu sein – von Menschen ohne " "vorherige Erfahrung mit Versionskontrolle bis hin zu erfahrenen " "Systemadministratoren. Je nach Ihrer Herkunft können bestimmte Kapitel mehr " "oder weniger wichtig für Sie sein. Was nun folgt, kann als " "<quote>Leseempfehlung</quote> für verschiedene Typen von Lesern betrachtet " "werden:" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:133 msgid "Experienced system administrators" msgstr "Erfahrene Systemadministratoren" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:135 msgid "" "The assumption here is that you've probably used version control before and " "are dying to get a Subversion server up and running ASAP. <xref linkend=" "\"svn.reposadmin\"/> and <xref linkend=\"svn.serverconfig\"/> will show you " "how to create your first repository and make it available over the network. " "After that's done, <xref linkend=\"svn.tour\"/> and <xref linkend=\"svn." "forcvs\"/> are the fastest routes to learning the Subversion client." msgstr "" "Die Annahme ist, dass Sie wahrscheinlich bereits Versionskontrolle verwendet " "haben und darauf brennen, möglichst schnell einen Subversion-Server zum " "Laufen zu bekommen. <xref linkend=\"svn.reposadmin\"/> und <xref linkend=" "\"svn.serverconfig\"/> zeigen, wie Sie Ihr erstes Repository erzeugen und es " "über das Netz verfügbar machen können. Danach sind <xref linkend=\"svn.tour" "\"/> und <xref linkend=\"svn.forcvs\"/> die schnellsten Wege zum Lernen des " "Subversion-Clients." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:149 msgid "New users" msgstr "Neulinge" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:151 msgid "" "Your administrator has probably set up Subversion already, and you need to " "learn how to use the client. If you've never used a version control system, " "then <xref linkend=\"svn.basic\"/> is a vital introduction to the ideas " "behind version control. <xref linkend=\"svn.tour\"/> is a guided tour of " "the Subversion client." msgstr "" "Wahrscheinlich hat Ihr Administrator Subversion bereits aufgesetzt, und Sie " "möchten nun lernen, wie man den Client benutzt. Falls Sie noch nie ein " "Versionskontrollsystem benutzt haben, ist <xref linkend=\"svn.basic\"/> eine " "unbedingt notwendige Einführung in die Konzepte der Versionskontrolle. " "<xref linkend=\"svn.tour\"/> ist eine Führung durch den Subversion-Client." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:161 msgid "Advanced users" msgstr "Fortgeschrittene" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:163 msgid "" "Whether you're a user or administrator, eventually your project will grow " "larger. You're going to want to learn how to do more advanced things with " "Subversion, such as how to use Subversion's property support (<xref linkend=" "\"svn.advanced\"/>), how to use branches and perform merges (<xref linkend=" "\"svn.branchmerge\"/>), how to configure runtime options (<xref linkend=" "\"svn.customization\"/>), and other things. These chapters aren't critical " "at first, but be sure to read them once you're comfortable with the basics." msgstr "" "Ob Sie ein Benutzer oder ein Administrator sind, letztendlich wird Ihr " "Projekt anwachsen. Sie werden lernen wollen, wie man fortgeschrittene Dinge " "mit Subversion machen kann, etwa Branches verwenden und Merges durchführen " "(<xref linkend=\"svn.branchmerge\"/>), wie Subversions Property-" "Unterstützung (<xref linkend=\"svn.advanced\"/>) zu benutzen ist, wie " "Laufzeitoptionen konfiguriert werden können (<xref linkend=\"svn." "customization\"/>) und vieles mehr. Diese Kapitel sind zunächst nicht " "kritisch, jedoch sollten Sie sie lesen, sobald Sie mit den Grundlagen " "vertraut sind." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:177 msgid "Developers" msgstr "Entwickler" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:179 msgid "" "Presumably, you're already familiar with Subversion, and now want to either " "extend it or build new software on top of its many APIs. <xref linkend=" "\"svn.developer\"/> is just for you." msgstr "" "Unter der Annahme, dass Sie bereits mit Subversion vertraut sind und es nun " "entweder erweitern oder neue Software basierend auf einem seiner zahlreichen " "APIs erstellen möchten, ist <xref linkend=\"svn.developer\"/> genau das, was " "sie suchen." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:187 msgid "" "The book ends with reference material—<xref linkend=\"svn.ref\"/> is a " "reference guide for all Subversion commands, and the appendixes cover a " "number of useful topics. These are the chapters you're mostly likely to " "come back to after you've finished the book." msgstr "" "Das Buch schließt mit einer Referenz – <xref linkend=\"svn.ref\"/> ist " "ein Referenzhandbuch für alle Befehle von Subversion, und die Anhänge " "behandeln eine Anzahl nützlicher Themen. Dies sind die Kapitel, zu denen Sie " "sehr wahrscheinlich zurückkehren werden, wenn Sie dieses Buch beendet haben." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:199 msgid "Conventions Used in This Book" msgstr "Konventionen in diesem Buch" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:201 msgid "The following typographic conventions are used in this book:" msgstr "" "Die folgenden typografischen Konventionen werden in diesem Buch verwendet:" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:208 msgid "<userinput>Constant width</userinput>" msgstr "<userinput>Festbreitenschrift</userinput>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:211 msgid "Used for literal user input, command output, and command-line options" msgstr "" "Verwendet für Benutzereingaben, Befehlsausgaben und Kommandozeilenoptionen" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:218 msgid "<filename>Italic</filename>" msgstr "<filename>Kursiv</filename>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:221 msgid "" "Used for program and Subversion tool subcommand names, file and directory " "names, and new terms" msgstr "" "Verwendet für Programm- und Subversion-Unterbefehlsnamen, Datei- und " "Verzeichnisnamen und für neue Begriffe" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:228 msgid "<replaceable>Constant width italic</replaceable>" msgstr "<replaceable>Kursive Festbreitenschrift</replaceable>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:231 msgid "Used for replaceable items in code and text" msgstr "Verwendet für zu ersetzende Objekte in Code und Text" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:237 msgid "" "Also, we sprinkled especially helpful or important bits of information " "throughout the book (in contextually relevant locations), set off visually " "so they're easy to find. Look for the following icons as you read:" msgstr "" "Des Weiteren haben wir besonders hilfreiche oder wichtige " "Informationshäppchen, wegen der besseren Auffindbarkeit optisch " "hervorgehoben, über das gesamte Buch verteilt (dort, wo es für den " "Zusammenhang bedeutsam ist). Achten Sie beim Lesen auf die folgenden Bilder:" # type: Content of: <preface><sect1><note><para> #: ../en/book/ch00-preface.xml:243 msgid "This icon designates a special point of interest." msgstr "Dieses Bild markiert einen besonders wichtigen Punkt." # type: Content of: <preface><sect1><tip><para> #: ../en/book/ch00-preface.xml:247 msgid "This icon designates a helpful tip or recommended best practice." msgstr "" "Dieses Bild markiert einen nützlichen Tipp oder eine empfohlene " "Vorgehensweise." # type: Content of: <preface><sect1><warning><para> #: ../en/book/ch00-preface.xml:252 msgid "" "This icon designates a warning. Pay close attention to these to avoid " "running into problems." msgstr "" "Dieses Bild markiert eine Warnung. Beachten Sie diese besonders, um Probleme " "zu vermeiden!" # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:262 msgid "Organization of This Book" msgstr "Aufbau dieses Buchs" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:264 msgid "The chapters that follow and their contents are listed here:" msgstr "Hier sind die folgenden Kapitel und ihr Inhalt aufgeführt:" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:270 msgid "<xref linkend=\"svn.basic\"/>" msgstr "<xref linkend=\"svn.basic\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:272 msgid "" "Explains the basics of version control and different versioning models, " "along with Subversion's repository, working copies, and revisions." msgstr "" "Erklärt die Grundlagen von Versionskontrolle und unterschiedliche " "Versionierungsmodelle sowie das Repository von Subversion, Arbeitskopien und " "Revisionen." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:279 msgid "<xref linkend=\"svn.tour\"/>" msgstr "<xref linkend=\"svn.tour\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:281 msgid "" "Walks you through a day in the life of a Subversion user. It demonstrates " "how to use a Subversion client to obtain, modify, and commit data." msgstr "" "Ein Spaziergang durch den Tag eines Subversion-Anwenders. Es zeigt, wie ein " "Subversion-Client verwendet wird, um Daten zu bekommen, zu verändern und " "abzuliefern." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:288 msgid "<xref linkend=\"svn.advanced\"/>" msgstr "<xref linkend=\"svn.advanced\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:290 msgid "" "Covers more complex features that regular users will eventually come into " "contact with, such as versioned metadata, file locking, and peg revisions." msgstr "" "Behandelt komplexere Eigenschaften, denen Benutzer letztendlich begegnen " "werden, wie etwa versionierte Metadaten, Dateisperren und Peg-Revisionen." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:297 msgid "<xref linkend=\"svn.branchmerge\"/>" msgstr "<xref linkend=\"svn.branchmerge\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:299 msgid "" "Discusses branches, merges, and tagging, including best practices for " "branching and merging, common use cases, how to undo changes, and how to " "easily swing from one branch to the next." msgstr "" "Behandelt Branches, Merges und Tagging inklusive empfohlener Vorgehensweisen " "beim Branchen und Mergen, übliche Szenarien, wie Änderungen wieder " "rückgängig gemacht werden können und wie einfach von einem Branch zum " "nächsten gewechselt werden kann." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:307 msgid "<xref linkend=\"svn.reposadmin\"/>" msgstr "<xref linkend=\"svn.reposadmin\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:309 msgid "" "Describes the basics of the Subversion repository, how to create, configure, " "and maintain a repository, and the tools you can use to do all of this." msgstr "" "Beschreibt die Grundlagen des Subversion-Repositorys, wie man ein Repository " "anlegt, konfiguriert und wartet sowie die Tools, die man hierfür benutzen " "kann" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:316 msgid "<xref linkend=\"svn.serverconfig\"/>" msgstr "<xref linkend=\"svn.serverconfig\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:318 msgid "" "Explains how to configure your Subversion server and offers different ways " "to access your repository: <literal>HTTP</literal>, the <literal>svn</" "literal> protocol, and local disk access. It also covers the details of " "authentication, authorization and anonymous access." msgstr "" "Erklärt, wie man einen Subversion-Server konfiguriert und unterschiedliche " "Arten auf ein Repository zuzugreifen: <literal>HTTP</literal>, das " "<literal>svn</literal>-Protokoll und über die lokale Festplatte. Behandelt " "werden hier auch die Authentifizierung, die Autorisierung und der anonyme " "Zugriff." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:328 msgid "<xref linkend=\"svn.customization\"/>" msgstr "<xref linkend=\"svn.customization\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:330 msgid "" "Explores the Subversion client configuration files, the handling of " "internationalized text, and how to make external tools cooperate with " "Subversion." msgstr "" "Untersucht die Subversion-Client-Konfigurationsdateien, die Handhabung " "internationalisierter Texte und wie man externe Tools zur Zusammenarbeit mit " "Subversion bringt." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:337 msgid "<xref linkend=\"svn.developer\"/>" msgstr "<xref linkend=\"svn.developer\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:339 msgid "" "Describes the internals of Subversion, the Subversion filesystem, and the " "working copy administrative areas from a programmer's point of view. It " "also demonstrates how to use the public APIs to write a program that uses " "Subversion, and most importantly, how to contribute to the development of " "Subversion." msgstr "" "Beschreibt die Interna von Subversion, das Subversion-Dateisystem und die " "Verwaltungsbereiche der Arbeitskopie aus der Sicht eines Programmierers. " "Hier wird auch gezeigt, wie die veröffentlichten APIs in einem Programm " "verwendet werden, das Subversion benutzt, und, was am wichtigsten ist, wie " "man zur Weiterentwicklung von Subversion beitragen kann." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:349 msgid "<xref linkend=\"svn.ref\"/>" msgstr "<xref linkend=\"svn.ref\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:351 msgid "" "Explains in great detail every subcommand of <command>svn</command>, " "<command>svnadmin</command>, and <command>svnlook</command> with plenty of " "examples for the whole family!" msgstr "" "Erklärt detailreich jeden Unterbefehl von <command>svn</command>, " "<command>svnadmin</command> und <command>svnlook</command> mit vielen " "Beispielen für die ganze Familie." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:359 msgid "<xref linkend=\"svn.intro\"/>" msgstr "<xref linkend=\"svn.intro\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:361 msgid "" "For the impatient, a whirlwind explanation of how to install Subversion and " "start using it immediately. You have been warned." msgstr "" "Für die Ungeduldigen eine Anleitung im Schnelldurchlauf für die Installation " "und die sofortige Benutzung. Seien Sie gewarnt!" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:368 msgid "<xref linkend=\"svn.forcvs\"/>" msgstr "<xref linkend=\"svn.forcvs\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:370 msgid "" "Covers the similarities and differences between Subversion and CVS, with " "numerous suggestions on how to break all the bad habits you picked up from " "years of using CVS. Included are descriptions of Subversion revision " "numbers, versioned directories, offline operations, <command>update</" "command> versus <command>status</command>, branches, tags, metadata, " "conflict resolution, and authentication." msgstr "" "Behandelt die Ähnlichkeiten und Unterschiede zwischen Subversion und CVS mit " "etlichen Vorschlägen, wie man sich all die schlechten Angewohnheiten aus " "jahrelangem CVS-Gebrauch wieder abgewöhnen kann. Dies beinhaltet Subversion-" "Revisionsnummern, versionierte Verzeichnisse, Offline-Tätigkeiten, " "<command>update</command> und <command>status</command>, Branches, Tags, " "Metadaten, Konfliktauflösung und Authentifizierung." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:382 msgid "<xref linkend=\"svn.webdav\"/>" msgstr "<xref linkend=\"svn.webdav\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:384 msgid "" "Describes the details of WebDAV and DeltaV and how you can configure your " "Subversion repository to be mounted read/write as a DAV share." msgstr "" "Beschreibt die Details zu WebDAV und DeltaV und wie man sein Subversion-" "Repository konfiguriert, damit es als freigegebenes DAV-Laufwerk schreibbar " "in das Dateisystem eingehängt werden kann." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:391 msgid "<xref linkend=\"svn.copyright\"/>" msgstr "<xref linkend=\"svn.copyright\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:393 msgid "" "A copy of the Creative Commons Attribution License, under which this book is " "licensed." msgstr "" "Eine Kopie der Creative Commons Attribution License, unter der dieses Buch " "lizenziert ist." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:407 msgid "This Book Is Free" msgstr "Dieses Buch ist frei" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:409 msgid "" "This book started out as bits of documentation written by Subversion project " "developers, which were then coalesced into a single work and rewritten. As " "such, it has always been under a free license (see <xref linkend=\"svn." "copyright\"/>). In fact, the book was written in the public eye, originally " "as part of the Subversion project itself. This means two things:" msgstr "" "Dieses Buch startete aus Dokumentationsschnipseln von Entwicklern des " "Subversion-Projektes, die in einem Werk gebündelt und umgeschrieben wurden. " "Insofern war es immer schon unter einer freien Lizenz (siehe <xref linkend=" "\"svn.copyright\"/>). Tatsächlich wurde das Buch unter den Augen der " "Öffentlichkeit geschrieben, ursprünglich als Teil des Subversion Projektes " "selbst. Das bedeutet zweierlei:" # type: Content of: <preface><sect1><itemizedlist><listitem><para> #: ../en/book/ch00-preface.xml:418 msgid "" "You will always find the latest version of this book in the book's own " "Subversion repository." msgstr "" "Sie werden stets die neueste Version dieses Buchs im eigenen Subversion-" "Repository finden." # type: Content of: <preface><sect1><itemizedlist><listitem><para> #: ../en/book/ch00-preface.xml:423 msgid "" "You can make changes to this book and redistribute it however you wish—" "it's under a free license. Your only obligation is to maintain proper " "attribution to the original authors. Of course, we'd much rather you send " "feedback and patches to the Subversion developer community, instead of " "distributing your private version of this book." msgstr "" "Sie können an diesem Buch Änderungen vornehmen und es wie auch immer " "weiterverteilen – es unterliegt einer freien Lizenz. Ihre einzige " "Verpflichtung besteht darin, den Hinweis auf die ursprünglichen Autoren " "beizubehalten. Natürlich würden wir es bevorzugen, wenn Sie Rückmeldungen " "und Verbesserungen der Subversion-Entwicklergemeinde zukommen ließen, " "anstatt Ihre Privatversion zu verteilen." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:433 msgid "" "The online home of this book's development and most of the volunteer-driven " "translation efforts regarding it is <ulink url=\"http://svnbook.red-bean.com" "\"/>. There you can find links to the latest releases and tagged versions " "of the book in various formats, as well as instructions for accessing the " "book's Subversion repository (where its DocBook XML source code lives). " "Feedback is welcomed—encouraged, even. Please submit all comments, " "complaints, and patches against the book sources to <email>svnbook-dev@red-" "bean.com</email>." msgstr "" "Die Homepage der Entwicklungs- und Übersetzungsaktivitäten auf freiwilliger " "Basis ist <ulink url=\"http://svnbook.red-bean.com\"/>. Dort finden Sie " "Links auf die neuesten Releases und mit Tags versehene Versionen des Buchs " "in verschiedenen Formaten ebenso wie eine Anleitung, auf das Subversion-" "Repository des Buchs zuzugreifen (dort lebt sein Quellcode im DocBook-XML-" "Format). Rückmeldungen sind willkommen – ja sogar erwünscht. Bitte " "senden Sie alle Kommentare, Beschwerden und Patches für die Sourcen des " "Buchs an <email>svnbook-dev@red-bean.com</email>." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:449 msgid "Acknowledgments" msgstr "Danksagungen" # type: Content of: <preface><sect1><para><footnote> #: ../en/book/ch00-preface.xml:451 msgid "" "This book would not be possible (nor very useful) if Subversion did not " "exist. For that, the authors would like to thank Brian Behlendorf and " "CollabNet for the vision to fund such a risky and ambitious new open source " "project; Jim Blandy for the original Subversion name and design—we " "love you, Jim; and Karl Fogel for being such a good friend and a great " "community leader, in that order. <footnote>" msgstr "" "Dieses Buch wäre nicht möglich (und auch nicht sehr nützlich) wenn es " "Subversion nicht gäbe. Dafür möchten die Autoren Brian Behrendorf danken " "sowie CollabNet für die Vision, solch ein riskantes und ehrgeiziges Open-" "Source-Projekt zu finanzieren; Jim Blandy für den ursprünglichen Namen von " "Subversion und sein Design – wir lieben Dich, Jim; Karl Fogel, dafür, " "dass er so ein guter Freund und Leiter der Gemeinde ist, in dieser " "Reihenfolge. <footnote>" # type: Content of: <preface><sect1><para><footnote><para> #: ../en/book/ch00-preface.xml:459 msgid "" "Oh, and thanks, Karl, for being too overworked to write this book yourself." msgstr "" "Oh, und Danke, Karl, dafür, dass du zu viel zu tun hattest, um das Buch " "selbst zu schreiben." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:464 msgid "" "Thanks to O'Reilly and our various editors: Chuck Toporek, Linda Mui, " "Tatiana Apandi, Mary Brady, and Mary Treseler. Their patience and support " "has been tremendous." msgstr "" "Dank an O'Reilly und unsere verschiedenen Redakteure: Chuck Toporek, Linda " "Mui, Tatiana Apandi, Mary Brady und Mary Treseler. Ihre Geduld und " "Unterstützung waren enorm." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:468 msgid "" "Finally, we thank the countless people who contributed to this book with " "informal reviews, suggestions, and patches. While this is undoubtedly not a " "complete list, this book would be incomplete and incorrect without their " "help: Bhuvaneswaran A, David Alber, C. Scott Ananian, David Anderson, Ariel " "Arjona, Seth Arnold, Jani Averbach, Charles Bailey, Ryan Barrett, Francois " "Beausoleil, Brian R. Becker, Yves Bergeron, Karl Berry, Jennifer Bevan, Matt " "Blais, Jim Blandy, Phil Bordelon, Sietse Brouwer, Tom Brown, Zack Brown, " "Martin Buchholz, Paul Burba, Sean Callan-Hinsvark, Branko Cibej, Archie " "Cobbs, Jason Cohen, Ryan Cresawn, John R. Daily, Peter Davis, Olivier Davy, " "Robert P. J. Day, Mo DeJong, Brian Denny, Joe Drew, Markus Dreyer, Nick " "Duffek, Boris Dusek, Ben Elliston, Justin Erenkrantz, Jens M. Felderhoff, " "Kyle Ferrio, Shlomi Fish, Julian Foad, Chris Foote, Martin Furter, Vlad " "Georgescu, Peter Gervai, Dave Gilbert, Eric Gillespie, David Glasser, Marcel " "Gosselin, Lieven Govaerts, Steve Greenland, Matthew Gregan, Tom Gregory, " "Maverick Grey, Art Haas, Mark E. Hamilton, Eric Hanchrow, Liam Healy, Malte " "Helmert, Michael Henderson, Øyvind A. Holm, Greg Hudson, Alexis Huxley, Auke " "Jilderda, Toby Johnson, Jens B. Jorgensen, Tez Kamihira, David Kimdon, Mark " "Benedetto King, Robert Kleemann, Erik Kline, Josh Knowles, Andreas J. " "Koenig, Axel Kollmorgen, Nuutti Kotivuori, Kalin Kozhuharov, Matt Kraai, " "Regis Kuckaertz, Stefan Kueng, Steve Kunkee, Scott Lamb, Wesley J. Landaker, " "Benjamin Landsteiner, Vincent Lefevre, Morten Ludvigsen, Dennis Lundberg, " "Paul Lussier, Bruce A. Mah, Jonathon Mah, Karl Heinz Marbaise, Philip " "Martin, Feliciano Matias, Neil Mayhew, Patrick Mayweg, Gareth McCaughan, " "Craig McElroy, Simon McKenna, Christophe Meresse, Jonathan Metillon, Jean-" "Francois Michaud, Jon Middleton, Robert Moerland, Marcel Molina Jr., Tim " "Moloney, Alexander Mueller, Tabish Mustufa, Christopher Ness, Roman " "Neuhauser, Mats Nilsson, Greg Noel, Joe Orton, Eric Paire, Dimitri " "Papadopoulos-Orfanos, Jerry Peek, Chris Pepper, Amy Lyn Pilato, Kevin Pilch-" "Bisson, Hans Polak, Dmitriy Popkov, Michael Price, Mark Proctor, Steffen " "Prohaska, Daniel Rall, Srinivasa Ramanujan, Jack Repenning, Tobias " "Ringstrom, Jason Robbins, Garrett Rooney, Joel Rosdahl, Christian Sauer, " "Ryan Schmidt, Jochem Schulenklopper, Jens Seidel, Daniel Shahaf, Larry " "Shatzer, Danil Shopyrin, Erik Sjoelund, Joey Smith, W. Snyder, Stefan " "Sperling, Robert Spier, M. S. Sriram, Russell Steicke, David Steinbrunner, " "Sander Striker, David Summers, Johan Sundstroem, Ed Swierk, John " "Szakmeister, Arfrever Frehtes Taifersar Arahesis, Robert Tasarz, Michael W. " "Thelen, Mason Thomas, Erik van der Kolk, Joshua Varner, Eric Wadsworth, " "Chris Wagner, Colin Watson, Alex Waugh, Chad Whitacre, Andy Whitcroft, Josef " "Wolf, Luke Worth, Hyrum Wright, Blair Zajac, Florian Zumbiehl, and the " "entire Subversion community." msgstr "" "Schließlich danken wir den zahllosen Menschen, die zu diesem Buch durch " "informelle Rezensionen, Vorschläge, und Fehlerbehebungen beigetragen haben. " "Obwohl diese Liste zweifellos nicht vollständig ist, wäre dieses Buch " "unfertig und fehlerhaft ohne die Hilfe von: Bhuvaneswaran A, David Alber, C. " "Scott Ananian, David Anderson, Ariel Arjona, Seth Arnold, Jani Averbach, " "Charles Bailey, Ryan Barrett, Francois Beausoleil, Brian R. Becker, Yves " "Bergeron, Karl Berry, Jennifer Bevan, Matt Blais, Jim Blandy, Phil Bordelon, " "Sietse Brouwer, Tom Brown, Zack Brown, Martin Buchholz, Paul Burba, Sean " "Callan-Hinsvark, Branko Cibej, Archie Cobbs, Jason Cohen, Ryan Cresawn, John " "R. Daily, Peter Davis, Olivier Davy, Robert P. J. Day, Mo DeJong, Brian " "Denny, Joe Drew, Markus Dreyer, Nick Duffek, Boris Dusek, Ben Elliston, " "Justin Erenkrantz, Jens M. Felderhoff, Kyle Ferrio, Shlomi Fish, Julian " "Foad, Chris Foote, Martin Furter, Vlad Georgescu, Peter Gervai, Dave " "Gilbert, Eric Gillespie, David Glasser, Marcel Gosselin, Lieven Govaerts, " "Steve Greenland, Matthew Gregan, Tom Gregory, Maverick Grey, Art Haas, Mark " "E. Hamilton, Eric Hanchrow, Liam Healy, Malte Helmert, Michael Henderson, " "Øyvind A. Holm, Greg Hudson, Alexis Huxley, Auke Jilderda, Toby Johnson, " "Jens B. Jorgensen, Tez Kamihira, David Kimdon, Mark Benedetto King, Robert " "Kleemann, Erik Kline, Josh Knowles, Andreas J. Koenig, Axel Kollmorgen, " "Nuutti Kotivuori, Kalin Kozhuharov, Matt Kraai, Regis Kuckaertz, Stefan " "Kueng, Steve Kunkee, Scott Lamb, Wesley J. Landaker, Benjamin Landsteiner, " "Vincent Lefevre, Morten Ludvigsen, Dennis Lundberg, Paul Lussier, Bruce A. " "Mah, Jonathon Mah, Karl Heinz Marbaise, Philip Martin, Feliciano Matias, " "Neil Mayhew, Patrick Mayweg, Gareth McCaughan, Craig McElroy, Simon McKenna, " "Christophe Meresse, Jonathan Metillon, Jean-Francois Michaud, Jon Middleton, " "Robert Moerland, Marcel Molina Jr., Tim Moloney, Alexander Mueller, Tabish " "Mustufa, Christopher Ness, Roman Neuhauser, Mats Nilsson, Greg Noel, Joe " "Orton, Eric Paire, Dimitri Papadopoulos-Orfanos, Jerry Peek, Chris Pepper, " "Amy Lyn Pilato, Kevin Pilch-Bisson, Hans Polak, Dmitriy Popkov, Michael " "Price, Mark Proctor, Steffen Prohaska, Daniel Rall, Srinivasa Ramanujan, " "Jack Repenning, Tobias Ringstrom, Jason Robbins, Garrett Rooney, Joel " "Rosdahl, Christian Sauer, Ryan Schmidt, Jochem Schulenklopper, Jens Seidel, " "Daniel Shahaf, Larry Shatzer, Danil Shopyrin, Erik Sjoelund, Joey Smith, W. " "Snyder, Stefan Sperling, Robert Spier, M. S. Sriram, Russell Steicke, David " "Steinbrunner, Sander Striker, David Summers, Johan Sundstroem, Ed Swierk, " "John Szakmeister, Arfrever Frehtes Taifersar Arahesis, Robert Tasarz, " "Michael W. Thelen, Mason Thomas, Erik van der Kolk, Joshua Varner, Eric " "Wadsworth, Chris Wagner, Colin Watson, Alex Waugh, Chad Whitacre, Andy " "Whitcroft, Josef Wolf, Luke Worth, Hyrum Wright, Blair Zajac, Florian " "Zumbiehl, und die gesamte Subversion Gemeinde." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:646 msgid "From Ben Collins-Sussman" msgstr "Von Ben Collins-Sussman" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:648 msgid "" "Thanks to my wife Frances, who, for many months, got to hear <quote>But " "honey, I'm still working on the book,</quote> rather than the usual " "<quote>But honey, I'm still doing email.</quote> I don't know where she gets " "all that patience! She's my perfect counterbalance." msgstr "" "Dank meiner Gattin Frances, die sich viele Monate lang <quote>Aber, Schatz, " "ich arbeite noch am Buch</quote> anhören musste, statt des üblichen " "<quote>Aber, Schatz ich bearbeite noch E-Mail</quote>. Ich weiß nicht, woher " "sie all die Geduld nimmt. Sie ist der perfekte Ausgleich für mich." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:654 msgid "" "Thanks to my extended family and friends for their sincere encouragement, " "despite having no actual interest in the subject. (You know, the ones who " "say, <quote>Ooh, you wrote a book?</quote> and then when you tell them it's " "a computer book, sort of glaze over.)" msgstr "" "Dank meiner Verwandtschaft und meinen Freunden für ihre aufrichtige " "Ermutigung, obwohl sie kein tatsächliches Interesse an der Materie hatten. " "(Sie wissen schon, diejenigen, die sagen <quote>Oh, du hast ein Buch " "geschrieben?</quote>, und wenn man ihnen erzählt, es sei ein Computerbuch, " "die Nase rümpfen." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:660 msgid "" "Thanks to all my close friends, who make me a rich, rich man. Don't look at " "me that way—you know who you are." msgstr "" "Vielen Dank an meine engen Freunde, die aus mir einen sehr reichen Mann " "machen. Schaut mich nicht so an – Ihr wisst, wer Ihr seid." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:663 msgid "" "Thanks to my parents for the perfect low-level formatting and being " "unbelievable role models. Thanks to my kids for the opportunity to pass " "that on." msgstr "" "Dank an meine Eltern für die perfekte Grundformatierung und dafür, dass sie " "unglaubliche Leitbilder sind. Dank an meine Kinder, für die Gelegenheit, " "dieses weiterzugeben." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:671 msgid "From Brian W. Fitzpatrick" msgstr "Von Brian W. Fitzpatrick" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:673 msgid "" "Huge thanks to my wife Marie for being incredibly understanding, supportive, " "and most of all, patient. Thank you to my brother Eric who first introduced " "me to Unix programming way back when. Thanks to my Mom and Grandmother for " "all their support, not to mention enduring a Christmas holiday where I came " "home and promptly buried my head in my laptop to work on the book." msgstr "" "Einen riesigen Dank an meine Gattin Marie dafür, dass sie so unglaublich " "verständnisvoll, unterstützend und vor allem so geduldig ist. Dank an meinen " "Bruder Eric, der mich vor langer Zeit als erster an die Programmierung von " "UNIX herangeführt hatte. Dank an meine Mutter und Großmutter für ihre " "Unterstützung; ganz zu schweigen davon, dass sie Weihnachtsfeiertage " "ertragen mussten, an denen ich nach Hause kam und sofort meinen Kopf hinter " "dem Laptop versteckte, um am Buch zu arbeiten." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:681 msgid "" "To Mike and Ben: it was a pleasure working with you on the book. Heck, it's " "a pleasure working with you at work!" msgstr "" "An Mike und Ben: Es war ein Vergnügen, mit Euch am Buch zu arbeiten. " "Verdammt, es ist eine Freude mit Euch auf der Arbeit zusammenzuarbeiten." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:684 msgid "" "To everyone in the Subversion community and the Apache Software Foundation, " "thanks for having me. Not a day goes by where I don't learn something from " "at least one of you." msgstr "" "Dank an alle in der Subversion-Gemeinde und der Apache Software Foundation, " "dafür, dass ihr mich in euren Bann gezogen habt. Kein Tag vergeht, ohne " "dass ich irgendetwas von mindestens einem von Euch lerne." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:689 msgid "" "Lastly, thanks to my grandfather, who always told me that <quote>freedom " "equals responsibility.</quote> I couldn't agree more." msgstr "" "Schließlich Dank an meinen Großvater, der mir immer sagte <quote>Freiheit " "bedeutet Verantwortung</quote>. Ich muss dem voll und ganz zustimmen." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:697 msgid "From C. Michael Pilato" msgstr "Von C. Michael Pilato" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:699 msgid "" "Special thanks to Amy, my best friend and wife of more than ten incredible " "years, for her love and patient support, for putting up with the late " "nights, and for graciously enduring the version control processes I've " "imposed on her. Don't worry, sweetheart—you'll be a TortoiseSVN " "wizard in no time!" msgstr "" "Besonderen Dank an Amy, meiner besten Freundin und Ehefrau für mehr als zehn " "unglaubliche Jahre, für ihre Liebe und geduldige Unterstützung, dafür, dass " "sie sich mit den langen Nächten abfand und gnädig die " "Versionskontrollprozesse ertrug, die ich ihr aufbürdete. Keine Sorge, " "Liebling – binnen kurzer Zeit wirst du eine TortoiseSVN-Expertin sein." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:706 msgid "" "Gavin, you're able to read half of the words in this book yourself now; " "sadly, it's the other half that provide the key concepts. And sorry, Aidan " "— I couldn't find a way to work Disney/Pixar characters into the " "text. But Daddy loves you both, and can't wait to teach you about " "programming." msgstr "" "Gavin, du kannst jetzt die Hälfte der Worte in diesem Buch selber lesen; " "leider liefert die andere Hälfte die Schlüsselkonzepte. Tut mir Leid, Aidan " "– ich habe keine Möglichkeit gefunden, Disney/Pixar-Figuren in diesen " "Text einzuarbeiten. Aber Daddy liebt Euch beide und kann kaum erwarten, Euch " "das Programmieren beizubringen." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:712 msgid "" "Mom and Dad, thanks for your constant support and enthusiasm. Mom- and Dad-" "in-law, thanks for all of the same <emphasis>plus</emphasis> your fabulous " "daughter." msgstr "" "Mutter und Vater, Dank für Eure stetige Unterstützung und Begeisterung. " "Schwiegereltern, Dank für dasselbe <emphasis>plus</emphasis> Eure sagenhafte " "Tochter." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:716 msgid "" "Hats off to Shep Kendall, through whom the world of computers was first " "opened to me; Ben Collins-Sussman, my tour guide through the open source " "world; Karl Fogel, you <emphasis>are</emphasis> my <filename>.emacs</" "filename>; Greg Stein, for oozing practical programming know-how; and Brian " "Fitzpatrick, for sharing this writing experience with me. To the many folks " "from whom I am constantly picking up new knowledge—keep dropping it!" msgstr "" "Hut ab vor Shep Kendall, der mir als erster die Welt der Computer eröffnete; " "Ben Collins-Sussman, mein Reiseführer durch die Open-Source-Welt; Karl Fogel " "– Du <emphasis>bist</emphasis> mein <filename>.emacs</filename>; Greg " "Stein, für überquellendes praktisches Programmierwissen; und Brian " "Fitzpatrick – dafür, dass Du diese Schreiberfahrung mit mir teilst. " "Vor all den vielen Leuten, von denen ich ständig etwas neues aufnehme " "– lasst weiter etwas fallen!" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:725 msgid "" "Finally, to the One who perfectly demonstrates creative excellence—" "thank You." msgstr "" "Schließlich, vor demjenigen, der perfekt kreative Exzellenz demonstriert " "– Dank an Dich." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:737 msgid "What Is Subversion?" msgstr "Was ist Subversion?" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:739 msgid "" "Subversion is a free/open source version control system. That is, " "Subversion manages files and directories, and the changes made to them, over " "time. This allows you to recover older versions of your data or examine the " "history of how your data changed. In this regard, many people think of a " "version control system as a sort of <quote>time machine.</quote>" msgstr "" "Subversion ist ein freies/Open-Source Versionskontrollsystem. Das bedeutet, " "Subversion verwaltet Dateien und Verzeichnisse und die Änderungen an ihnen " "im Lauf der Zeit. Das erlaubt Ihnen, alte Versionen Ihrer Daten " "wiederherzustellen oder die Geschichte der Änderungen zu verfolgen. Unter " "diesem Blickwinkel denken viele Leute bei einem Versionskontrollsystem an " "eine Art <quote>Zeitmaschine</quote>." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:746 msgid "" "Subversion can operate across networks, which allows it to be used by people " "on different computers. At some level, the ability for various people to " "modify and manage the same set of data from their respective locations " "fosters collaboration. Progress can occur more quickly without a single " "conduit through which all modifications must occur. And because the work is " "versioned, you need not fear that quality is the trade-off for losing that " "conduit—if some incorrect change is made to the data, just undo that " "change." msgstr "" "Subversion kann netzwerkübergreifend arbeiten, was die Benutzung durch " "Menschen an verschiedenen Computern ermöglicht. Auf einer bestimmten Ebene " "fördert die Fähigkeit unterschiedlicher Personen dieselbe Menge an Daten " "bearbeiten und verwalten zu können die Zusammenarbeit. Ohne auf einen " "einzigen Kanal, über den alle Änderungen abgewickelt werden müssen, " "beschränkt zu sein, kann das Vorankommen beschleunigt werden. Und weil die " "Arbeit versioniert ist, braucht nicht befürchtet zu werden, dass die " "Qualität bei Verlust dieses Kanals geopfert wird – falls irgendeine " "falsche Änderung an den Daten gemacht wird, kann man sie einfach " "zurücknehmen." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:756 msgid "" "Some version control systems are also software configuration management " "(SCM) systems. These systems are specifically tailored to manage trees of " "source code and have many features that are specific to software " "development—such as natively understanding programming languages, or " "supplying tools for building software. Subversion, however, is not one of " "these systems. It is a general system that can be used to manage " "<emphasis>any</emphasis> collection of files. For you, those files might be " "source code—for others, anything from grocery shopping lists to " "digital video mixdowns and beyond." msgstr "" "Manche Versionskontrollsysteme sind auch Software-Konfigurationsmanagement-" "Systeme. Diese Systeme sind maßgeschneidert, um ganze Verzeichnisbäume mit " "Quellcode zu verwalten und verfügen über viele Merkmale, die spezifisch für " "Software-Entwicklung sind – etwa das Verstehen von Programmiersprachen " "oder das Bereitstellen von Werkzeugen zum Bauen von Software. Jedoch gehört " "Subversion nicht zu diesen Systemen. Es ist ein allgemeines System, das " "verwendet werden kann, um <emphasis>alle möglichen</emphasis> Sammlungen von " "Dateien zu verwalten. Für Sie mag es sich dabei um Quellcode handeln – " "für andere mag es dabei um alles von Einkaufslisten bis zu digitalen " "Videomischungen und weit darüber hinaus gehen." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:772 msgid "Is Subversion the Right Tool?" msgstr "Ist Subversion das richtige Werkzeug?" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:774 msgid "" "If you're a user or system administrator pondering the use of Subversion, " "the first question you should ask yourself is: \"Is this the right tool for " "the job?\" Subversion is a fantastic hammer, but be careful not to view " "every problem as a nail." msgstr "" "Falls Sie ein Anwender oder Systemadministrator sind und den Einsatz von " "Subversion erwägen, sollte die erste Frage, die Sie sich stellen, sein: " "\"Ist es das richtige Werkzeug für die Aufgabe?\" Subversion ist ein " "fantastischer Hammer, achten Sie jedoch darauf, dass Sie nicht jedes Problem " "als einen Nagel sehen." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:780 msgid "" "If you need to archive old versions of files and directories, possibly " "resurrect them, or examine logs of how they've changed over time, then " "Subversion is exactly the right tool for you. If you need to collaborate " "with people on documents (usually over a network) and keep track of who made " "which changes, then Subversion is also appropriate. This is why Subversion " "is so often used in software development environments— programming is " "an inherently social activity, and Subversion makes it easy to collaborate " "with other programmers. Of course, there's a cost to using Subversion as " "well: administrative overhead. You'll need to manage a data repository to " "store the information and all its history, and be diligent about backing it " "up. When working with the data on a daily basis, you won't be able to copy, " "move, rename, or delete files the way you usually do. Instead, you'll have " "to do all of those things through Subversion." msgstr "" "Falls Sie alte Datei- und Verzeichnisversionen aufbewahren, sie eventuell " "wiedererwecken müssen, oder Protokolle darüber auswerten möchten, wie sie " "sich im Lauf der Zeit geändert haben, ist Subversion das genau passende " "Werkzeug für Sie. Subversion ist auch geeignet, wenn Sie mit mehreren " "Leuten gemeinsam (üblicherweise über das Netz) an Dokumenten arbeiten und " "verfolgen müssen, wer welche Änderung gemacht hat. Deshalb wird Subversion " "so oft in Softwareentwicklungsumgebungen eingesetzt – Programmierung " "ist von Natur aus eine soziale Tätigkeit und Subversion vereinfacht die " "Zusammenarbeit mit anderen Programmierern. Natürlich ist die Benutzung von " "Subversion nicht umsonst zu bekommen: es kostet administrativen Aufwand. Sie " "müssen ein Daten-Repository verwalten, das die Informationen und ihre " "gesamte Geschichte speichert, und Sie müssen sich gewissenhaft um " "Sicherheitskopien kümmern. Wenn Sie täglich mit den Daten arbeiten, werden " "Sie sie nicht auf die gleiche Art kopieren, verschieben, umbenennen oder " "löschen können wie gewohnt. Stattdessen müssen Sie dafür Subversion " "verwenden." # type: Content of: <preface><sect1><sect2><para><footnote> #: ../en/book/ch00-preface.xml:798 msgid "" "Assuming you're fine with the extra workflow, you should still make sure " "you're not using Subversion to solve a problem that other tools solve " "better. For example, because Subversion replicates data to all the " "collaborators involved, a common misuse is to treat it as a generic " "distribution system. People will sometimes use Subversion to distribute " "huge collections of photos, digital music, or software packages. The " "problem is that this sort of data usually isn't changing at all. The " "collection itself grows over time, but the individual files within the " "collection aren't being changed. In this case, using Subversion is " "<quote>overkill.</quote> <footnote>" msgstr "" "Unter der Annahme, dass Ihnen die zusätzlichen Arbeitsabläufe nichts " "ausmachen, sollten Sie trotzdem sicher sein, dass Sie Subversion nicht für " "die Lösung eines Problems verwenden, das andere Werkzeuge besser lösen " "könnten. Zum Beispiel wird Subversion, weil es die Daten an alle Beteiligten " "verteilt, als generisches Verteilsystem missbraucht. Manchmal wird " "Subversion zum Verteilen von umfangreichen Bildersammlungen, digitaler Musik " "oder Softwarepaketen verwendet. Das Problem damit ist, dass sich diese Art " "Daten für gewöhnlich überhaupt nicht verändert. Die Sammlung selber wächst " "stetig, jedoch werden die einzelnen Dateien der Sammlung nicht verändert. In " "diesem Fall ist die Benutzung von Subversion zu viel des Guten.<footnote>" # type: Content of: <preface><sect1><sect2><para><footnote><para> #: ../en/book/ch00-preface.xml:811 msgid "Or as a friend puts it, <quote>swatting a fly with a Buick.</quote>" msgstr "" "Oder wie es ein Freund ausdrückt: <quote>Eine Fliege mit einem Buick " "erschlagen.</quote>" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:813 msgid "" "</footnote> There are simpler tools that efficiently replicate data " "<emphasis>without</emphasis> the overhead of tracking changes, such as " "<command>rsync</command> or <command>unison</command>." msgstr "" "</footnote> Es gibt einfachere Werkzeuge, die hervorragend Daten " "replizieren, <emphasis>ohne</emphasis> dabei Änderungen mitzuverfolgen, etwa " "<command>rsync</command> oder <command>unison</command>." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:824 msgid "Subversion's History" msgstr "Die Geschichte von Subversion" # type: Content of: <preface><sect1><sect2><para><indexterm><primary> #: ../en/book/ch00-preface.xml:828 msgid "Subversion" msgstr "Subversion" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:830 msgid "" "</indexterm> In early 2000, CollabNet, Inc. (<ulink url=\"http://www.collab." "net\"/>) began seeking developers to write a replacement for CVS. CollabNet " "offers a collaboration software suite called CollabNet Enterprise Edition " "(CEE), of which one component is version control. Although CEE used CVS as " "its initial version control system, CVS's limitations were obvious from the " "beginning, and CollabNet knew it would eventually have to find something " "better. Unfortunately, CVS had become the de facto standard in the open " "source world largely because there <emphasis>wasn't</emphasis> anything " "better, at least not under a free license. So CollabNet determined to write " "a new version control system from scratch, retaining the basic ideas of CVS, " "but without the bugs and misfeatures." msgstr "" "</indexterm> Anfang 2000 begann CollabNet, Inc. (<ulink url=\"http://www." "collab.net\"/>) Entwickler zu suchen, die einen Ersatz für CVS schreiben " "sollten. CollabNet bietet eine Software-Suite namens CollabNet Enterprise " "Edition (CEE) für die Zusammenarbeit an, die auch eine Komponente für " "Versionskontrolle beinhaltet. Obwohl CEE ursprünglich CVS als " "Versionskontrollsystem verwendete, waren die Einschränkungen von CVS von " "Anfang an offensichtlich, und CollabNet war sich bewusst, dass letztendlich " "etwas Besseres gefunden werden musste. Unglücklicherweise war CVS der de-" "facto Standard in der Open-Source-Welt geworden, hauptsächlich deshalb, weil " "es nichts Besseres gab, zumindest nicht unter einer freien Lizenz. Also " "beschloss CollabNet, ein vollständig neues Versionskontrollsystem zu " "schreiben, welches die grundlegenden Ideen von CVS beibehalten, jedoch die " "Fehler und Fehlentwicklungen vermeiden sollte." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:847 msgid "" "In February 2000, they contacted Karl Fogel, the author of <citetitle>Open " "Source Development with CVS</citetitle> (Coriolis, 1999), and asked if he'd " "like to work on this new project. Coincidentally, at the time Karl was " "already discussing a design for a new version control system with his friend " "Jim Blandy. In 1995, the two had started Cyclic Software, a company " "providing CVS support contracts, and although they later sold the business, " "they still used CVS every day at their jobs. Their frustration with CVS had " "led Jim to think carefully about better ways to manage versioned data, and " "he'd already come up with not only the name <quote>Subversion,</quote> but " "also the basic design of the Subversion data store. When CollabNet called, " "Karl immediately agreed to work on the project, and Jim got his employer, " "Red Hat Software, to essentially donate him to the project for an indefinite " "period of time. CollabNet hired Karl and Ben Collins-Sussman, and detailed " "design work began in May 2000. With the help of some well-placed prods from " "Brian Behlendorf and Jason Robbins of CollabNet, and from Greg Stein (at the " "time an independent developer active in the WebDAV/DeltaV specification " "process), Subversion quickly attracted a community of active developers. It " "turned out that many people had encountered the same frustrating experiences " "with CVS and welcomed the chance to finally do something about it." msgstr "" "Im Februar 2000 nahmen sie Verbindung mit Karl Fogel auf, dem Autor von " "<citetitle>Open Source Development with CVS</citetitle> (Coriolis, 1999), " "und fragten ihn, ob er an diesem neuen Projekt mitarbeiten wolle. " "Zufälligerweise besprach Karl bereits einen Entwurf für ein neues " "Versionskontrollsystem mit seinem Freund Jim Blandy. Im Jahr 1995 gründeten " "die beiden Cyclic Software, eine CVS-Beratungsfirma, und sie benutzten, " "obwohl sie die Firma später verkauften, bei ihrer täglichen Arbeit immer " "noch CVS. Ihre Enttäuschung über CVS veranlasste Jim, sorgfältig über " "bessere Möglichkeiten zur Verwaltung versionierter Daten nachzudenken. Er " "hatte sich nicht nur bereits den Namen <quote>Subversion</quote> ausgedacht, " "sondern auch den grundsätzlichen Entwurf der Subversion-Datenablage. Als " "CollabNet rief, stimmte Karl sofort der Mitarbeit am Projekt zu, und Karl " "gelang es, dass sein Arbeitgeber Red Hat Software ihn praktisch auf " "unbestimmte Zeit dem Projekt spendete. CollabNet stellte Karl und Ben " "Collins-Sussman ein und der detaillierte Entwurfsprozess begann im Mai. Dank " "einiger Stupser von Brian Behrendorf und Jason Robbins von CollabNet sowie " "Greg Stein (zu dieser Zeit als unabhängiger Entwickler aktiv im der WebDAV/" "DeltaV Spezifikationsprozess), zog Subversion schnell eine Gemeinde aktiver " "Entwickler an. Es stellte sich heraus, dass viele Leute dieselben " "enttäuschenden Erfahrungen mit CVS gemacht hatten und nun die Gelegenheit " "begrüßten, etwas daran zu ändern." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:873 msgid "" "The original design team settled on some simple goals. They didn't want to " "break new ground in version control methodology, they just wanted to fix " "CVS. They decided that Subversion would match CVS's features and preserve " "the same development model, but not duplicate CVS's most obvious flaws. And " "although it did not need to be a drop-in replacement for CVS, it should be " "similar enough that any CVS user could make the switch with little effort." msgstr "" "Das ursprüngliche Designteam einigte sich auf einige einfache Ziele. Sie " "wollten kein Neuland in Versionskontrollmethodik betreten, sondern einfach " "CVS reparieren. Sie beschlossen, dass Subversion dieselben Merkmale und " "dasselbe Entwicklungsmodell wie CVS haben solle, wobei die Fehler von CVS " "aber nicht noch einmal gemacht werden sollten. Und obwohl es nicht als ein " "hundertprozentiger Ersatz für CVS gedacht war, sollte es dennoch ähnlich " "genug sein, so dass ein leichter Wechsel für einen CVS-Anwender möglich wäre." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:882 msgid "" "After 14 months of coding, Subversion became <quote>self-hosting</quote> on " "August 31, 2001. That is, Subversion developers stopped using CVS to manage " "Subversion's own source code and started using Subversion instead." msgstr "" "Nach vierzehn Monaten Programmierung wurde Subversion am 31. August 2001 " "<quote>selbstbewirtend</quote>, d.h., die Subversion-Entwickler hörten auf, " "CVS für den Quellcode von Subversion zu verwenden und benutzten stattdessen " "Subversion." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:887 msgid "" "While CollabNet started the project, and still funds a large chunk of the " "work (it pays the salaries of a few full-time Subversion developers), " "Subversion is run like most open source projects, governed by a loose, " "transparent set of rules that encourage meritocracy. CollabNet's copyright " "license is fully compliant with the Debian Free Software Guidelines. In " "other words, anyone is free to download, modify, and redistribute Subversion " "as he pleases; no permission from CollabNet or anyone else is required." msgstr "" "Obwohl CollabNet das Projekt startete und immer noch einen großen Batzen der " "Arbeit finanziert (sie zahlen die Gehälter einiger Vollzeit-Subversion-" "Entwickler), läuft Subversion wie die meisten Open-Source-Projekte, geführt " "von einer Anzahl lockerer, transparenter Regeln, die die Meritokratie " "fördern. Die Urheberrechtslizenzen von CollabNet sind einvernehmlich mit " "den Debian Free Software Guidelines. Mit anderen Worten: Jeder darf " "Subversion nach Belieben herunterladen, ändern und weitergeben; es bedarf " "hierzu keinerlei Zustimmung durch CollabNet oder sonst jemanden." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:902 msgid "Subversion's Architecture" msgstr "Die Architektur von Subversion" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:904 msgid "" "<xref linkend=\"svn.intro.architecture.dia-1\"/> illustrates a <quote>mile-" "high</quote> view of Subversion's design." msgstr "" "<xref linkend=\"svn.intro.architecture.dia-1\"/> illustriert einen " "<quote>kilometerhohen</quote> Blick auf das Design von Subversion." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:909 #, fuzzy #| msgid "Subversion's Architecture" msgid "Subversion's architecture" msgstr "Die Architektur von Subversion" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:913 msgid "" "On one end is a Subversion repository that holds all of your versioned " "data. On the other end is your Subversion client program, which manages " "local reflections of portions of that versioned data (called <quote>working " "copies</quote>). Between these extremes are multiple routes through various " "Repository Access (RA) layers. Some of these routes go across computer " "networks and through network servers which then access the repository. " "Others bypass the network altogether and access the repository directly." msgstr "" "An einem Ende ist das Repository von Subversion, das die gesamten " "versionierten Daten enthält. Am anderen Ende ist das Subversion-Client-" "Programm, das die lokale Spiegelung von Teilen dieser versionierten Daten " "verwaltet (<quote>Arbeitskopien</quote> genannt). Zwischen den " "entgegengesetzten Enden befinden sich mehrere Wege über verschiedene " "Repository-Zugriffsschichten. Einige dieser Pfade gehen über " "Computernetzwerke und über Netzwerkserver, die dann auf das Repository " "zugreifen. Andere lassen das Netz links liegen und greifen direkt auf das " "Repository zu." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:928 msgid "Subversion's Components" msgstr "Die Komponenten von Subversion" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:930 msgid "" "Subversion, once installed, has a number of different pieces. The following " "is a quick overview of what you get. Don't be alarmed if the brief " "descriptions leave you scratching your head—<emphasis>plenty</" "emphasis> more pages in this book are devoted to alleviating that confusion." msgstr "" "Sobald es installiert ist, hat Subversion eine Anzahl verschiedener Teile. " "Was folgt, ist ein schneller Überblick was Sie bekommen. Lassen Sie sich " "nicht beunruhigen, falls die kurzen Beschreibungen Sie dazu veranlassen, " "sich am Kopf zu kratzen – es gibt in diesem Buch <emphasis>jede Menge</" "emphasis> weiterer Seiten, die dem Ziel gewidmet sind, diese Verwirrung zu " "lindern." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:938 ../en/book/ch09-reference.xml:716 #: ../en/book/ch09-reference.xml:825 ../en/book/ch09-reference.xml:961 #: ../en/book/ch09-reference.xml:1041 ../en/book/ch09-reference.xml:1137 #: ../en/book/ch09-reference.xml:1284 ../en/book/ch09-reference.xml:1361 #: ../en/book/ch09-reference.xml:1499 ../en/book/ch09-reference.xml:1705 #: ../en/book/ch09-reference.xml:1818 ../en/book/ch09-reference.xml:2143 #: ../en/book/ch09-reference.xml:2258 ../en/book/ch09-reference.xml:2307 #: ../en/book/ch09-reference.xml:2414 ../en/book/ch09-reference.xml:2601 #: ../en/book/ch09-reference.xml:2742 ../en/book/ch09-reference.xml:2837 #: ../en/book/ch09-reference.xml:3147 ../en/book/ch09-reference.xml:3293 #: ../en/book/ch09-reference.xml:3368 ../en/book/ch09-reference.xml:3452 #: ../en/book/ch09-reference.xml:3581 ../en/book/ch09-reference.xml:3658 #: ../en/book/ch09-reference.xml:3737 ../en/book/ch09-reference.xml:3835 #: ../en/book/ch09-reference.xml:3938 ../en/book/ch09-reference.xml:4075 #: ../en/book/ch09-reference.xml:4206 ../en/book/ch09-reference.xml:4302 #: ../en/book/ch09-reference.xml:4414 ../en/book/ch09-reference.xml:4857 #: ../en/book/ch09-reference.xml:5054 ../en/book/ch09-reference.xml:5142 msgid "svn" msgstr "svn" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:940 msgid "The command-line client program" msgstr "Das Kommandozeilenprogramm" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:945 ../en/book/ch09-reference.xml:8455 #: ../en/book/ch09-reference.xml:8460 ../en/book/ch09-reference.xml:8464 msgid "svnversion" msgstr "svnversion" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:947 msgid "" "A program for reporting the state (in terms of revisions of the items " "present) of a working copy" msgstr "" "Ein Programm, das den Zustand einer Arbeitskopie (durch Revisionen der " "vorliegenden Objekte) berichtet" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:953 ../en/book/ch05-repository-admin.xml:1074 #: ../en/book/ch09-reference.xml:6586 ../en/book/ch09-reference.xml:6698 #: ../en/book/ch09-reference.xml:6744 ../en/book/ch09-reference.xml:6802 #: ../en/book/ch09-reference.xml:6926 ../en/book/ch09-reference.xml:6972 #: ../en/book/ch09-reference.xml:7044 ../en/book/ch09-reference.xml:7091 #: ../en/book/ch09-reference.xml:7128 ../en/book/ch09-reference.xml:7192 #: ../en/book/ch09-reference.xml:7243 ../en/book/ch09-reference.xml:7295 #: ../en/book/ch09-reference.xml:7341 ../en/book/ch09-reference.xml:7396 #: ../en/book/ch09-reference.xml:7461 ../en/book/ch09-reference.xml:7520 #: ../en/book/ch09-reference.xml:7564 msgid "svnlook" msgstr "svnlook" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:955 msgid "A tool for directly inspecting a Subversion repository" msgstr "Ein Werkzeug zur direkten Untersuchung eines Subversion-Repositorys" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:960 ../en/book/ch05-repository-admin.xml:1039 #: ../en/book/ch09-reference.xml:5320 ../en/book/ch09-reference.xml:5509 #: ../en/book/ch09-reference.xml:5557 ../en/book/ch09-reference.xml:5636 #: ../en/book/ch09-reference.xml:5676 ../en/book/ch09-reference.xml:5778 #: ../en/book/ch09-reference.xml:5809 ../en/book/ch09-reference.xml:5861 #: ../en/book/ch09-reference.xml:5894 ../en/book/ch09-reference.xml:5943 #: ../en/book/ch09-reference.xml:6010 ../en/book/ch09-reference.xml:6064 #: ../en/book/ch09-reference.xml:6104 ../en/book/ch09-reference.xml:6186 #: ../en/book/ch09-reference.xml:6232 ../en/book/ch09-reference.xml:6287 #: ../en/book/ch09-reference.xml:6348 ../en/book/ch09-reference.xml:6404 #: ../en/book/ch09-reference.xml:6458 ../en/book/ch09-reference.xml:6526 msgid "svnadmin" msgstr "svnadmin" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:962 msgid "A tool for creating, tweaking, or repairing a Subversion repository" msgstr "" "Ein Werkzeug zum Erstellen, Verändern oder Reparieren eines Repositorys" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:968 ../en/book/ch08-embedding-svn.xml:118 #: ../en/book/ch09-reference.xml:8615 msgid "mod_dav_svn" msgstr "mod_dav_svn" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:970 msgid "" "A plug-in module for the Apache HTTP Server, used to make your repository " "available to others over a network" msgstr "" "Ein Plug-In-Modul für den Apache-HTTP-Server, wird benötigt, um das " "Repository über ein Netzwerk verfügbar zu machen" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:977 ../en/book/ch06-server-configuration.xml:82 #: ../en/book/ch09-reference.xml:8022 msgid "svnserve" msgstr "svnserve" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:979 msgid "" "A custom standalone server program, runnable as a daemon process or " "invokable by SSH; another way to make your repository available to others " "over a network." msgstr "" "Ein spezielles Server-Programm, dass als Hintergrundprozess laufen oder von " "SSH aufgerufen werden kann; eine weitere Möglichkeit, das Repository über " "ein Netzwerk verfügbar zu machen." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:986 ../en/book/ch05-repository-admin.xml:1205 #: ../en/book/ch09-reference.xml:8207 ../en/book/ch09-reference.xml:8289 #: ../en/book/ch09-reference.xml:8352 ../en/book/ch09-reference.xml:8417 msgid "svndumpfilter" msgstr "svndumpfilter" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:988 msgid "A program for filtering Subversion repository dump streams" msgstr "Ein Programm zum Filtern von Subversion-Repository-Dump-Streams" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:994 ../en/book/ch05-repository-admin.xml:1242 #: ../en/book/ch09-reference.xml:7610 ../en/book/ch09-reference.xml:7745 #: ../en/book/ch09-reference.xml:7815 ../en/book/ch09-reference.xml:7855 #: ../en/book/ch09-reference.xml:7932 msgid "svnsync" msgstr "svnsync" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:996 msgid "" "A program for incrementally mirroring one repository to another over a " "network" msgstr "" "Ein Programm zum inkrementellen Spiegeln eines Repositorys über ein Netzwerk" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:1008 msgid "What's New in Subversion" msgstr "Was gibt es Neues in Subversion" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:1010 msgid "" "The first edition of this book was released in 2004, shortly after " "Subversion had reached 1.0. Over the following four years Subversion " "released five major new versions, fixing bugs and adding major new " "features. While we've managed to keep the online version of this book up to " "date, we're thrilled that the second edition from O'Reilly now covers " "Subversion up through release 1.5, a major milestone for the project. " "Here's a quick summary of major new changes since Subversion 1.0. Note that " "this is not a complete list; for full details, please visit Subversion's web " "site at <ulink url=\"http://subversion.tigris.org\"/>." msgstr "" "Die erste Auflage dieses Buchs wurde 2004 herausgegeben, kurz nachdem " "Subversion die 1.0 erreicht hatte. Innerhalb der nächsten vier Jahre wurden " "fünf neue größere Versionen von Subversion freigegeben, die Fehler " "beseitigten und neue Features einführten. Während wir es schafften, die " "Online-Version dieses Buches aktuell zu halten, sind wir begeistert davon, " "dass die zweite Auflage von O'Reilly nun Subversion bis Release 1.5 " "behandelt, ein großer Meilenstein für das Projekt. Hier ist eine schnelle " "Zusammenfassung der größeren Änderungen seit Subversion 1.0. Beachten Sie, " "dass es keine komplette Liste ist; um alle Details zu sehen, besuchen Sie " "die Subversion-Website bei <ulink url=\"http://subversion.tigris.org\"/>." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:1025 msgid "Subversion 1.1 (September 2004)" msgstr "Subversion 1.1 (September 2004)" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:1027 msgid "" "Release 1.1 introduced FSFS, a flat-file repository storage option for the " "repository. While the Berkeley DB backend is still widely used and " "supported, FSFS has since become the default choice for newly created " "repositories due to its low barrier to entry and minimal maintenance " "requirements. Also in this release came the ability to put symbolic links " "under version control, auto-escaping of URLs, and a localized user interface." msgstr "" "Release 1.1 führte FSFS ein, eine Repository-Speicheroption, die auf Dateien " "basiert. Obwohl das Berkeley-DB-Backend immer noch weitverbreitet ist und " "unterstützt wird, ist FSFS mittlerweile wegen der niedrigen Einstiegshürde " "und des minimalen Wartungsbedarfs die Standard-Auswahl für neu erzeugte " "Repositorys. Ebenfalls kam mit diesem Release die Möglichkeit, symbolische " "Links unter Versionskontrolle zu stellen, das automatische Maskieren von " "URLs und eine sprachabhängige Benutzerschnittstelle." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:1040 msgid "Subversion 1.2 (May 2005)" msgstr "Subversion 1.2 (Mai 2005)" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:1042 msgid "" "Release 1.2 introduced the ability to create server-side locks on files, " "thus serializing commit access to certain resources. While Subversion is " "still a fundamentally concurrent version control system, certain types of " "binary files (e.g. art assets) cannot be merged together. The locking " "feature fulfills the need to version and protect such resources. With " "locking also came a complete WebDAV auto-versioning implementation, allowing " "Subversion repositories to be mounted as network folders. Finally, " "Subversion 1.2 began using a new, faster binary-differencing algorithm to " "compress and retrieve old versions of files." msgstr "" "Mit Release 1.2 konnten serverseitige Sperren auf Dateien erzeugt und somit " "der Commit-Zugriff für bestimmte Ressourcen serialisiert werden. Während " "Subversion immer noch grundsätzlich ein gleichzeitiges " "Versionskontrollsystem ist, können bestimmte Arten binärer Dateien (z.B. " "Kunstobjekte) nicht zusammengeführt werden. Die Sperrmöglichkeit stillt den " "Bedarf, solche Ressourcen zu versionieren und zu schützen. Zusammen mit dem " "Sperren kam auch eine vollständige WebDAV-Auto-Versionierungs-" "Implementierung, die es erlaubt, Subversion-Repositorys als " "Netzwerkverzeichnisse einzuhängen. Schließlich begann Subversion 1.2 einen " "neuen, schnelleren binären Differenzalgorithmus zu verwenden, um alte " "Versionen von Dateien zu komprimieren und hervorzuholen." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:1058 msgid "Subversion 1.3 (December 2005)" msgstr "Subversion 1.3 (Dezember 2005)" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:1060 msgid "" "Release 1.3 brought path-based authorization controls to the " "<command>svnserve</command> server, matching a feature formerly found only " "in the Apache server. The Apache server, however, gained some new logging " "features of its own, and Subversion's API bindings to other languages also " "made great leaps forward." msgstr "" "Release 1.3 brachte pfadbasierte Autorisierungskontrolle für den " "<command>svnserve</command>-Server, was einem Merkmal entsprach, das vorher " "nur im Apache-Server vorzufinden war. Der Apache-Server wiederum bekam " "einige neue eigene Logging-Features, und die Subversion-API-Bindings für " "andere Sprachen machten auch große Sprünge vorwärts." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:1071 msgid "Subversion 1.4 (September 2006)" msgstr "Subversion 1.4 (September 2006)" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:1073 msgid "" "Release 1.4 introduced a whole new tool—<command>svnsync</" "command>—for doing one-way repository replication over a network. " "Major parts of the working copy metadata were revamped to no longer use XML " "(resulting in client-side speed gains), while the Berkeley DB repository " "backend gained the ability to automatically recover itself after a server " "crash." msgstr "" "Release 1.4 führte ein völlig neues Werkzeug – <command>svnsync</" "command> – ein, um eine Einbahn-Replizierung von Repositorys über das " "Netz vornehmen zu können. Größere Teile der Arbeitskopie-Metadaten wurden " "überarbeitet, so dass nicht mehr XML benutzt wurde (was sich in erhöhter " "Geschwindigkeit auf Client-Seite niederschlug), während das Berkeley-DB-" "Repository-Backend die Fähigkeit erhielt, sich nach einem Server-Crash " "automatisch wiederherzustellen." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:1085 msgid "Subversion 1.5 (June 2008)" msgstr "Subversion 1.5 (Juni 2008)" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:1087 msgid "" "Release 1.5 took much longer to finish than prior releases, but the " "headliner feature was gigantic: semi-automated tracking of branching and " "merging. This was a huge boon for users, and pushed Subversion far beyond " "the abilities of CVS and into the ranks of commercial competitors such as " "Perforce and Clearcase. Subversion 1.5 also introduced a bevy of other user-" "focused features, such as interactive resolution of file conflicts, partial " "checkouts, client-side management of changelists, powerful new syntax for " "externals definitions, and SASL authentication support for the " "<command>svnserve</command> server." msgstr "" "Release 1.5 brauchte viel länger als vorige Releases, doch das Hauptfeature " "war gigantisch: Halbautomatische Verfolgung des Verzweigens und " "Zusammenführens. Dies war eine riesige Wohltat für Anwender und schob " "Subversion weit jenseits der Fähigkeiten von CVS und in die Reihen " "kommerzieller Mitbewerber wie Perforce und Clearcase. Subversion 1.5 führte " "auch eine große Anzahl anderer, benutzerorientierter Features ein, wie die " "interaktive Auflösung von Dateikonflikten, partielle Checkouts, client-" "seitige Verwaltung von Änderungslisten, eine starke neue Syntax für External-" "Definitionen und SASL-Authentifizierungsunterstützung für den " "<command>svnserve</command>-Server." # type: Content of: <chapter><title> #: ../en/book/ch01-fundamental-concepts.xml:2 msgid "Fundamental Concepts" msgstr "Grundlegende Konzepte" # type: Content of: <chapter><para> #: ../en/book/ch01-fundamental-concepts.xml:4 msgid "" "This chapter is a short, casual introduction to Subversion. If you're new " "to version control, this chapter is definitely for you. We begin with a " "discussion of general version control concepts, work our way into the " "specific ideas behind Subversion, and show some simple examples of " "Subversion in use." msgstr "" "Das Kapitel ist eine kurze, lockere Einführung in Subversion. Wenn Sie noch " "nicht mit Versionskontrolle zu tun hatten, dann ist dieses Kapitel genau für " "Sie. Wir besprechen die grundlegenden Konzepte von Versionskontrolle und " "arbeiten uns in die Richtung von Subversion und dessen spezifischen Ideen " "und zeigen einfache Beispiele zur Anwendung." # type: Content of: <chapter><para> #: ../en/book/ch01-fundamental-concepts.xml:11 msgid "" "Even though the examples in this chapter show people sharing collections of " "program source code, keep in mind that Subversion can manage any sort of " "file collection—it's not limited to helping computer programmers." msgstr "" "Obwohl die Beispiele in diesem Kapitel Leute zeigen, die gemeinsam an " "Quellcode arbeiten, sei daran erinnert, dass Subversion alle möglichen Arten " "von Datensammlungen verwalten kann – es beschränkt sich nicht darauf, " "Entwicklern zu helfen." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:21 msgid "The Repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:23 msgid "" "Subversion is a centralized system for sharing information. At its core is " "a repository, which is a central store of data. The repository stores " "information in the form of a <firstterm>filesystem tree</firstterm>—a " "typical hierarchy of files and directories. Any number of " "<firstterm>clients</firstterm> connect to the repository, and then read or " "write to these files. By writing data, a client makes the information " "available to others; by reading data, the client receives information from " "others. <xref linkend=\"svn.basic.repository.dia-1\"/> illustrates this." msgstr "" "Subversion ist ein zentralisiertes System zur gemeinsamen Nutzung von " "Informationen. In seinem Kern ist ein Repository ein zentraler Speicher von " "Daten. Das Repository speichert Informationen in Form eines " "<firstterm>Dateisystembaumes</firstterm>, typischerweise eine Hierarchie von " "Dateien und Verzeichnissen. Eine beliebige Anzahl von <firstterm>Clients</" "firstterm> verbinden sich mit dem Repository und lesen oder schreiben diese " "Dateien. Durch den Schreibvorgang, macht ein Client Informationen für andere " "verfügbar. Durch den Lesevorgang bekommt der Client Informationen von " "anderen zur Verfügung gestellt. <xref linkend=\"svn.basic.repository.dia-1" "\"/> verdeutlicht das." # type: Content of: <chapter><sect1><figure><title> #: ../en/book/ch01-fundamental-concepts.xml:35 msgid "A typical client/server system" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:39 msgid "" "So why is this interesting? So far, this sounds like the definition of a " "typical file server. And indeed, the repository <emphasis>is</emphasis> a " "kind of file server, but it's not your usual breed. What makes the " "Subversion repository special is that <emphasis>it remembers every change</" "emphasis> ever written to it—every change to every file, and even " "changes to the directory tree itself, such as the addition, deletion, and " "rearrangement of files and directories." msgstr "" "So, warum ist das interessant? Bis zu diesem Punkt hört sich das wie die " "Definition eines typischen File-Servers an. Und tatsächlich, das Repository " "<emphasis>ist</emphasis> eine Art von File-Server, aber nicht von der Art, " "die Sie kennen. Was das Subversion-Repository so speziell macht ist, dass " "es sich <emphasis>jede Änderung merkt</emphasis>, die jemals " "hineingeschrieben wurde. Jede Änderung an jeder Datei und auch Änderungen am " "Verzeichnisbaum selbst, wie z.B. das Hinzufügen, Löschen und Umstrukturieren " "von Dateien und Verzeichnissen." # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:48 msgid "" "When a client reads data from the repository, it normally sees only the " "latest version of the filesystem tree. But the client also has the ability " "to view <emphasis>previous</emphasis> states of the filesystem. For " "example, a client can ask historical questions such as <quote>What did this " "directory contain last Wednesday?</quote> and <quote>Who was the last person " "to change this file, and what changes did he make?</quote> These are the " "sorts of questions that are at the heart of any <firstterm>version control " "system</firstterm>: systems that are designed to track changes to data over " "time." msgstr "" "Wenn ein Client Daten vom Repository liest, bekommt der Client üblicherweise " "nur die letzte Version des Dateisystem-Baumes zu sehen. Der Client hat aber " "auch die Möglichkeit, <emphasis>vorherige</emphasis> Zustände des " "Dateibaumes anzuschauen. Zum Beispiel kann ein Client somit die Frage " "stellen: <quote>Was beinhaltete das Verzeichnis am letzten Mittwoch?</quote> " "und <quote>Wer war die Person, die als letztes die Datei geändert hat und " "welche Änderungen hat sie gemacht?</quote>. Diese Art von Fragen sind die " "Grundlage eines <firstterm>Versionskontrollsystems</firstterm>, Systeme, die " "dazu entwickelt wurden, um die Änderungen an Daten über die Zeit hin " "aufzuzeichnen." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:66 msgid "Versioning Models" msgstr "Versionierungsmodelle" # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:68 msgid "" "The core mission of a version control system is to enable collaborative " "editing and sharing of data. But different systems use different strategies " "to achieve this. It's important to understand these different strategies, " "for a couple of reasons. First, it will help you compare and contrast " "existing version control systems, in case you encounter other systems " "similar to Subversion. Beyond that, it will also help you make more " "effective use of Subversion, since Subversion itself supports a couple of " "different ways of working." msgstr "" "Die zentrale Aufgabe eines Versionskontrollsystems ist es, die " "Zusammenarbeit beim Editieren gemeinsam benutzter Daten zu ermöglichen. " "Jedoch verwenden unterschiedliche Systeme auch unterschiedliche Strategien, " "um dies zu ermöglichen. Aus einer Reihe von Gründen ist es wichtig, diese " "Unterschiede zu verstehen. Erstmal hilft es dabei, bestehende " "Versionskontrollsysteme zu vergleichen und gegenüberzustellen, falls Ihnen " "andere Systeme begegnen, die Subversion ähneln. Darüber hinaus wird es " "Ihnen helfen, Subversion effektiver zu benutzen, da Subversion selbst eine " "Reihe unterschiedlicher Arbeitsweisen unterstützt." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:80 msgid "The Problem of File Sharing" msgstr "Das Problem ??The Problem of File Sharing" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:82 msgid "" "All version control systems have to solve the same fundamental problem: how " "will the system allow users to share information, but prevent them from " "accidentally stepping on each other's feet? It's all too easy for users to " "accidentally overwrite each other's changes in the repository." msgstr "" "Alle Versionskontrollsysteme haben alle die gleichen fundamentalen Probleme " "zu lösen: Wie soll es Anwendern erlaubt werden Informationen zu teilen aber " "Sie davor bewahren, sich gegenseitig auf die Füße zu treten? Es ist allzu " "einfach die Änderungen eines anderen im Repository zu überschreiben?" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:89 msgid "" "Consider the scenario shown in <xref linkend=\"svn.basic.vsn-models.problem-" "sharing.dia-1\"/>. Suppose we have two coworkers, Harry and Sally. They " "each decide to edit the same repository file at the same time. If Harry " "saves his changes to the repository first, it's possible that (a few moments " "later) Sally could accidentally overwrite them with her own new version of " "the file. While Harry's version of the file won't be lost forever (because " "the system remembers every change), any changes Harry made <emphasis>won't</" "emphasis> be present in Sally's newer version of the file, because she never " "saw Harry's changes to begin with. Harry's work is still effectively " "lost—or at least missing from the latest version of the file—and " "probably by accident. This is definitely a situation we want to avoid!" msgstr "" "Beachten Sie das dargestellte Szenario Consider<xref linkend=\"svn.basic.vsn-" "models.problem-sharing.dia-1\"/>. Nehmen wir an wir haben zwei Kollegen, " "Harry und Sally. Sie haben sich beide entschieden die gleiche Datei zur " "gleichen Zeit zu bearbeiten. Wenn Harry seine Änderungen im Repository " "zuerst speichert ist es möglich, dass einige Augenblicke später, Sally " "unbeabsichtigt mit Ihrer eigenen Version der Datei überschreibt. Während " "Harry's Version der Datei nicht für immer verloren ist (weil das System " "jegliche Änderung aufzeichnet) jede Änderung die Harry gemacht hat overwrite " "them with her own new version of the file. While Harry's version of the " "file won't be lost forever (because the system remembers every change), any " "changes Harry made <emphasis>won't</emphasis> be present in Sally's newer " "version of the file, because she never saw Harry's changes to begin with. " "Harry's work is still effectively lost—or at least missing from the " "latest version of the file—and probably by accident. This is " "definitely a situation we want to avoid!" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:106 #, fuzzy #| msgid "The Problem of File Sharing" msgid "The problem to avoid" msgstr "Das Problem ??The Problem of File Sharing" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:114 msgid "The Lock-Modify-Unlock Solution" msgstr "The Lock-Modify-Unlock Solution" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:116 msgid "" "Many version control systems use a <firstterm>lock-modify-unlock</firstterm> " "model to address the problem of many authors clobbering each other's work. " "In this model, the repository allows only one person to change a file at a " "time. This exclusivity policy is managed using locks. Harry must " "<quote>lock</quote> a file before he can begin making changes to it. If " "Harry has locked a file, Sally cannot also lock it, and therefore cannot " "make any changes to that file. All she can do is read the file and wait for " "Harry to finish his changes and release his lock. After Harry unlocks the " "file, Sally can take her turn by locking and editing the file. <xref " "linkend=\"svn.basic.vsn-models.lock-unlock.dia-1\"/> demonstrates this " "simple solution." msgstr "" "Many version control systems use a <firstterm>lock-modify-unlock</firstterm> " "model to address the problem of many authors clobbering each other's work. " "In this model, the repository allows only one person to change a file at a " "time. This exclusivity policy is managed using locks. Harry must " "<quote>lock</quote> a file before he can begin making changes to it. If " "Harry has locked a file, Sally cannot also lock it, and therefore cannot " "make any changes to that file. All she can do is read the file and wait for " "Harry to finish his changes and release his lock. After Harry unlocks the " "file, Sally can take her turn by locking and editing the file. <xref " "linkend=\"svn.basic.vsn-models.lock-unlock.dia-1\"/> demonstrates this " "simple solution." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:132 #, fuzzy #| msgid "The Lock-Modify-Unlock Solution" msgid "The lock-modify-unlock solution" msgstr "The Lock-Modify-Unlock Solution" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:136 msgid "" "The problem with the lock-modify-unlock model is that it's a bit restrictive " "and often becomes a roadblock for users:" msgstr "" "The problem with the lock-modify-unlock model is that it's a bit restrictive " "and often becomes a roadblock for users:" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:142 msgid "" "<emphasis>Locking may cause administrative problems.</emphasis> Sometimes " "Harry will lock a file and then forget about it. Meanwhile, because Sally " "is still waiting to edit the file, her hands are tied. And then Harry goes " "on vacation. Now Sally has to get an administrator to release Harry's " "lock. The situation ends up causing a lot of unnecessary delay and wasted " "time." msgstr "" "<emphasis>Locking may cause administrative problems.</emphasis> Sometimes " "Harry will lock a file and then forget about it. Meanwhile, because Sally " "is still waiting to edit the file, her hands are tied. And then Harry goes " "on vacation. Now Sally has to get an administrator to release Harry's " "lock. The situation ends up causing a lot of unnecessary delay and wasted " "time." # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:154 msgid "" "<emphasis>Locking may cause unnecessary serialization.</emphasis> What if " "Harry is editing the beginning of a text file, and Sally simply wants to " "edit the end of the same file? These changes don't overlap at all. They " "could easily edit the file simultaneously, and no great harm would come, " "assuming the changes were properly merged together. There's no need for " "them to take turns in this situation." msgstr "" "<emphasis>Locking may cause unnecessary serialization.</emphasis> What if " "Harry is editing the beginning of a text file, and Sally simply wants to " "edit the end of the same file? These changes don't overlap at all. They " "could easily edit the file simultaneously, and no great harm would come, " "assuming the changes were properly merged together. There's no need for " "them to take turns in this situation." # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:167 msgid "" "<emphasis>Locking may create a false sense of security.</emphasis> Suppose " "Harry locks and edits file A, while Sally simultaneously locks and edits " "file B. But what if A and B depend on one another, and the changes made to " "each are semantically incompatible? Suddenly A and B don't work together " "anymore. The locking system was powerless to prevent the problem—yet " "it somehow provided a false sense of security. It's easy for Harry and " "Sally to imagine that by locking files, each is beginning a safe, insulated " "task, and thus they need not bother discussing their incompatible changes " "early on. Locking often becomes a substitute for real communication." msgstr "" "<emphasis>Locking may create a false sense of security.</emphasis> Suppose " "Harry locks and edits file A, while Sally simultaneously locks and edits " "file B. But what if A and B depend on one another, and the changes made to " "each are semantically incompatible? Suddenly A and B don't work together " "anymore. The locking system was powerless to prevent the problem—yet " "it somehow provided a false sense of security. It's easy for Harry and " "Sally to imagine that by locking files, each is beginning a safe, insulated " "task, and thus they need not bother discussing their incompatible changes " "early on. Locking often becomes a substitute for real communication." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:188 msgid "The Copy-Modify-Merge Solution" msgstr "The Copy-Modify-Merge Solution" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:190 msgid "" "Subversion, CVS, and many other version control systems use a " "<firstterm>copy-modify-merge</firstterm> model as an alternative to " "locking. In this model, each user's client contacts the project repository " "and creates a personal <firstterm>working copy</firstterm>—a local " "reflection of the repository's files and directories. Users then work " "simultaneously and independently, modifying their private copies. Finally, " "the private copies are merged together into a new, final version. The " "version control system often assists with the merging, but ultimately, a " "human being is responsible for making it happen correctly." msgstr "" "Subversion, CVS, and many other version control systems use a " "<firstterm>copy-modify-merge</firstterm> model as an alternative to " "locking. In this model, each user's client contacts the project repository " "and creates a personal <firstterm>working copy</firstterm>—a local " "reflection of the repository's files and directories. Users then work " "simultaneously and independently, modifying their private copies. Finally, " "the private copies are merged together into a new, final version. The " "version control system often assists with the merging, but ultimately, a " "human being is responsible for making it happen correctly." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:202 msgid "" "Here's an example. Say that Harry and Sally each create working copies of " "the same project, copied from the repository. They work concurrently and " "make changes to the same file A within their copies. Sally saves her " "changes to the repository first. When Harry attempts to save his changes " "later, the repository informs him that his file A is <firstterm>out of date</" "firstterm>. In other words, file A in the repository has somehow changed " "since he last copied it. So Harry asks his client to <firstterm>merge</" "firstterm> any new changes from the repository into his working copy of file " "A. Chances are that Sally's changes don't overlap with his own; once he has " "both sets of changes integrated, he saves his working copy back to the " "repository. <xref linkend=\"svn.basic.vsn-models.copy-merge.dia-1\"/> and " "<xref linkend=\"svn.basic.vsn-models.copy-merge.dia-2\"/> show this process." msgstr "" "Here's an example. Say that Harry and Sally each create working copies of " "the same project, copied from the repository. They work concurrently and " "make changes to the same file A within their copies. Sally saves her " "changes to the repository first. When Harry attempts to save his changes " "later, the repository informs him that his file A is <firstterm>out of date</" "firstterm>. In other words, that file A in the repository has somehow " "changed since he last copied it. So Harry asks his client to " "<firstterm>merge</firstterm> any new changes from the repository into his " "working copy of file A. Chances are that Sally's changes don't overlap with " "his own; once he has both sets of changes integrated, he saves his working " "copy back to the repository. <xref linkend=\"svn.basic.vsn-models.copy-" "merge.dia-1\"/> and <xref linkend=\"svn.basic.vsn-models.copy-merge.dia-2\"/" "> show this process." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:220 #, fuzzy #| msgid "The Copy-Modify-Merge Solution" msgid "The copy-modify-merge solution" msgstr "The Copy-Modify-Merge Solution" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:225 #, fuzzy #| msgid "The Copy-Modify-Merge Solution" msgid "The copy-modify-merge solution (continued)" msgstr "The Copy-Modify-Merge Solution" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:229 msgid "" "But what if Sally's changes <emphasis>do</emphasis> overlap with Harry's " "changes? What then? This situation is called a <firstterm>conflict</" "firstterm>, and it's usually not much of a problem. When Harry asks his " "client to merge the latest repository changes into his working copy, his " "copy of file A is somehow flagged as being in a state of conflict: he'll be " "able to see both sets of conflicting changes and manually choose between " "them. Note that software can't automatically resolve conflicts; only humans " "are capable of understanding and making the necessary intelligent choices. " "Once Harry has manually resolved the overlapping changes—perhaps after " "a discussion with Sally—he can safely save the merged file back to the " "repository." msgstr "" "But what if Sally's changes <emphasis>do</emphasis> overlap with Harry's " "changes? What then? This situation is called a <firstterm>conflict</" "firstterm>, and it's usually not much of a problem. When Harry asks his " "client to merge the latest repository changes into his working copy, his " "copy of file A is somehow flagged as being in a state of conflict: he'll be " "able to see both sets of conflicting changes and manually choose between " "them. Note that software can't automatically resolve conflicts; only humans " "are capable of understanding and making the necessary intelligent choices. " "Once Harry has manually resolved the overlapping changes—perhaps after " "a discussion with Sally—he can safely save the merged file back to the " "repository." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:243 msgid "" "The copy-modify-merge model may sound a bit chaotic, but in practice, it " "runs extremely smoothly. Users can work in parallel, never waiting for one " "another. When they work on the same files, it turns out that most of their " "concurrent changes don't overlap at all; conflicts are infrequent. And the " "amount of time it takes to resolve conflicts is usually far less than the " "time lost by a locking system." msgstr "" "The copy-modify-merge model may sound a bit chaotic, but in practice, it " "runs extremely smoothly. Users can work in parallel, never waiting for one " "another. When they work on the same files, it turns out that most of their " "concurrent changes don't overlap at all; conflicts are infrequent. And the " "amount of time it takes to resolve conflicts is usually far less than the " "time lost by a locking system." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:251 msgid "" "In the end, it all comes down to one critical factor: user communication. " "When users communicate poorly, both syntactic and semantic conflicts " "increase. No system can force users to communicate perfectly, and no system " "can detect semantic conflicts. So there's no point in being lulled into a " "false sense of security that a locking system will somehow prevent " "conflicts; in practice, locking seems to inhibit productivity more than " "anything else." msgstr "" "In the end, it all comes down to one critical factor: user communication. " "When users communicate poorly, both syntactic and semantic conflicts " "increase. No system can force users to communicate perfectly, and no system " "can detect semantic conflicts. So there's no point in being lulled into a " "false sense of security that a locking system will somehow prevent " "conflicts; in practice, locking seems to inhibit productivity more than " "anything else." # type: Content of: <chapter><sect1><sect2><sidebar> #: ../en/book/ch01-fundamental-concepts.xml:260 msgid "<sidebar id=\"svn.basic.vsn-models.copy-merge.sb-1\">" msgstr "<sidebar id=\"svn.basic.vsn-models.copy-merge.sb-1\">" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch01-fundamental-concepts.xml:261 msgid "When Locking Is Necessary" msgstr "When Locking Is Necessary" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:263 msgid "" "While the lock-modify-unlock model is considered generally harmful to " "collaboration, sometimes locking is appropriate." msgstr "" "While the lock-modify-unlock model is considered generally harmful to " "collaboration, sometimes locking is appropriate." # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:267 msgid "" "The copy-modify-merge model is based on the assumption that files are " "contextually mergeable—that is, that the majority of the files in the " "repository are line-based text files (such as program source code). But for " "files with binary formats, such as artwork or sound, it's often impossible " "to merge conflicting changes. In these situations, it really is necessary " "for users to take strict turns when changing the file. Without serialized " "access, somebody ends up wasting time on changes that are ultimately " "discarded." msgstr "" "The copy-modify-merge model is based on the assumption that files are " "contextually mergeable—that is, that the majority of the files in the " "repository are line-based text files (such as program source code). But for " "files with binary formats, such as artwork or sound, it's often impossible " "to merge conflicting changes. In these situations, it really is necessary " "for users to take strict turns when changing the file. Without serialized " "access, somebody ends up wasting time on changes that are ultimately " "discarded." # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:278 msgid "" "While Subversion is primarily a copy-modify-merge system, it still " "recognizes the need to lock an occasional file, and thus provides mechanisms " "for this. We discuss this feature in <xref linkend=\"svn.advanced.locking\"/" ">." msgstr "" "While Subversion is primarily a copy-modify-merge system, it still " "recognizes the need to lock an occasional file, and thus provides mechanisms " "for this. We discuss this feature in <xref linkend=\"svn.advanced.locking\"/" ">." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:295 msgid "Subversion in Action" msgstr "Subversion in Action" # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:297 msgid "" "It's time to move from the abstract to the concrete. In this section, we'll " "show real examples of Subversion being used." msgstr "" "Es ist an der Zeit, sich vom Abstrakten zum Konkreten zu bewegen. In diesem " "Abschnitt werden wir echte Beispiele zur Benutzung von Subversion zeigen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:303 msgid "Subversion Repository URLs" msgstr "Subversion-Repository-URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:305 msgid "" "Throughout this book, Subversion uses URLs to identify versioned files and " "directories in Subversion repositories. For the most part, these URLs use " "the standard syntax, allowing for server names and port numbers to be " "specified as part of the URL:" msgstr "" "Das ganze Buch hindurch verwendet Subversion URLs, um Dateien und " "Verzeichnisse in Subversion-Repositorys zu identifizieren. Meistens benutzen " "diese URLs die Standardsyntax, die es erlaubt, Servernamen und Portnummern " "als Teil des URL zu spezifizieren:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:311 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" msgstr "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:316 msgid "" "But there are some nuances in Subversion's handling of URLs that are " "notable. For example, URLs containing the <literal>file://</literal> access " "method (used for local repositories) must, in accordance with convention, " "have either a server name of <literal>localhost</literal> or no server name " "at all:" msgstr "" "Allerdings gibt es einige bemerkenswerte Feinheiten, wie Subversion mit URLs " "umgeht. Beispielsweise dürfen URLs, die die <literal>file://</literal>-" "Zugriffsmethode enthalten (für lokale Repositorys verwendet), gemäß " "Konvention entweder den Servernamen <literal>localhost</literal> oder gar " "keinen Servernamen enthalten:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:323 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos\n" "…\n" "$ svn checkout file://localhost/var/svn/repos\n" "…\n" msgstr "" "\n" "$ svn checkout file:///var/svn/repos\n" "…\n" "$ svn checkout file://localhost/var/svn/repos\n" "…\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:330 msgid "" "Also, users of the <literal>file://</literal> scheme on Windows platforms " "will need to use an unofficially <quote>standard</quote> syntax for " "accessing repositories that are on the same machine, but on a different " "drive than the client's current working drive. Either of the two following " "URL path syntaxes will work, where <literal>X</literal> is the drive on " "which the repository resides:" msgstr "" "Darüber hinaus müssen Benutzer des <literal>file://</literal> Schemas auf " "Windows-Plattformen eine inoffizielle <quote>Standard</quote>-Syntax " "verwenden falls auf Repositorys auf derselben Maschine aber auf einem " "anderen Laufwerk zugegriffen werden soll. Beide der folgenden URL-Pfad-" "Syntaxen funktionieren, wobei <literal>X</literal> das Laufwerk ist, wo das " "Repository liegt:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:339 #, no-wrap msgid "" "\n" "C:\\> svn checkout file:///X:/var/svn/repos\n" "…\n" "C:\\> svn checkout \"file:///X|/var/svn/repos\"\n" "…\n" msgstr "" "\n" "C:\\> svn checkout file:///X:/var/svn/repos\n" "…\n" "C:\\> svn checkout \"file:///X|/var/svn/repos\"\n" "…\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:346 msgid "" "In the second syntax, you need to quote the URL so that the vertical bar " "character is not interpreted as a pipe. Also, note that a URL uses forward " "slashes even though the native (non-URL) form of a path on Windows uses " "backslashes." msgstr "" "Bei der zweiten Syntax muss der URL in Anführungsstriche eingeschlossen " "werden, damit der senkrechte Strich nicht als Pipe-Symbol interpretiert " "wird. Beachten Sie auch, dass in einem URL Schrägstriche verwendet werden, " "obwohl es unter Windows üblich ist, für Pfade umgekehrte Schrägstriche zu " "verwenden." # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch01-fundamental-concepts.xml:352 msgid "" "You cannot use Subversion's <literal>file://</literal> URLs in a regular web " "browser the way typical <literal>file://</literal> URLs can. When you " "attempt to view a <literal>file://</literal> URL in a regular web browser, " "it reads and displays the contents of the file at that location by examining " "the filesystem directly. However, Subversion's resources exist in a virtual " "filesystem (see <xref linkend=\"svn.developer.layerlib.repos\" />), and your " "browser will not understand how to interact with that filesystem." msgstr "" "Sie können die <literal>file://</literal> URLs von Subversion nicht in einem " "normalen Web-Browser auf die Art und Weise verwenden wie andere " "<literal>file://</literal> URLs. Falls Sie versuchen, einen <literal>file://" "</literal> URL in einem gewöhnlichen Web-Browser anzusehen, wird der Inhalt " "der Datei von der angegebenen Stelle direkt aus dem Dateisystem gelesen und " "angezeigt. Allerdings befinden sich die Daten von Subversion in einem " "virtuellen Dateisystem (siehe <xref linkend=\"svn.developer.layerlib.repos" "\" />), und der Browser wird nicht mit diesem Dateisystem umzugehen wissen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:364 msgid "" "Finally, it should be noted that the Subversion client will automatically " "encode URLs as necessary, just like a web browser does. For example, if a " "URL contains a space or upper-ASCII character as in the following:" msgstr "" "Zuletzt sei noch angemerkt, dass der Subversion-Client, wie ein Web-Browser, " "nötigenfalls automatisch URLs umwandelt. Falls zum Beispiel in einem URL " "Leerzeichen oder Großbuchstaben vorkommen wie hier:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:369 #, no-wrap msgid "" "\n" "$ svn checkout \"http://host/path with space/project/españa\"\n" msgstr "" "\n" "$ svn checkout \"http://host/path with space/project/españa\"\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:373 msgid "" "then Subversion will escape the unsafe characters and behave as though you " "had typed:" msgstr "" "wird Subversion die unsicheren Zeichen umwandeln, als ob Sie Folgendes " "geschrieben hätten:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:376 #, no-wrap msgid "" "\n" "$ svn checkout http://host/path%20with%20space/project/espa%C3%B1a\n" msgstr "" "\n" "$ svn checkout http://host/path%20with%20space/project/espa%C3%B1a\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:380 msgid "" "If the URL contains spaces, be sure to place it within quotation marks so " "that your shell treats the whole thing as a single argument to the " "<command>svn</command> program." msgstr "" "Falls ein URL Leerzeichen beinhalten sollte, stellen Sie sicher, das der URL " "in Anführungszeichen gesetzt wird, damit die Shell alles als ein Argument " "für das <command>svn</command> Programm behandelt." # type: Content of: <chapter><sect1><sect2><sidebar> #: ../en/book/ch01-fundamental-concepts.xml:384 msgid "<sidebar id=\"svn.basic.in-action.wc.sb-1\">" msgstr "<sidebar id=\"svn.basic.in-action.wc.sb-1\">" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch01-fundamental-concepts.xml:385 msgid "Repository URLs" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:387 msgid "" "You can access Subversion repositories through many different methods—" "on local disk or through various network protocols, depending on how your " "administrator has set things up for you. A repository location, however, is " "always a URL. <xref linkend=\"svn.basic.in-action.wc.tbl-1\"/> describes " "how different URL schemes map to the available access methods." msgstr "" "Sie können auf Subversion-Repositorys über viele unterschiedliche Methoden " "zugreifen – auf der lokalen Festplatte oder über verschiedene " "Protokolle, je nachdem, wie Ihr Administrator es eingerichtet hat. Ein Ort " "im Repository ist jedenfalls immer ein URL. <xref linkend=\"svn.basic.in-" "action.wc.tbl-1\"/> beschreibt, wie unterschiedliche URL Schemata auf die " "verfügbaren Zugriffsmethoden abgebildet werden." # type: Content of: <chapter><sect1><sect2><sidebar><table><title> #: ../en/book/ch01-fundamental-concepts.xml:397 msgid "Repository access URLs" msgstr "Repository-Zugriffs-URLs" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><thead><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:401 msgid "Schema" msgstr "Schema" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><thead><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:402 msgid "Access method" msgstr "Zugriffsmethode" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:407 msgid "<literal>file:///</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:408 msgid "Direct repository access (on local disk)" msgstr "Direkter Repository-Zugriff (auf lokaler Festplatte)" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:411 msgid "<literal>http://</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:412 msgid "Access via WebDAV protocol to Subversion-aware Apache server" msgstr "" "Zugriff über das WebDAV-Protokoll auf Apache-Server, die Subversion " "unterstützen" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:416 msgid "<literal>https://</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:417 msgid "Same as <literal>http://</literal>, but with SSL encryption." msgstr "Wie <literal>http://</literal>, jedoch mit SSL-Verschlüsselung." # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:421 msgid "<literal>svn://</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:422 msgid "Access via custom protocol to an <literal>svnserve</literal> server" msgstr "" "Zugriff über eigenes Protokoll auf einen <literal>svnserve</literal>-Server" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:426 msgid "<literal>svn+ssh://</literal>" msgstr "<literal>svn+ssh://</literal>" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:427 msgid "Same as <literal>svn://</literal>, but through an SSH tunnel." msgstr "Wie <literal>svn://</literal>, jedoch über SSH getunnelt." # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:434 msgid "" "For more information on how Subversion parses URLs, see <xref linkend=\"svn." "advanced.reposurls\"/>. For more information on the different types of " "network servers available for Subversion, see <xref linkend=\"svn." "serverconfig\"/>." msgstr "" "Für mehr Informationen darüber, wie Subversion URLs parst, siehe <xref " "linkend=\"svn.advanced.reposurls\"/>. Für weitergehende Informationen zu " "den unterschiedlichen Typen verfügbarer Netzwerk-Servern für Subversion, " "siehe <xref linkend=\"svn.serverconfig\"/>." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:446 msgid "Working Copies" msgstr "Arbeitskopien" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:448 msgid "" "You've already read about working copies; now we'll demonstrate how the " "Subversion client creates and uses them." msgstr "" "Sie haben schon über Arbeitskopien gelesen; nun werden wir zeigen, wie der " "Subversion-Client sie erzeugt und benutzt." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:452 msgid "" "A Subversion working copy is an ordinary directory tree on your local " "system, containing a collection of files. You can edit these files however " "you wish, and if they're source code files, you can compile your program " "from them in the usual way. Your working copy is your own private work " "area: Subversion will never incorporate other people's changes, nor make " "your own changes available to others, until you explicitly tell it to do " "so. You can even have multiple working copies of the same project." msgstr "" "Eine Subversion-Arbeitskopie ist ein gewöhnlicher Verzeichnisbaum auf Ihrem " "lokalen System, der eine Ansammlung von Dateien enthält. Sie können diese " "Dateien nach belieben bearbeiten, und wenn es sich um Quelltexte handelt, " "können Sie hieraus Ihr Programm auf die übliche Weise compilieren. Ihre " "Arbeitskopie ist Ihr privater Arbeitsbereich: nie wird Subversion weder die " "Änderungen von anderen einpflegen, noch Ihre eigenen Änderungen anderen zur " "Verfügung stellen, bis Sie es ausdrücklich dazu auffordern. Sie können sogar " "mehrere Arbeitskopien desselben Projektes haben." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:462 msgid "" "After you've made some changes to the files in your working copy and " "verified that they work properly, Subversion provides you with commands to " "<quote>publish</quote> your changes to the other people working with you on " "your project (by writing to the repository). If other people publish their " "own changes, Subversion provides you with commands to merge those changes " "into your working copy (by reading from the repository)." msgstr "" "Nachdem Sie einige Änderungen an den Dateien Ihrer Arbeitskopie gemacht und " "sichergestellt haben, dass sie funktionieren, stellt Ihnen Subversion " "Befehle zur Verfügung, um Ihre Änderungen den anderen, die an Ihrem Projekt " "mitarbeiten, <quote>publik</quote> zu machen (indem es ins Repository " "schreibt). Wenn die anderen ihre Änderungen veröffentlichen, stellt Ihnen " "Subversion Befehle zur Verfügung, um diese Änderungen in Ihr " "Arbeitsverzeichnis einzupflegen (indem es aus dem Repository liest)." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:471 msgid "" "A working copy also contains some extra files, created and maintained by " "Subversion, to help it carry out these commands. In particular, each " "directory in your working copy contains a subdirectory named <filename>.svn</" "filename>, also known as the working copy's <firstterm>administrative " "directory</firstterm>. The files in each administrative directory help " "Subversion recognize which files contain unpublished changes, and which " "files are out of date with respect to others' work." msgstr "" "Eine Arbeitskopie verfügt darüber hinaus über einige zusätzliche Dateien, " "die von Subversion erzeugt und gepflegt werden, um es bei diesen Befehlen zu " "unterstützen. Insbesondere enthält jedes Verzeichnis Ihrer Arbeitskopie ein " "Unterverzeichnis namens <filename>.svn</filename>, auch bekannt als das " "<firstterm>Verwaltungsverzeichnis</firstterm> der Arbeitskopie. Die Dateien " "in jedem Verwaltungsverzeichnis helfen Subversion dabei, zu erkennen, welche " "Dateien unveröffentlichte Änderungen enthalten und welche Dateien " "hinsichtlich der Arbeit anderer veraltet sind." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:481 msgid "" "A typical Subversion repository often holds the files (or source code) for " "several projects; usually, each project is a subdirectory in the " "repository's filesystem tree. In this arrangement, a user's working copy " "will usually correspond to a particular subtree of the repository." msgstr "" "Oft enthält ein typisches Subversion-Repository die Dateien (oder den " "Quelltext) für verschiedene Projekte; für gewöhnlich ist jedes Projekt ein " "Unterverzeichnis im Dateisystembaum des Repositorys. Bei dieser Anordnung " "entspricht die Arbeitskopie eines Benutzers gewöhnlich einem bestimmten " "Unterverzeichnis des Repositorys." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:487 msgid "" "For example, suppose you have a repository that contains two software " "projects, <literal>paint</literal> and <literal>calc</literal>. Each " "project lives in its own top-level subdirectory, as shown in <xref linkend=" "\"svn.basic.in-action.wc.dia-1\"/>." msgstr "" "Nehmen wir zum Beispiel an, Sie haben ein Repository, das zwei Software-" "Projekte beinhaltet, <literal>paint</literal> und <literal>calc</literal>. " "Jedes Projekt ist in einem eigenen Hauptverzeichnis abgelegt, wie in <xref " "linkend=\"svn.basic.in-action.wc.dia-1\"/> dargestellt." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:494 #, fuzzy #| msgid "The Repository" msgid "The repository's filesystem" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:498 msgid "" "To get a working copy, you must <firstterm>check out</firstterm> some " "subtree of the repository. (The term <emphasis>check out</emphasis> may " "sound like it has something to do with locking or reserving resources, but " "it doesn't; it simply creates a private copy of the project for you.) For " "example, if you check out <filename>/calc</filename>, you will get a working " "copy like this:" msgstr "" "Um eine Arbeitskopie zu erhalten, muss zunächst irgendein Teilbaum des " "Repositorys <firstterm>ausgecheckt</firstterm> werden(check out). (Der " "Begriff <emphasis>check out</emphasis> hört sich an, als habe es etwas mit " "dem Sperren oder Reservieren von Ressourcen zu tun, hat es aber nicht; es " "erzeugt lediglich eine private Kopie des Projektes für Sie.) Wenn Sie zum " "Beispiel <filename>/calc</filename> auschecken, bekommen Sie eine " "Arbeitskopie wie diese:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:506 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.example.com/repos/calc\n" "A calc/Makefile\n" "A calc/integer.c\n" "A calc/button.c\n" "Checked out revision 56.\n" "\n" "$ ls -A calc\n" "Makefile button.c integer.c .svn/\n" msgstr "" "\n" "$ svn checkout http://svn.example.com/repos/calc\n" "A calc/Makefile\n" "A calc/integer.c\n" "A calc/button.c\n" "Checked out revision 56.\n" "\n" "$ ls -A calc\n" "Makefile button.c integer.c .svn/\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:517 msgid "" "The list of letter <literal>A</literal>s in the left margin indicates that " "Subversion is adding a number of items to your working copy. You now have a " "personal copy of the repository's <filename>/calc</filename> directory, with " "one additional entry—<filename>.svn</filename>—which holds the " "extra information needed by Subversion, as mentioned earlier." msgstr "" "Die Liste der <literal>A</literal>s am linken Rand zeigt an, dass Subversion " "Ihrer Arbeitskopie eine Anzahl von Objekten hinzufügt (Add). Sie haben nun " "eine persönliche Kopie des Verzeichnisses <filename>/calc</filename> im " "Repository, mit einem zusätzlichen Eintrag – <filename>.svn</filename> " "– das, wie bereits erwähnt, die besonderen Informationen enthält, die " "Subversion benötigt." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:525 msgid "" "Suppose you make changes to <filename>button.c</filename>. Since the " "<filename>.svn</filename> directory remembers the file's original " "modification date and contents, Subversion can tell that you've changed the " "file. However, Subversion does not make your changes public until you " "explicitly tell it to. The act of publishing your changes is more commonly " "known as <firstterm>committing</firstterm> (or <firstterm>checking in</" "firstterm>) changes to the repository." msgstr "" "Angenommen, Sie nehmen Änderungen an <filename>button.c</filename> vor. Da " "sich das Verzeichnis <filename>.svn</filename> den ursprünglichen " "Änderungszeitpunkt und den Inhalt der Datei merkt, kann Subversion erkennen, " "dass Sie die Datei verändert haben. Trotzdem veröffentlicht Subversion Ihre " "Änderungen solange nicht, bis Sie es ausdrücklich hierzu auffordern. Der " "Vorgang des Veröffentlichens von Änderungen über das Repository ist " "gemeinhin bekannter als <firstterm>commit</firstterm> (oder <firstterm>check " "in</firstterm>)." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:534 msgid "" "To publish your changes to others, you can use Subversion's <command>svn " "commit</command> command:" msgstr "" "Um Ihre Änderungen anderen gegenüber zu veröffentlichen, können Sie den " "Subversion-Befehl <command>svn commit</command> verwenden:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:537 #, no-wrap msgid "" "\n" "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" "Sending button.c\n" "Transmitting file data .\n" "Committed revision 57.\n" msgstr "" "\n" "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" "Sending button.c\n" "Transmitting file data .\n" "Committed revision 57.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:544 msgid "" "Now your changes to <filename>button.c</filename> have been committed to the " "repository, with a note describing your change (namely, that you fixed a " "typo). If another user checks out a working copy of <filename>/calc</" "filename>, she will see your changes in the latest version of the file." msgstr "" "Nun sind Ihre Änderungen an <filename>button.c</filename> dem Repository " "überstellt, mitsamt einer Notiz, die Ihre Änderung beschreibt (nämlich, dass " "Sie einen Tippfehler beseitigt haben). Wenn eine andere Benutzerin eine " "Arbeitskopie von <filename>/calc</filename> auscheckt, wird sie Ihre " "Änderungen in der letzten Version der Datei sehen können." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:551 msgid "" "Suppose you have a collaborator, Sally, who checked out a working copy of " "<filename>/calc</filename> at the same time you did. When you commit your " "change to <filename>button.c</filename>, Sally's working copy is left " "unchanged; Subversion modifies working copies only at the user's request." msgstr "" "angenommen, Sie haben eine Mitarbeiterin, Sally, die eine Arbeitskopie von " "<filename>/calc</filename> gleichzeitig mit Ihnen ausgecheckt hat. Wenn Sie " "Ihre Änderung an <filename>button.c</filename> committen, bleibt Sallys " "Arbeitskopie unverändert; Subversion ändert Arbeitskopien nur auf Wunsch des " "Benutzers." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:558 msgid "" "To bring her project up to date, Sally can ask Subversion to " "<firstterm>update</firstterm> her working copy, by using the <command>svn " "update</command> command. This will incorporate your changes into her " "working copy, as well as any others that have been committed since she " "checked it out." msgstr "" "Um ihr Projekt auf den neuesten Stand zu bringen, kann Sally Subversion dazu " "auffordern, ihre Arbeitskopie zu aktualisieren, indem sie den Befehl " "<command>svn update</command> verwendet. Das bringt sowohl Ihre als auch " "alle anderen Änderungen die committet wurden seit sie ausgecheckt hatte in " "ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:564 #, no-wrap msgid "" "\n" "$ pwd\n" "/home/sally/calc\n" "\n" "$ ls -A\n" "Makefile button.c integer.c .svn/\n" "\n" "$ svn update\n" "U button.c\n" "Updated to revision 57.\n" msgstr "" "\n" "$ pwd\n" "/home/sally/calc\n" "\n" "$ ls -A\n" "Makefile button.c integer.c .svn/\n" "\n" "$ svn update\n" "U button.c\n" "Updated to revision 57.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:576 msgid "" "The output from the <command>svn update</command> command indicates that " "Subversion updated the contents of <filename>button.c</filename>. Note that " "Sally didn't need to specify which files to update; Subversion uses the " "information in the <filename>.svn</filename> directory as well as further " "information in the repository, to decide which files need to be brought up " "to date." msgstr "" "Die Ausgabe des <command>svn update</command> Befehls zeigt, dass Subversion " "den Inhalt von <filename>button.c</filename> aktualisiert hat (Update). " "Beachten Sie, dass Sally nicht angeben musste, welche Dateien zu " "aktualisieren sind; Subversion benutzt die Informationen aus dem <filename>." "svn</filename> Verzeichnis und darüber hinaus weitere Informationen im " "Repository, um zu entscheiden, welche Dateien auf den neuesten Stand " "gebracht werden müssen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:589 msgid "Revisions" msgstr "Revisionen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:591 msgid "" "An <command>svn commit</command> operation publishes changes to any number " "of files and directories as a single atomic transaction. In your working " "copy, you can change files' contents; create, delete, rename, and copy files " "and directories; and then commit a complete set of changes as an atomic " "transaction." msgstr "" "Ein <command>svn commit</command> veröffentlicht Änderungen an einer " "beliebigen Anzahl von Dateien und Verzeichnissen als eine einzige atomare " "Transaktion. In Ihrer Arbeitskopie können Sie Dateiinhalte ändern, Dateien " "und Verzeichnisse erzeugen, löschen, umbenennen und kopieren und dann den " "gesamten Umfang der Änderungen als atomare Transaktion durch ein " "<command>svn commit</command> in das Repository einbringen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:598 msgid "" "By atomic transaction, we mean simply this: either all of the changes happen " "in the repository, or none of them happens. Subversion tries to retain this " "atomicity in the face of program crashes, system crashes, network problems, " "and other users' actions." msgstr "" "Eine atomare Transaktion bedeutet: entweder es gehen alle Änderungen in das " "Repository oder keine. Angesichts von Programmabstürzen, Systemabstürzen, " "Netzproblemen oder anderer Benutzeraktionen hält Subversion an dieser " "Atomizität fest." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:604 msgid "" "Each time the repository accepts a commit, this creates a new state of the " "filesystem tree, called a <firstterm>revision</firstterm>. Each revision is " "assigned a unique natural number, one greater than the number of the " "previous revision. The initial revision of a freshly created repository is " "numbered 0 and consists of nothing but an empty root directory." msgstr "" "Jedes Mal wenn das Repository ein Commit annimmt, wird ein neuer Zustand des " "Dateisystem-Baums erzeugt, der <firstterm>Revision</firstterm> genannt wird. " "Jeder Revision wird eine einmalige natürliche Zahl zugewiesen, die um eins " "größer ist als die Vorgänger-Revision. Die anfängliche Revision eines frisch " "erzeugten Repositorys bekommt die Nummer 0 und besteht lediglich aus einem " "leeren Wurzelverzeichnis." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:612 msgid "" "<xref linkend=\"svn.basic.in-action.revs.dia-1\"/> illustrates a nice way to " "visualize the repository. Imagine an array of revision numbers, starting at " "0, stretching from left to right. Each revision number has a filesystem " "tree hanging below it, and each tree is a <quote>snapshot</quote> of the way " "the repository looked after a commit." msgstr "" "<xref linkend=\"svn.basic.in-action.revs.dia-1\"/> zeigt, wie man sich das " "Repository vorstellen kann. Stellen Sie sich eine Reihe von Revisionsnummern " "vor, die bei 0 startet und von links nach rechts wächst. Jede " "Revisionsnummer hat einen Dateisystem-Baum unter sich hängen, der ein " "<quote>Schnappschuss</quote> des Repositorys nach einem Commit ist." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:620 #, fuzzy #| msgid "The Repository" msgid "The repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><sect3><sidebar> #: ../en/book/ch01-fundamental-concepts.xml:624 #: ../en/book/ch02-basic-usage.xml:57 ../en/book/ch02-basic-usage.xml:190 #: ../en/book/ch02-basic-usage.xml:278 ../en/book/ch02-basic-usage.xml:516 #: ../en/book/ch02-basic-usage.xml:629 ../en/book/ch02-basic-usage.xml:671 #: ../en/book/ch02-basic-usage.xml:723 ../en/book/ch02-basic-usage.xml:1819 #: ../en/book/ch02-basic-usage.xml:1874 #: ../en/book/ch03-advanced-topics.xml:225 #: ../en/book/ch03-advanced-topics.xml:421 #: ../en/book/ch03-advanced-topics.xml:734 #: ../en/book/ch03-advanced-topics.xml:914 #: ../en/book/ch03-advanced-topics.xml:1247 #: ../en/book/ch03-advanced-topics.xml:1359 #: ../en/book/ch03-advanced-topics.xml:1712 #: ../en/book/ch03-advanced-topics.xml:2367 #: ../en/book/ch03-advanced-topics.xml:2656 #: ../en/book/ch03-advanced-topics.xml:3214 #: ../en/book/ch04-branching-and-merging.xml:209 #: ../en/book/ch04-branching-and-merging.xml:607 #: ../en/book/ch04-branching-and-merging.xml:2187 #: ../en/book/ch05-repository-admin.xml:2704 #: ../en/book/ch06-server-configuration.xml:913 #: ../en/book/ch06-server-configuration.xml:1432 #: ../en/book/ch06-server-configuration.xml:1609 #: ../en/book/ch06-server-configuration.xml:2337 #: ../en/book/ch06-server-configuration.xml:2818 #: ../en/book/ch06-server-configuration.xml:2912 #: ../en/book/ch06-server-configuration.xml:3176 #: ../en/book/ch06-server-configuration.xml:3306 #: ../en/book/ch07-customizing-svn.xml:932 #: ../en/book/ch08-embedding-svn.xml:246 ../en/book/ch08-embedding-svn.xml:544 #: ../en/book/ch08-embedding-svn.xml:813 ../en/book/ch08-embedding-svn.xml:951 msgid "<sidebar>" msgstr "<sidebar>" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch01-fundamental-concepts.xml:625 msgid "Global Revision Numbers" msgstr "Globale Revisionsnummern" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:627 msgid "" "Unlike most version control systems, Subversion's revision numbers apply to " "<emphasis>entire trees</emphasis>, not individual files. Each revision " "number selects an entire tree, a particular state of the repository after " "some committed change. Another way to think about it is that revision N " "represents the state of the repository filesystem after the Nth commit. " "When Subversion users talk about <quote>revision 5 of <filename>foo.c</" "filename>,</quote> they really mean <quote><filename>foo.c</filename> as it " "appears in revision 5.</quote> Notice that in general, revisions N and M of " "a file do <emphasis>not</emphasis> necessarily differ! Many other version " "control systems use per-file revision numbers, so this concept may seem " "unusual at first. (Former CVS users might want to see <xref linkend=\"svn." "forcvs\"/> for more details.)" msgstr "" "Anders als die meisten Versionskontrollsysteme werden die Revisionsnummern " "von Subversion auf <emphasis>komplette Bäume</emphasis> anstatt auf einzelne " "Dateien angewendet. Jede Revisionsnummer wählt einen kompletten Baum aus; " "ein besonderer Zustand nach dem Commit einer Änderung. Man kann sich auch " "vorstellen, dass Revision N den Zustand des Repository-Dateisystems nach dem " "N-ten Commit repräsentiert. Wenn Subversion-Benutzer von <quote>Revision 5 " "von <filename>foo.c</filename></quote> sprechen, meinen sie tatsächlich " "<quote><filename>foo.c</filename> so wie es in Revision 5 aussieht</quote>. " "Beachten Sie, dass sich im Allgemeinen die Revisionen N und M einer Datei " "<emphasis>nicht</emphasis> notwendigerweise unterscheiden! Viele andere " "Versionskontrollsysteme verwenden dateibezogene Revisionsnummern, so dass " "dieses Konzept zunächst ungewöhnlich aussieht. (Ehemalige CVS-Benutzer " "sollten sich für weitergehende Informationen <xref linkend=\"svn.forcvs\"/> " "ansehen.)" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:645 msgid "" "It's important to note that working copies do not always correspond to any " "single revision in the repository; they may contain files from several " "different revisions. For example, suppose you check out a working copy from " "a repository whose most recent revision is 4:" msgstr "" "Es ist wichtig zu beachten, dass eine Arbeitskopie nicht immer genau einer " "Revision im Repository zugeordnet werden kann; sie kann Dateien aus " "verschiedenen Revisionen beinhalten. Nehmen wir z.B. an, Sie checken sich " "eine Arbeitskopie einer Datei aus einem Repository aus, deren neueste " "Revision 4 ist:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:651 #, no-wrap msgid "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:4\n" msgstr "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:4\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:657 msgid "" "At the moment, this working directory corresponds exactly to revision 4 in " "the repository. However, suppose you make a change to <filename>button.c</" "filename>, and commit that change. Assuming no other commits have taken " "place, your commit will create revision 5 of the repository, and your " "working copy will now look like this:" msgstr "" "In diesem Augenblick entspricht Ihre Arbeitskopie exakt der Revision im " "Repository. Sie machen jetzt allerdings eine Änderung an <filename>button.c</" "filename> und bringen diese Änderung mit einem Commit ins Repository. " "Angenommen, dass keine weiteren Commits vorgenommen wurden, wird Ihr Commit " "die Revision 5 im Repository erzeugen, und Ihre Arbeitskopie sieht so aus:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:664 #, no-wrap msgid "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:5\n" msgstr "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:5\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:670 msgid "" "Suppose that, at this point, Sally commits a change to <filename>integer.c</" "filename>, creating revision 6. If you use <command>svn update</command> to " "bring your working copy up to date, it will look like this:" msgstr "" "Angenommen, zu diesem Zeitpunkt macht Sally einen Commit für eine Änderung " "an <filename>integer.c</filename> und erzeugt Revision 6. Wenn Sie " "<command>svn update</command> verwenden, um Ihre Arbeitskopie zu " "aktualisieren, sieht sie so aus:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:675 #, no-wrap msgid "" "\n" "calc/Makefile:6\n" " integer.c:6\n" " button.c:6\n" msgstr "" "\n" "calc/Makefile:6\n" " integer.c:6\n" " button.c:6\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:681 msgid "" "Sally's change to <filename>integer.c</filename> will appear in your working " "copy, and your change will still be present in <filename>button.c</" "filename>. In this example, the text of <filename>Makefile</filename> is " "identical in revisions 4, 5, and 6, but Subversion will mark your working " "copy of <filename>Makefile</filename> with revision 6 to indicate that it is " "still current. So, after you do a clean update at the top of your working " "copy, it will generally correspond to exactly one revision in the repository." msgstr "" "Sallys Änderung an <filename>integer.c</filename> erscheint in Ihrer " "Arbeitskopie, und Ihre Änderung ist immer noch in <filename>button.c</" "filename>. In diesem Beispiel ist der Text von <filename>Makefile</" "filename> in den Revisionen 4, 5 und 6 identisch, jedoch markiert Subversion " "die Arbeitskopie von <filename>Makefile</filename> mit Revision 6, um zu " "zeigen, dass es noch aktuell ist. Wenn Sie also ein sauberes Update von der " "Wurzel Ihrer Arbeitskopie her machen, sollte sie im Allgemeinen genau einer " "Revision im Repository entsprechen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:696 msgid "How Working Copies Track the Repository" msgstr "Wie Arbeitskopien das Repository verfolgen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:698 msgid "" "For each file in a working directory, Subversion records two essential " "pieces of information in the <filename>.svn/</filename> administrative area:" msgstr "" "Für jede Datei eines Arbeitsverzeichnis merkt sich Subversion zwei " "essentielle Informationen im <filename>.svn/</filename>-Verwaltungsbereich:" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:705 msgid "" "What revision your working file is based on (this is called the file's " "<firstterm>working revision</firstterm>)" msgstr "" "Auf welcher Revision Ihre Arbeitsdatei aufbaut (das wird die " "<firstterm>Arbeitsrevision</firstterm> der Datei genannt)" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:711 msgid "" "A timestamp recording of when the local copy was last updated by the " "repository" msgstr "" "Ein Zeitstempel, der festhält, wann die lokale Kopie das letzte Mal vom " "Repository aktualisiert wurde." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:716 msgid "" "Given this information, by talking to the repository, Subversion can tell " "which of the following four states a working file is in:" msgstr "" "Mit diesen Informationen kann Subversion durch Kommunikation mit dem " "Repository feststellen, in welchem der folgenden Zustände sich eine " "Arbeitsdatei befindet:" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch01-fundamental-concepts.xml:722 msgid "Unchanged, and current" msgstr "Unverändert und aktuell" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:725 msgid "" "The file is unchanged in the working directory, and no changes to that file " "have been committed to the repository since its working revision. An " "<command>svn commit</command> of the file will do nothing, and an " "<command>svn update</command> of the file will do nothing." msgstr "" "Die Datei im Arbeitsverzeichnis ist unverändert, und keinerlei Änderungen an " "der Datei sind seit der Arbeitsrevision an das Repository übergeben worden. " "Ein <command>svn commit</command> der Datei würde nichts machen, und ein " "<command>svn update</command> der Datei auch nicht." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch01-fundamental-concepts.xml:735 msgid "Locally changed, and current" msgstr "Lokal geändert und aktuell" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:738 msgid "" "The file has been changed in the working directory, and no changes to that " "file have been committed to the repository since you last updated. There " "are local changes that have not been committed to the repository; thus an " "<command>svn commit</command> of the file will succeed in publishing your " "changes, and an <command>svn update</command> of the file will do nothing." msgstr "" "Die Datei wurde im Arbeitsverzeichnis geändert, und keinerlei Änderungen an " "der Datei sind seit der letzten Aktualisierung an das Repository übergeben " "worden. Es gibt lokale Änderungen, die noch nicht an das Repository " "übergeben worden sind, so dass ein <command>svn commit</command> der Datei " "Ihre Änderungen erfolgreich veröffentlichen würde, und ein <command>svn " "update</command> der Datei nichts tun würde." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch01-fundamental-concepts.xml:749 msgid "Unchanged, and out of date" msgstr "Unverändert und veraltet" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:752 msgid "" "The file has not been changed in the working directory, but it has been " "changed in the repository. The file should eventually be updated in order " "to make it current with the latest public revision. An <command>svn commit</" "command> of the file will do nothing, and an <command>svn update</command> " "of the file will fold the latest changes into your working copy." msgstr "" "Die Datei wurde im Arbeitsverzeichnis nicht geändert, jedoch im Repository. " "Die Datei sollte aktualisiert werden, damit sie bezüglich der letzten " "öffentlichen Revision aktuell ist. Ein <command>svn commit</command> der " "Datei würde nichts machen, und ein <command>svn update</command> der Datei " "würde die letzten Änderungen in Ihre Arbeitskopie einbringen." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch01-fundamental-concepts.xml:764 msgid "Locally changed, and out of date" msgstr "Lokal geändert und veraltet" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:767 msgid "" "The file has been changed both in the working directory and in the " "repository. An <command>svn commit</command> of the file will fail with an " "<quote>out-of-date</quote> error. The file should be updated first; an " "<command>svn update</command> command will attempt to merge the public " "changes with the local changes. If Subversion can't complete the merge in a " "plausible way automatically, it leaves it to the user to resolve the " "conflict." msgstr "" "Die Datei wurde sowohl im Arbeitsverzeichnis als auch im Repository " "geändert. Ein <command>svn commit</command> der Datei würde mit einem " "<quote>out-of-date</quote> Fehler abbrechen. Die Datei sollte erst " "aktualisiert werden; ein <command>svn update</command> Befehl würde " "versuchen, die öffentlichen mit den lokalen Änderungen zusammenzuführen. " "Wenn Subversion diese Zusammenführung nicht plausibel automatisch " "durchführen kann, wird die Auflösung des Konflikts dem Benutzer überlassen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:781 msgid "" "This may sound like a lot to keep track of, but the <command>svn status</" "command> command will show you the state of any item in your working copy. " "For more information on that command, see <xref linkend=\"svn.tour.cycle." "examine.status\" />." msgstr "" "Das hört sich an, als müsse man jede Menge mitverfolgen, aber der " "<command>svn status</command> Befehl zeigt Ihnen den Zustand jedes Objektes " "in Ihrer Arbeitskopie. Weitergehende Informationen zu diesem Befehl finden " "Sie unter <xref linkend=\"svn.tour.cycle.examine.status\" />." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:791 msgid "Mixed Revision Working Copies" msgstr "Arbeitskopien mit gemischten Revisionen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:793 msgid "" "As a general principle, Subversion tries to be as flexible as possible. One " "special kind of flexibility is the ability to have a working copy containing " "files and directories with a mix of different working revision numbers. " "Unfortunately, this flexibility tends to confuse a number of new users. If " "the earlier example showing mixed revisions perplexed you, here's a primer " "on why the feature exists and how to make use of it." msgstr "" "Als allgemeingültiges Prinzip versucht Subversion, so flexibel wie möglich " "zu sein. Eine besondere Ausprägung der Flexibilität ist die Fähigkeit, eine " "Arbeitskopie bestehend aus Dateien und Verzeichnissen mit einer Mischung " "unterschiedlicher Revisionsnummern zu haben. Unglücklicherweise neigt diese " "Flexibilität dazu, eine Anzahl neuer Benutzer zu verwirren. Wenn Sie das " "vorangegangene Beispiel, das gemischte Revisionen vorgestellt hat, " "verwirrte, zeigen wir hier eine Einführung warum es diese Möglichkeit gibt " "und wie sie verwendet wird." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch01-fundamental-concepts.xml:804 msgid "Updates and commits are separate" msgstr "Updates und Commits sind getrennt" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:806 msgid "" "One of the fundamental rules of Subversion is that a <quote>push</quote> " "action does not cause a <quote>pull,</quote> nor vice versa. Just because " "you're ready to submit new changes to the repository doesn't mean you're " "ready to receive changes from other people. And if you have new changes " "still in progress, <command>svn update</command> should gracefully merge " "repository changes into your own, rather than forcing you to publish them." msgstr "" "Eine der grundlegenden Regeln von Subversion ist, dass eine Aktion, die in " "das Repository schreibt keine Aktion zur Folge hat, die aus dem Repository " "liest und umgekehrt. Wenn Sie bereit sind, neue Änderungen an das Repository " "zu übergeben, heißt das noch lange nicht, dass Sie auch die Änderungen " "anderer haben möchten. Und wenn Sie noch an Änderungen arbeiten, sollte " "<command>svn update</command> elegant die Änderungen aus dem Repository mit " "Ihren Änderungen zusammenführen anstatt Sie dazu zu zwingen, Ihre Änderungen " "zu veröffentlichen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:816 msgid "" "The main side effect of this rule is that it means a working copy has to do " "extra bookkeeping to track mixed revisions as well as be tolerant of the " "mixture. It's made more complicated by the fact that directories themselves " "are versioned." msgstr "" "Der hauptsächliche Nebeneffekt dieser Regel ist, dass eine Arbeitskopie " "zusätzlich buchhalten muss, um sowohl gemischte Revisionen zu verfolgen als " "auch diese Mischung vertragen zu können. Die Tatsache, dass auch " "Verzeichnisse selbst versioniert sind, verkompliziert die Sache nur." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:822 msgid "" "For example, suppose you have a working copy entirely at revision 10. You " "edit the file <filename>foo.html</filename> and then perform an <command>svn " "commit</command>, which creates revision 15 in the repository. After the " "commit succeeds, many new users would expect the working copy to be entirely " "at revision 15, but that's not the case! Any number of changes might have " "happened in the repository between revisions 10 and 15. The client knows " "nothing of those changes in the repository, since you haven't yet run " "<command>svn update</command>, and <command>svn commit</command> doesn't " "pull down new changes. If, on the other hand, <command>svn commit</command> " "were to automatically download the newest changes, it would be possible to " "set the entire working copy to revision 15—but then we'd be breaking " "the fundamental rule of <quote>push</quote> and <quote>pull</quote> " "remaining separate actions. Therefore, the only safe thing the Subversion " "client can do is mark the one file—<filename>foo.html</filename>—" "as being at revision 15. The rest of the working copy remains at revision " "10. Only by running <command>svn update</command> can the latest changes be " "downloaded and the whole working copy be marked as revision 15." msgstr "" "Nehmen wir zum Beispiel an, Ihre Arbeitskopie besteht komplett aus Revision " "10. Sie bearbeiten die Datei <filename>foo.html</filename> und führen ein " "<command>svn commit</command> aus, das die Revision 15 im Repository " "erzeugt. Nach dem erfolgreichen Commit würden viele neue Benutzer erwarten, " "dass die gesamte Arbeitskopie auf Revision 15 stehe, was aber nicht der Fall " "ist! Alle möglichen Änderungen können sich zwischen Revision 10 und 15 im " "Repository zugetragen haben. Der Client weiß nichts über diese Änderungen im " "Repository, da Sie noch nicht <command>svn update</command> aufgerufen " "haben, und <command>svn commit</command> zieht keine Änderungen herein. " "Wenn andererseits <command>svn commit</command> automatisch Änderungen " "hereinziehen würde, könnte die gesamte Arbeitskopie auf Revision 15 gebracht " "werden – doch dann wäre die grundlegende Regel verletzt, dass Lesen " "und Schreiben getrennte Aktionen sind. Deshalb ist das einzig Sichere, das " "der Subversion-Client tun kann, die eine Datei – <filename>foo.html</" "filename> – als zur Revision 15 gehörig zu kennzeichnen. Der Rest der " "Arbeitskopie verbleibt bei Revision 10. Nur durch <command>svn update</" "command> können die neuesten Änderungen hereingezogen und die gesamte " "Arbeitskopie als Revision 15 gekennzeichnet werden." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch01-fundamental-concepts.xml:851 msgid "Mixed revisions are normal" msgstr "Gemischte Revisionen sind normal" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:853 msgid "" "The fact is, <emphasis>every time</emphasis> you run <command>svn commit</" "command> your working copy ends up with some mixture of revisions. The " "things you just committed are marked as having larger working revisions than " "everything else. After several commits (with no updates in between), your " "working copy will contain a whole mixture of revisions. Even if you're the " "only person using the repository, you will still see this phenomenon. To " "examine your mixture of working revisions, use the <command>svn status</" "command> command with the <option>--verbose</option> option (see <xref " "linkend=\"svn.tour.cycle.examine.status\"/> for more information)." msgstr "" "Tatsache ist, dass <emphasis>jedes Mal</emphasis> wenn Sie <command>svn " "commit</command> aufgerufen haben, die Arbeitskopie aus irgendeiner Mischung " "von Revisionen besteht. Die Sachen, die Sie eben ins Repository gebracht " "haben, werden mit höheren Revisionsnummern gekennzeichnet als alles andere. " "Nach einigen Commits (ohne zwischenzeitliche Updates) ist Ihre Arbeitskopie " "eine Riesenmischung von Revisionen. Selbst wenn Sie die einzige Person sind, " "die das Repository benutzt, werden sie dieses Phänomen bemerken. Um Ihre " "Mischung aus Arbeitsrevisionen untersuchen zu können, verwenden Sie den " "Befehl <command>svn status</command> mit der <option>--verbose</option>-" "Option (siehe <xref linkend=\"svn.tour.cycle.examine.status\"/> für " "weitergehende Informationen)." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:866 msgid "" "Often, new users are completely unaware that their working copy contains " "mixed revisions. This can be confusing, because many client commands are " "sensitive to the working revision of the item they're examining. For " "example, the <command>svn log</command> command is used to display the " "history of changes to a file or directory (see <xref linkend=\"svn.tour." "history.log\"/>). When the user invokes this command on a working copy " "object, he expects to see the entire history of the object. But if the " "object's working revision is quite old (often because <command>svn update</" "command> hasn't been run in a long time), the history of the " "<emphasis>older</emphasis> version of the object is shown." msgstr "" "Oft ist neuen Benutzern überhaupt nicht bewusst, das ihre Arbeitskopie " "gemischte Revisionen beinhaltet. Das kann zur Verwirrung führen, weil viele " "Client-Programme empfindlich auf die Revision des Objektes reagieren, das " "sie untersuchen. Beispielsweise wird der <command>svn log</command>-Befehl " "verwendet, um die Historie der Änderungen einer Datei oder eines " "Verzeichnisses darzustellen (siehe <xref linkend=\"svn.tour.history.log\"/" ">). Wenn der Benutzer diesen Befehl auf ein Objekt in der Arbeitskopie " "anwendet, erwartet er, die gesamte Historie des Objektes zu sehen. Wenn " "jedoch die Arbeitsrevision des Objektes ziemlich alt ist (oftmals weil lange " "Zeit kein <command>svn update</command> aufgerufen wurde), wird die Historie " "der <emphasis>älteren</emphasis> Version des Objekts angezeigt." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch01-fundamental-concepts.xml:884 msgid "Mixed revisions are useful" msgstr "Gemischte Revisionen sind nützlich" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:886 msgid "" "If your project is sufficiently complex, you'll discover that it's sometimes " "nice to forcibly <firstterm>backdate</firstterm> (or update to a revision " "older than the one you already have) portions of your working copy to an " "earlier revision; you'll learn how to do that in <xref linkend=\"svn.tour\"/" ">. Perhaps you'd like to test an earlier version of a submodule contained " "in a subdirectory, or perhaps you'd like to figure out when a bug first came " "into existence in a specific file. This is the <quote>time machine</quote> " "aspect of a version control system—the feature that allows you to move " "any portion of your working copy forward and backward in history." msgstr "" "Wenn Ihr Projekt hinreichend komplex ist, werden Sie entdecken, dass es " "manchmal ganz nett sein kann, Teile Ihrer Arbeitskopie " "<firstterm>zurückzudatieren</firstterm> (oder auf eine ältere Version als " "die vorliegende zu aktualisieren); wie das gemacht wird, wird in <xref " "linkend=\"svn.tour\"/> gezeigt. Vielleicht möchten Sie eine ältere Version " "eines Teilmoduls in einem Unterverzeichnis testen, oder Sie möchten " "herausbekommen, wann ein Fehler das erste Mal in einer Datei auftauchte. " "Dies ist der <quote>Zeitmaschinen</quote>-Aspekt eines " "Versionskontrollsystems – die Eigenschaft, die es ermöglicht, " "irgendeinen Teil Ihrer Arbeitskopie zeitlich nach vorne oder nach hinten zu " "verschieben." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch01-fundamental-concepts.xml:904 msgid "Mixed revisions have limitations" msgstr "Gemischte Revisionen haben ihre Grenzen" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:906 msgid "" "However you make use of mixed revisions in your working copy, there are " "limitations to this flexibility." msgstr "" "Wie auch immer Sie gemischte Revisionen in Ihrer Arbeitskopie verwenden, " "diese Flexibilität hat ihre Grenzen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:909 msgid "" "First, you cannot commit the deletion of a file or directory that isn't " "fully up to date. If a newer version of the item exists in the repository, " "your attempt to delete will be rejected to prevent you from accidentally " "destroying changes you've not yet seen." msgstr "" "Erstens kann die Löschung einer Datei oder eines Verzeichnisses nicht an das " "Repository übergeben werden, wenn die Datei oder das Verzeichnis nicht ganz " "aktuell ist. Falls eine neuere Version im Repository existiert, wird Ihr " "Löschversuch abgelehnt, um zu vermeiden, dass Sie versehentlich Änderungen " "löschen, die Sie noch nicht gesehen haben." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:915 msgid "" "Second, you cannot commit a metadata change to a directory unless it's fully " "up to date. You'll learn about attaching <quote>properties</quote> to items " "in <xref linkend=\"svn.advanced\"/>. A directory's working revision defines " "a specific set of entries and properties, and thus committing a property " "change to an out-of-date directory may destroy properties you've not yet " "seen." msgstr "" "Zweitens können Sie keine Änderungen an Metadaten eines Verzeichnisses an " "das Repository übergeben, wenn das Verzeichnis nicht ganz aktuell ist. In " "<xref linkend=\"svn.advanced\"/> werden Sie lernen, wie man " "<quote>Propertys</quote> an Objekte hängt. Die Arbeitskopie eines " "Verzeichnisses definiert eine bestimmte Menge von Einträgen und Propertys, " "so dass eine Property-Änderung an einem veralteten Verzeichnis Propertys " "zerstören kann, die Sie noch nicht gesehen haben." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:933 #: ../en/book/ch02-basic-usage.xml:2276 #: ../en/book/ch03-advanced-topics.xml:4068 #: ../en/book/ch04-branching-and-merging.xml:3123 #: ../en/book/ch05-repository-admin.xml:3199 #: ../en/book/ch07-customizing-svn.xml:1305 #: ../en/book/ch08-embedding-svn.xml:1351 msgid "Summary" msgstr "Zusammenfassung" # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:935 msgid "We covered a number of fundamental Subversion concepts in this chapter:" msgstr "" "In diesem Kapitel haben wir eine Anzahl fundamentaler Konzepte von " "Subversion behandelt:" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:940 msgid "" "We introduced the notions of the central repository, the client working " "copy, and the array of repository revision trees." msgstr "" "Wir haben die Begriffe zentrales Repository, Arbeitskopie und Reihe von " "Revisionsbäumen des Repositorys eingeführt." # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:946 msgid "" "We saw some simple examples of how two collaborators can use Subversion to " "publish and receive changes from one another, using the <quote>copy-modify-" "merge</quote> model." msgstr "" "Wir haben einige einfache Beispiele gesehen, wie zwei Mitarbeiter Subversion " "verwenden können, um gegenseitig Änderungen auszutauschen, indem das " "<quote>kopieren-verändern-zusammenführen</quote>-Modell benutzt wird." # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:953 msgid "" "We talked a bit about the way Subversion tracks and manages information in a " "working copy." msgstr "" "Wir haben ein wenig darüber geredet, wie Subversion Informationen in einer " "Arbeitskopie verfolgt und verwaltet." # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:959 msgid "" "At this point, you should have a good idea of how Subversion works in the " "most general sense. Armed with this knowledge, you should now be ready to " "move into the next chapter, which is a detailed tour of Subversion's " "commands and features." msgstr "" "An dieser Stelle sollten Sie eine gute Vorstellung haben, wie Subversion " "ganz allgemein arbeitet. Mit diesem Kenntnisstand sollten Sie in der Lage " "sein, das nächste Kapitel anzugehen, das ein detaillierter Rundgang durch " "die Befehle und Eigenschaften von Subversion ist." # type: Content of: <chapter><title> #: ../en/book/ch02-basic-usage.xml:2 msgid "Basic Usage" msgstr "Grundlegende Benutzung" # type: Content of: <chapter><para> #: ../en/book/ch02-basic-usage.xml:4 msgid "" "Now we will go into the details of using Subversion. By the time you reach " "the end of this chapter, you will be able to perform all the tasks you need " "to use Subversion in a normal day's work. You'll start with getting your " "files into Subversion, followed by an initial checkout of your code. We'll " "then walk you through making changes and examining those changes. You'll " "also see how to bring changes made by others into your working copy, examine " "them, and work through any conflicts that might arise." msgstr "" "Nun kommen wir zu den Details der Benutzung von Subversion. Bis Sie das " "Ende dieses Kapitels erreicht haben, werden Sie in der Lage sein, alle " "Aufgaben zu erledigen, die sich bei der normalen täglichen Arbeit mit " "Subversion stellen. Sie werden damit beginnen, Ihre Dateien in Subversion " "einzupflegen, gefolgt von einem initialen Checkout Ihres Codes. Dann werden " "wir bei unserem Rundgang zeigen, wie Änderungen gemacht und diese Änderungen " "untersucht werden. Sie werden auch sehen, wie Sie die Änderungen anderer in " "Ihre Arbeitskopie bringen, untersuchen, und sich durch eventuell auftretende " "Konflikte arbeiten können." # type: Content of: <chapter><para> #: ../en/book/ch02-basic-usage.xml:14 msgid "" "Note that this chapter is not meant to be an exhaustive list of all of " "Subversion's commands—rather, it's a conversational introduction to " "the most common Subversion tasks that you'll encounter. This chapter " "assumes that you've read and understood <xref linkend=\"svn.basic\"/> and " "are familiar with the general model of Subversion. For a complete reference " "of all commands, see <xref linkend=\"svn.ref\"/>." msgstr "" "Beachten Sie jedoch, dass dieses Kapitel nicht als erschöpfende Liste aller " "Befehle von Subversion gedacht ist – es ist eher eine Einführung in " "die gebräuchlichsten Aufgaben von Subversion, denen Sie begegnen werden. " "Dieses Kapitel setzt voraus, dass Sie <xref linkend=\"svn.basic\"/> gelesen " "und verstanden haben und dass Sie mit dem allgemeinen Subversion-Modell " "vertraut sind. Für eine vollständige Referenz aller Befehle, siehe <xref " "linkend=\"svn.ref\"/>." # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:27 ../en/book/ch09-reference.xml:2265 #: ../en/book/ch09-reference.xml:5784 ../en/book/ch09-reference.xml:7097 #: ../en/book/ch09-reference.xml:7821 msgid "Help!" msgstr "Hilfe!" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:29 msgid "" "Before reading on, here is the most important command you'll ever need when " "using Subversion: <command>svn help</command>. The Subversion command-line " "client is self-documenting—at any time, a quick <userinput>svn help " "<replaceable>subcommand</replaceable></userinput> will describe the syntax, " "options, and behavior of the subcommand." msgstr "" "Bevor Sie weiter lesen: hier ist der wichtigste Befehl den Sie benötigen, " "wenn Sie Subversion verwenden: <command>svn help</command>. Der Subversion-" "Kommandozeilen-Client ist selbst-dokumentierend – jederzeit erklärt " "Ihnen ein schnelles <userinput>svn help <replaceable>Unterbefehl</" "replaceable></userinput> die Syntax, die Optionen und das Verhalten des " "Unterbefehls." # type: Content of: <chapter><sect1><screen> #: ../en/book/ch02-basic-usage.xml:36 #, no-wrap msgid "" "\n" "$ svn help import\n" "import: Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" "\n" " Recursively commit a copy of PATH to URL.\n" " If PATH is omitted '.' is assumed.\n" " Parent directories are created as necessary in the repository.\n" " If PATH is a directory, the contents of the directory are added\n" " directly under URL.\n" " Unversionable items such as device files and pipes are ignored\n" " if --force is specified.\n" "\n" "Valid options:\n" " -q [--quiet] : print nothing, or only summary information\n" " -N [--non-recursive] : obsolete; try --depth=files or --depth=immediates\n" " --depth ARG : limit operation by depth ARG ('empty', 'files',\n" " 'immediates', or 'infinity')\n" "…\n" msgstr "" "\n" "$ svn help import\n" "import: Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" "\n" " Recursively commit a copy of PATH to URL.\n" " If PATH is omitted '.' is assumed.\n" " Parent directories are created as necessary in the repository.\n" " If PATH is a directory, the contents of the directory are added\n" " directly under URL.\n" " Unversionable items such as device files and pipes are ignored\n" " if --force is specified.\n" "\n" "Valid options:\n" " -q [--quiet] : print nothing, or only summary information\n" " -N [--non-recursive] : obsolete; try --depth=files or --depth=immediates\n" " --depth ARG : limit operation by depth ARG ('empty', 'files',\n" " 'immediates', or 'infinity')\n" "…\n" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch02-basic-usage.xml:58 msgid "Options and Switches and Flags, Oh My!" msgstr "Optionen und Schalter und Flags, oh Mann!" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:60 msgid "" "The Subversion command-line client has numerous command modifiers (which we " "call options), but there are two distinct kinds of options: short options " "are a single hyphen followed by a single letter, and long options consist of " "two hyphens followed by a number of letters (e.g., <literal>-s</literal> and " "<literal>--this-is-a-long-option</literal>, respectively). Every option has " "a long format, but only certain options have an additional short format " "(these are typically options that are frequently used). To maintain " "clarity, we <emphasis>usually</emphasis> use the long form in code examples, " "but when describing options, if there's a short form, we'll provide the long " "form (to improve clarity) and the short form (to make it easier to " "remember). You should use whichever one you're more comfortable with, but " "don't try to use both." msgstr "" "Der Subversion-Kommandozeilen-Client besitzt zahlreiche Befehlsmodifizierer " "(die wir Optionen nennen), doch davon gibt es zweierlei Arten: Kurzoptionen " "bestehen aus einem Bindestrich gefolgt von einem einzelnen Buchstaben, und " "Langoptionen bestehen aus zwei Bindestrichen gefolgt von mehr als einem " "Buchstaben (z.B. <literal>-s</literal> bzw. <literal>--dies-ist-eine-" "langoption</literal>). Jede Option besitzt ein Langformat, jedoch nur " "bestimmte Optionen haben zusätzlich ein Kurzformat (das sind typischerweise " "die meistgebrauchten Optionen). Um die Deutlichkeit zu wahren, benutzen wir " "in den Beispielen <emphasis>gewöhnlich</emphasis> die Langform, doch wenn " "Optionen beschrieben werden, die eine Kurzform besitzen, geben wir sowohl " "die Langform (um die Deutlichkeit zu verbessern) als auch die Kurzform (um " "sie sich leichter merken zu können) an. Sie sollten die Form benutzen, mit " "der Sie am besten zurechtkommen, jedoch versuchen Sie nicht, beide " "gleichzeitig zu benutzen." # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:85 msgid "Getting Data into Your Repository" msgstr "Wie Sie Daten in Ihr Repository bekommen" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:87 msgid "" "You can get new files into your Subversion repository in two ways: " "<command>svn import</command> and <command>svn add</command>. We'll discuss " "<command>svn import</command> now and will discuss <command>svn add</" "command> later in this chapter when we review a typical day with Subversion." msgstr "" "Sie können neue Dateien auf zweierlei Weisen in das Subversion-Repository " "bekommen: <command>svn import</command> und <command>svn add</command>. Wir " "werden <command>svn import</command> jetzt und <command>svn add</command> " "später in diesem Kapitel besprechen, wenn wir einen typischen Tag mit " "Subversion durchnehmen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:95 ../en/book/ch09-reference.xml:2313 msgid "svn import" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:97 msgid "" "The <command>svn import</command> command is a quick way to copy an " "unversioned tree of files into a repository, creating intermediate " "directories as necessary. <command>svn import</command> doesn't require a " "working copy, and your files are immediately committed to the repository. " "You typically use this when you have an existing tree of files that you want " "to begin tracking in your Subversion repository. For example:" msgstr "" "Mit dem <command>svn import</command>-Befehl kann ein unversionierter " "Verzeichnisbaum schnell in ein Repository kopiert werden, wobei benötigte " "Zwischenverzeichnisse nach Bedarf angelegt werden. <command>svn import</" "command> erfordert keine Arbeitskopie und pflegt Ihre Dateien sofort in das " "Repository ein. Typischerweise verwenden Sie diesen Befehl, wenn bereits ein " "Verzeichnisbaum besteht, den Sie aber in einem Subversion-Repository pflegen " "möchten. Zum Beispiel:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:105 #, no-wrap msgid "" "\n" "$ svnadmin create /var/svn/newrepos\n" "$ svn import mytree file:///var/svn/newrepos/some/project \\\n" " -m \"Initial import\"\n" "Adding mytree/foo.c\n" "Adding mytree/bar.c\n" "Adding mytree/subdir\n" "Adding mytree/subdir/quux.h\n" "\n" "Committed revision 1.\n" msgstr "" "\n" "$ svnadmin create /var/svn/newrepos\n" "$ svn import mytree file:///var/svn/newrepos/some/project \\\n" " -m \"Initial import\"\n" "Adding mytree/foo.c\n" "Adding mytree/bar.c\n" "Adding mytree/subdir\n" "Adding mytree/subdir/quux.h\n" "\n" "Committed revision 1.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:117 msgid "" "The previous example copied the contents of directory <filename>mytree</" "filename> under the directory <filename>some/project</filename> in the " "repository:" msgstr "" "Im vorstehenden Beispiel wurde der Inhalt des Verzeichnisses " "<filename>mytree</filename> unter dem Verzeichnis <filename>some/project</" "filename> im Repository abgelegt:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:121 #, no-wrap msgid "" "\n" "$ svn list file:///var/svn/newrepos/some/project\n" "bar.c\n" "foo.c\n" "subdir/\n" msgstr "" "\n" "$ svn list file:///var/svn/newrepos/some/project\n" "bar.c\n" "foo.c\n" "subdir/\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:128 msgid "" "Note that after the import is finished, the original tree is <emphasis>not</" "emphasis> converted into a working copy. To start working, you still need " "to <command>svn checkout</command> a fresh working copy of the tree." msgstr "" "Beachten Sie, dass nach dem Import der Originalbaum <emphasis>nicht</" "emphasis> in eine Arbeitskopie umgewandelt wird. Vor Beginn der Arbeit " "müssen Sie noch <command>svn checkout</command> ausführen, um eine frische " "Arbeitskopie des Baums zu erhalten." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:137 msgid "Recommended Repository Layout" msgstr "Empfohlene Repository Aufteilung" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:139 msgid "" "While Subversion's flexibility allows you to lay out your repository in any " "way that you choose, we recommend that you create a <filename>trunk</" "filename> directory to hold the <quote>main line</quote> of development, a " "<filename>branches</filename> directory to contain branch copies, and a " "<filename>tags</filename> directory to contain tag copies. For example:" msgstr "" "Obwohl die Flexibilität von Subversion es Ihnen erlaubt, Ihr Repository nach " "Belieben aufzuteilen, empfehlen wir, ein Verzeichnis <filename>trunk</" "filename> für die <quote>Hauptlinie</quote> der Entwicklung, ein Verzeichnis " "<filename>branches</filename> für Branch-Kopien und ein Verzeichnis " "<filename>tags</filename> für Tag-Kopien. Zum Beispiel:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:147 #, no-wrap msgid "" "\n" "$ svn list file:///var/svn/repos\n" "/trunk\n" "/branches\n" "/tags\n" msgstr "" "\n" "$ svn list file:///var/svn/repos\n" "/trunk\n" "/branches\n" "/tags\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:154 msgid "" "You'll learn more about tags and branches in <xref linkend=\"svn.branchmerge" "\"/>. For details and how to set up multiple projects, see <xref linkend=" "\"svn.branchmerge.maint.layout\"/> and <xref linkend=\"svn.reposadmin." "projects.chooselayout\"/> to read more about project roots." msgstr "" "In <xref linkend=\"svn.branchmerge\"/> werden Sie mehr über Branches und " "Tags erfahren. Details über das Aufsetzen mehrerer Projekte finden Sie in " "<xref linkend=\"svn.branchmerge.maint.layout\"/>, und in <xref linkend=\"svn." "reposadmin.projects.chooselayout\"/> lesen Sie mehr über Wurzelverzeichnisse " "von Projekten." # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:169 msgid "Initial Checkout" msgstr "Anfänglicher Checkout" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:171 msgid "" "Most of the time, you will start using a Subversion repository by doing a " "<firstterm>checkout</firstterm> of your project. Checking out a repository " "creates a <quote>working copy</quote> of it on your local machine. This " "copy contains the <literal>HEAD</literal> (latest revision) of the " "Subversion repository that you specify on the command line:" msgstr "" "In den meisten Fällen werden Sie ein Subversion-Repository zu nutzen " "beginnen, indem Sie einen <firstterm>Checkout</firstterm> Ihres Projektes " "vornehmen. Das Auschecken eines Repositorys erzeugt eine " "<quote>Arbeitskopie</quote> desselben auf Ihrem lokalen Rechner. Diese " "Arbeitskopie umfasst die Revision <literal>HEAD</literal> (die letzte " "Revision) des auf der Kommandozeile angegebenen Subversion-Repositorys:" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch02-basic-usage.xml:179 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk\n" "A trunk/Makefile.in\n" "A trunk/ac-helpers\n" "A trunk/ac-helpers/install.sh\n" "A trunk/ac-helpers/install-sh\n" "A trunk/build.conf\n" "…\n" "Checked out revision 8810.\n" msgstr "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk\n" "A trunk/Makefile.in\n" "A trunk/ac-helpers\n" "A trunk/ac-helpers/install.sh\n" "A trunk/ac-helpers/install-sh\n" "A trunk/build.conf\n" "…\n" "Checked out revision 8810.\n" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch02-basic-usage.xml:191 msgid "What's in a Name?" msgstr "Was steckt in einem Namen?" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:193 msgid "" "Subversion tries hard not to limit the type of data you can place under " "version control. The contents of files and property values are stored and " "transmitted as binary data, and <xref linkend=\"svn.advanced.props.special." "mime-type\"/> tells you how to give Subversion a hint that <quote>textual</" "quote> operations don't make sense for a particular file. There are a few " "places, however, where Subversion places restrictions on information it " "stores." msgstr "" "Subversion gibt sich alle Mühe, nicht die Art der Daten einzuschränken, die " "Sie unter Versionskontrolle setzen können. Der Inhalt von Dateien und " "Property-Werte werden als binäre Daten gespeichert und übermittelt, und " "<xref linkend=\"svn.advanced.props.special.mime-type\"/> sagt Ihnen, wie Sie " "Subversion darauf hinweisen, dass <quote>Text</quote>-Operationen für eine " "bestimmte Datei keinen Sinn ergeben. Trotzdem gibt es einige wenige Stellen, " "an denen Subversion Einschränkungen für gespeicherte Informationen vorsieht." # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:203 msgid "" "Subversion internally handles certain bits of data—for example, " "property names, pathnames, and log messages—as UTF-8-encoded Unicode. " "This is not to say that all your interactions with Subversion must involve " "UTF-8, though. As a general rule, Subversion clients will gracefully and " "transparently handle conversions between UTF-8 and the encoding system in " "use on your computer, if such a conversion can meaningfully be done (which " "is the case for most common encodings in use today)." msgstr "" "Subversion behandelt intern bestimmte Dateneinheiten – z.B. Property-" "Namen, Pfadnamen und Logmitteilungen – als UTF-8-kodiertes Unicode. " "Das heißt aber nicht, dass all Ihre Interaktionen mit Subversion in UTF-8 " "erfolgen müssen. Im Allgemeinen werden Subversion-Clients die Umwandlungen " "zwischen UTF-8 und dem auf Ihrem Computer verwendeten Kodiersystem großzügig " "und transparent vornehmen, sofern eine solche Umwandlung sinnvollerweise " "durchgeführt werden kann (was bei den meisten gebräuchlichsten Kodierungen " "heutzutage der Fall ist)." # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:213 msgid "" "In WebDAV exchanges and older versions of some of Subversion's " "administrative files, paths are used as XML attribute values, and property " "names in XML tag names. This means that pathnames can contain only legal " "XML (1.0) characters, and properties are further limited to ASCII " "characters. Subversion also prohibits TAB, CR, and LF characters in path " "names to prevent paths from being broken up in diffs or in the output of " "commands such as <command>svn log</command> or <command>svn status</command>." msgstr "" "Darüber hinaus werden Pfadnamen sowohl bei WebDAV-Übertragungen als auch in " "einigen der Steuerdateien von Subversion als XML-Attributwerte verwendet. " "Das bedeutet, dass Pfadnamen nur aus zulässigen XML (1.0) Zeichen bestehen " "dürfen. Subversion verbietet ebenfalls TAB, CR und LF Zeichen in Pfadnamen, " "um zu verhindern, das Pfade in Vergleichen oder bei Befehlsausgaben, wie " "<command>svn log</command> oder <command>svn status</command> zerrissen " "werden." # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:223 msgid "" "While it may seem like a lot to remember, in practice these limitations are " "rarely a problem. As long as your locale settings are compatible with UTF-8 " "and you don't use control characters in path names, you should have no " "trouble communicating with Subversion. The command-line client adds an " "extra bit of help—to create <quote>legally correct</quote> versions " "for internal use it will automatically escape illegal path characters as " "needed in URLs that you type." msgstr "" "Obwohl es sich anhört, als müsse man sich eine Menge merken, sind diese " "Einschränkungen selten ein Problem. Solange Ihre Locale-Einstellungen " "kompatibel zu UTF-8 sind und Sie keine Kontrollzeichen in den Pfadnamen " "verwenden, sollten Sie keine Probleme habe, mit Subversion zu kommunizieren. " "Der Kommandozeilen-Client bietet Ihnen noch ein wenig Extrahilfe – um " "<quote>korrekte</quote> Versionen für den internen Gebrauch zu erzeugen, " "maskiert er bei Bedarf automatisch illegale Zeichen in URL-Pfaden, die Sie " "eingeben." # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:235 msgid "" "Although the preceding example checks out the trunk directory, you can just " "as easily check out any deep subdirectory of a repository by specifying the " "subdirectory in the checkout URL:" msgstr "" "Obwohl im vorangehenden Beispiel das Verzeichnis <filename>trunk</filename> " "ausgecheckt wird, können Sie genauso leicht irgendein tiefliegendes " "Unterverzeichnis aus einem Repository auschecken, indem Sie das " "Unterverzeichnis im URL beim Checkout angeben:" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch02-basic-usage.xml:240 #, no-wrap msgid "" "\n" "$ svn checkout \\\n" " http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline/\n" "A cmdline/revert_tests.py\n" "A cmdline/diff_tests.py\n" "A cmdline/autoprop_tests.py\n" "A cmdline/xmltests\n" "A cmdline/xmltests/svn-test.sh\n" "…\n" "Checked out revision 8810.\n" msgstr "" "\n" "$ svn checkout \\\n" " http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline/\n" "A cmdline/revert_tests.py\n" "A cmdline/diff_tests.py\n" "A cmdline/autoprop_tests.py\n" "A cmdline/xmltests\n" "A cmdline/xmltests/svn-test.sh\n" "…\n" "Checked out revision 8810.\n" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:252 msgid "" "Since Subversion uses a copy-modify-merge model instead of lock-modify-" "unlock (see <xref linkend=\"svn.basic.vsn-models\"/>), you can immediately " "make changes to the files and directories in your working copy. Your " "working copy is just like any other collection of files and directories on " "your system. You can edit and change it, move it around, even delete the " "entire working copy and forget about it." msgstr "" "Da Subversion ein <emphasis>copy-modify-merge</emphasis>-Modell (kopieren-" "ändern-zusammenführen) statt eines <emphasis>lock-modify-unlock</emphasis>-" "Modells (sperren-ändern-freigeben) verwendet (siehe <xref linkend=\"svn." "basic.vsn-models\"/>), können Sie sofort damit beginnen, Änderungen an den " "Dateien und Verzeichnissen Ihrer Arbeitskopie vorzunehmen. Ihre Arbeitskopie " "ist wie jede beliebige andere Ansammlung aus Dateien und Verzeichnissen auf " "Ihrem System. Sie können sie bearbeiten, ändern, verschieben und sie sogar " "löschen und vergessen." # type: Content of: <chapter><sect1><warning><para> #: ../en/book/ch02-basic-usage.xml:262 msgid "" "While your working copy is <quote>just like any other collection of files " "and directories on your system,</quote> you can edit files at will, but you " "must tell Subversion about <emphasis>everything else</emphasis> that you " "do. For example, if you want to copy or move an item in a working copy, you " "should use <command>svn copy</command> or <command>svn move</command> " "instead of the copy and move commands provided by your operating system. " "We'll talk more about them later in this chapter." msgstr "" "Obwohl sich Ihre Arbeitskopie <quote>wie jede beliebige andere Ansammlung " "aus Dateien und Verzeichnissen auf Ihrem System</quote> verhält, können Sie " "zwar beliebig Dateien editieren, doch Sie müssen Subversion über " "<emphasis>alles andere</emphasis> was Sie tun in Kenntnis setzen. Wenn Sie z." "B. ein Objekt in der Arbeitskopie kopieren oder verschieben möchten, " "sollten Sie <command>svn copy</command> oder <command>svn move</command> " "verwenden statt der Kopier- oder Verschiebebefehle Ihres Betriebssystems. " "Wir werden darauf später im Kapitel näher eingehen." # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:273 msgid "" "Unless you're ready to commit the addition of a new file or directory or " "changes to existing ones, there's no need to further notify the Subversion " "server that you've done anything." msgstr "" "Sofern Sie nicht bereit sind, das Hinzufügen einer neuen Datei oder eines " "neuen Verzeichnisses oder Änderungen an bestehenden Objekten an das " "Repository zu übergeben, besteht keine Notwendigkeit, dem Subversion-Server " "mitzuteilen, dass Sie irgendetwas gemacht haben." # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch02-basic-usage.xml:279 msgid "What's with the .svn Directory?" msgstr "Was hat es mit dem Verzeichnis .svn auf sich?" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:281 msgid "" "Every directory in a working copy contains an administrative area—a " "subdirectory named <filename>.svn</filename>. Usually, directory listing " "commands won't show this subdirectory, but it is nevertheless an important " "directory. Whatever you do, don't delete or change anything in the " "administrative area! Subversion depends on it to manage your working copy." msgstr "" "Jedes Verzeichnis in einer Arbeitskopie beinhaltet einen Verwaltungsbereich " "– ein Verzeichnis namens <filename>.svn</filename>. Normalerweise " "wird dieses Unterverzeichnis nicht vom Befehl zum Auflisten des " "Verzeichnisinhaltes angezeigt, trotzdem ist es ein wichtiges Verzeichnis. " "Egal, was Sie machen, löschen oder ändern Sie nichts im Verwaltungsbereich! " "Subversion ist darauf angewiesen, um Ihre Arbeitskopie zu verwalten." # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:289 msgid "" "If you accidentally remove the <filename>.svn</filename> subdirectory, the " "easiest way to fix the problem is to remove the entire containing directory " "(a normal system deletion, not <command>svn delete</command>), then run " "<userinput>svn update</userinput> from a parent directory. The Subversion " "client will download the directory you've deleted, with a new <filename>." "svn</filename> area as well." msgstr "" "Sollten Sie versehentlich das Verzeichnis <filename>.svn</filename> löschen, " "besteht die einfachste Lösung des Problems darin, das komplette " "darüberliegende Verzeichnis zu löschen (mit dem Betriebssystem-Löschbefehl, " "nicht mit <command>svn delete</command>) und dann wiederum <userinput>svn " "update</userinput> von einem darüberliegenden Verzeichnis aus aufzurufen. " "Der Subversion-Client wird das von Ihnen gelöschte Verzeichnis herunterladen " "und dabei auch einen neuen <filename>.svn</filename>-Bereich anlegen." # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:298 msgid "" "While you can certainly check out a working copy with the URL of the " "repository as the only argument, you can also specify a directory after your " "repository URL. This places your working copy in the new directory that you " "name. For example:" msgstr "" "Obwohl Sie sicherlich eine Arbeitskopie mit dem Repository-URL als einziges " "Argument auschecken können, haben sie auch die Möglichkeit, ein Verzeichnis " "hinter dem Repository-URL anzugeben. Das erstellt Ihre Arbeitskopie in dem " "angegebenen Verzeichnis. Zum Beispiel:" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch02-basic-usage.xml:303 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk subv\n" "A subv/Makefile.in\n" "A subv/ac-helpers\n" "A subv/ac-helpers/install.sh\n" "A subv/ac-helpers/install-sh\n" "A subv/build.conf\n" "…\n" "Checked out revision 8810.\n" msgstr "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk subv\n" "A subv/Makefile.in\n" "A subv/ac-helpers\n" "A subv/ac-helpers/install.sh\n" "A subv/ac-helpers/install-sh\n" "A subv/build.conf\n" "…\n" "Checked out revision 8810.\n" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:314 msgid "" "That will place your working copy in a directory named <literal>subv</" "literal> instead of a directory named <literal>trunk</literal> as we did " "previously. The directory <literal>subv</literal> will be created if it " "doesn't already exist." msgstr "" "Das legt Ihre Arbeitskopie in einem Verzeichnis namens <literal>subv</" "literal> ab anstatt in <literal>trunk</literal> so wie wir es früher schon " "einmal gemacht haben. Das Verzeichnis <literal>subv</literal> wird angelegt, " "sofern es nicht bereits vorhanden ist." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:322 msgid "Disabling Password Caching" msgstr "Das Zwischenspeichern des Passwortes abstellen" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch02-basic-usage.xml:324 msgid "" "When you perform a Subversion operation that requires you to authenticate, " "by default Subversion caches your authentication credentials on disk. This " "is done for convenience so that you don't have to continually reenter your " "password for future operations. If you're concerned about caching your " "Subversion passwords, <footnote>" msgstr "" "Wenn Sie eine Subversion-Operation ausführen, für die Sie sich " "authentifizieren müssen, speichert Subversion Ihre Zugangsdaten " "standardmäßig auf der Platte. Das geschieht zu Ihrer Annehmlichkeit, damit " "Sie bei künftigen Operationen nicht ständig Ihr Passwort eingeben müssen. " "Falls Sie wegen der Speicherung besorgt sein sollten <footnote>" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch02-basic-usage.xml:331 msgid "" "Of course, you're not terribly worried—first because you know that you " "can't <emphasis>really</emphasis> delete anything from Subversion, and " "second because your Subversion password isn't the same as any of the other 3 " "million passwords you have, right? Right?" msgstr "" "Natürlich sind Sie nicht ernsthaft besorgt – erstens, weil Sie wissen, " "dass Sie nichts <emphasis>wirklich</emphasis> aus Subversion löschen können " "und zweitens, weil Ihr Subversion-Passwort nicht das gleiche ist wie " "irgendein anderes Ihrer 3 Millionen Passwörter, nicht wahr?" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:337 msgid "" "</footnote> you can disable caching either permanently or on a case-by-case " "basis." msgstr "" "</footnote>, können Sie das Zwischenspeichern entweder dauerhaft oder von " "Fall zu Fall abstellen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:341 msgid "" "To disable password caching for a particular one-time command, pass the " "<option >--no-auth-cache</option > option on the command line. To " "permanently disable caching, you can add the line <literal>store-passwords = " "no</literal> to your local machine's Subversion configuration file. See " "<xref linkend=\"svn.serverconfig.netmodel.credcache\"/> for details." msgstr "" "Um das Passwort-Caching für einen bestimmten einmaligen Befehl zu " "unterbinden, übergeben Sie die <option>--no-auth-cache</option>-Option auf " "der Kommandozeile. Um das Caching dauerhaft abzustellen, können Sie der " "Subversion-Konfigurationsdatei Ihres lokalen Rechners die Zeile " "<literal>store-passwords = no</literal> hinzufügen. Für Details siehe <xref " "linkend=\"svn.serverconfig.netmodel.credcache\"/>." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:352 msgid "Authenticating As a Different User" msgstr "Authentifizierung als ein anderer Anwender" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:354 msgid "" "Since Subversion caches auth credentials by default (both username and " "password), it conveniently remembers who you were acting as the last time " "you modified your working copy. But sometimes that's not helpful—" "particularly if you're working in a shared working copy such as a system " "configuration directory or a web server document root. In this case, just " "pass the <option>--username</option> option on the command line, and " "Subversion will attempt to authenticate as that user, prompting you for a " "password if necessary." msgstr "" "Da Subversion standardmäßig Zugangsdaten speichert (sowohl den Benutzernamen " "als auch das Passwort), erinnert es sich bequemerweise, wer Sie das letzte " "Mal waren, als Sie Ihre Arbeitskopie modifizierten. Doch manchmal ist das " "nicht hilfreich – besonders, wenn Sie in einer gemeinsam benutzten " "Arbeitskopie arbeiten wie in einem Konfigurationsverzeichnis oder im " "Dokumenten-Wurzelverzeichnis eines Webservers. In diesem Fall brauchen Sie " "nur die <option>--username</option>-Option auf der Kommandozeile zu " "übergeben und Subversion versucht, sich als dieser Benutzer zu " "authentifizieren und wird Sie, wenn nötig, zur Eingabe eines Passworts " "auffordern." # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:372 msgid "Basic Work Cycle" msgstr "Der grundlegende Arbeitszyklus" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:374 msgid "" "Subversion has numerous features, options, bells, and whistles, but on a day-" "to-day basis, odds are that you will use only a few of them. In this " "section, we'll run through the most common things that you might find " "yourself doing with Subversion in the course of a day's work." msgstr "" "Subversion hat zahlreiche Features, Optionen und noch jede Menge " "Schnickschnack, aber für die tägliche Arbeit ist die Wahrscheinlichkeit " "groß, nur wenig davon zu benutzen. In diesem Abschnitt gehen wir durch die " "gebräuchlichsten Dinge, die Sie während des Tagesgeschäftes mit Subversion " "machen werden." # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:380 msgid "The typical work cycle looks like this:" msgstr "Der typische Arbeitszyklus sieht so aus:" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:384 ../en/book/ch09-reference.xml:5149 msgid "Update your working copy." msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:387 ../en/book/ch02-basic-usage.xml:437 msgid "<command>svn update</command>" msgstr "<command>svn update</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:394 msgid "Make changes." msgstr "Nehmen Sie Änderungen vor." # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:397 msgid "<command>svn add</command>" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:400 msgid "<command>svn delete</command>" msgstr "<command>svn delete</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:403 msgid "<command>svn copy</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:406 msgid "<command>svn move</command>" msgstr "<command>svn move</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:412 msgid "Examine your changes." msgstr "Untersuchen Sie Ihre Änderungen." # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:424 msgid "Possibly undo some changes." msgstr "Nehmen Sie eventuell einige Änderungen zurück." # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:434 msgid "Resolve conflicts (merge others' changes)." msgstr "Lösen Sie Konflikte auf (arbeiten Sie die Änderungen anderer ein)." # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:440 msgid "<command>svn resolve</command>" msgstr "<command>svn resolve</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:446 msgid "Commit your changes." msgstr "Bringen Sie Ihre Änderungen ins Repository." # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:449 msgid "<command>svn commit</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:457 msgid "Update Your Working Copy" msgstr "Aktualisieren Sie Ihre Arbeitskopie" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:459 msgid "" "When working on a project with a team, you'll want to update your working " "copy to receive any changes other developers on the project have made since " "your last update. Use <command>svn update</command> to bring your working " "copy into sync with the latest revision in the repository:" msgstr "" "Wenn Sie in einem Projekt im Team zusammenarbeiten, sollten Sie Ihre " "Arbeitskopie aktualisieren, um die Änderungen zu bekommen, die die anderen " "Entwickler im Projekt seit Ihrer letzten Aktualisierung vorgenommen haben. " "Benutzen Sie <command>svn update</command> um Ihre Arbeitskopie synchron mit " "der letzten Revision im Repository zu bekommen:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:465 #, no-wrap msgid "" "\n" "$ svn update\n" "U foo.c\n" "U bar.c\n" "Updated to revision 2.\n" msgstr "" "\n" "$ svn update\n" "U foo.c\n" "U bar.c\n" "Updated to revision 2.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:472 msgid "" "In this case, it appears that someone checked in modifications to both " "<filename>foo.c</filename> and <filename>bar.c</filename> since the last " "time you updated, and Subversion has updated your working copy to include " "those changes." msgstr "" "In diesem Fall sieht es so aus, dass jemand Änderungen sowohl an " "<filename>foo.c</filename> als auch an <filename>bar.c</filename> " "eingecheckt hat, seit Sie das letzte Mal aktualisiert haben, und Subversion " "hat Ihre Arbeitskopie aktualisiert, damit sie beide Änderungen enthält." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:478 msgid "" "When the server sends changes to your working copy via <command>svn update</" "command>, a letter code is displayed next to each item to let you know what " "actions Subversion performed to bring your working copy up to date. To find " "out what these letters mean, run <userinput>svn help update</userinput>." msgstr "" "Wenn der Server über <command>svn update</command> Änderungen an Ihre " "Arbeitskopie schickt, wird ein Buchstabencode neben jedem Objekt angezeigt, " "um Ihnen anzuzeigen, was Subversion gemacht hat, um die Arbeitskopie auf den " "neuesten Stand zu bringen. Zur Bedeutung der Buchstaben, rufen Sie " "<userinput>svn help update</userinput> auf." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:488 msgid "Make Changes to Your Working Copy" msgstr "Nehmen Sie Änderungen an Ihrer Arbeitskopie vor" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:490 msgid "" "Now you can get to work and make changes in your working copy. It's usually " "most convenient to decide on a discrete change (or set of changes) to make, " "such as writing a new feature, fixing a bug, and so on. The Subversion " "commands that you will use here are <command>svn add</command>, <command>svn " "delete</command>, <command>svn copy</command>, <command>svn move</command>, " "and <command>svn mkdir</command>. However, if you are merely editing files " "that are already in Subversion, you may not need to use any of these " "commands until you commit." msgstr "" "Nun können Sie loslegen und Änderungen an Ihrer Arbeitskopie vornehmen. " "Normalerweise ist es am einfachsten, sich für eine bestimmte Änderung (oder " "eine Menge von Änderungen) zu entscheiden, etwa ein neues Feature zu " "implementieren oder einen Fehler zu beseitigen usw. Die Subversion-Befehle, " "die Sie hierfür verwenden werden sind <command>svn add</command>, " "<command>svn delete</command>, <command>svn copy</command>, <command>svn " "move</command> und <command>svn mkdir</command>. Falls Sie jedoch " "größtenteils Dateien editieren, die bereits mit Subversion verwaltet werden, " "brauchen Sie keinen dieser Befehle, bis Sie die Änderungen committen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:501 msgid "" "You can make two kinds of changes to your working copy: <firstterm>file " "changes</firstterm> and <firstterm>tree changes</firstterm>. You don't need " "to tell Subversion that you intend to change a file; just make your changes " "using your text editor, word processor, graphics program, or whatever tool " "you would normally use. Subversion automatically detects which files have " "been changed, and in addition, it handles binary files just as easily as it " "handles text files—and just as efficiently, too. For tree changes, " "you can ask Subversion to <quote>mark</quote> files and directories for " "scheduled removal, addition, copying, or moving. These changes may take " "place immediately in your working copy, but no additions or removals will " "happen in the repository until you commit them." msgstr "" "Sie können zwei Arten von Änderungen an Ihrer Arbeitskopie vornehmen: " "<firstterm>Dateiänderungen</firstterm> und " "<firstterm>Verzeichnisbaumänderungen</firstterm>. Sie brauchen Subversion " "nicht mitzuteilen, dass Sie beabsichtigen, eine Datei zu ändern; nehmen Sie " "einfach die Änderungen mit Ihrem Texteditor, Textverarbeitungsprogramm, " "Grafikprogramm oder sonstigen Programm vor, wie Sie es gewohnt sind. " "Subversion stellt automatisch fest, welche Dateien sich geändert haben und " "behandelt dabei Binärdateien genauso einfach wie Textdateien – und " "genauso effizient. Für Änderungen am Verzeichnisbaum können Sie Subversion " "mitteilen, Dateien und Verzeichnisse zum geplanten Entfernen, Hinzufügen, " "Kopieren oder Verschieben <quote>vorzumerken</quote>. Diese Änderungen " "finden sofort in Ihrer Arbeitskopie statt, doch nichts wird dem Repository " "hinzugefügt oder daraus entfernt, bevor Sie die Änderungen committen." # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch02-basic-usage.xml:517 msgid "Versioning Symbolic Links" msgstr "Versionierung symbolischer Links" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:519 msgid "" "On non-Windows platforms, Subversion is able to version files of the special " "type <firstterm>symbolic link</firstterm> (or <quote>symlink</quote>). A " "symlink is a file that acts as a sort of transparent reference to some other " "object in the filesystem, allowing programs to read and write to those " "objects indirectly by way of performing operations on the symlink itself." msgstr "" "Auf Nicht-Windows-Systemen kann Subversion den besonderen Dateityp " "<firstterm>symbolischer Link</firstterm> (oder <firstterm>Symlink</" "firstterm>) versionieren. Ein Symlink ist eine Datei, die sich wie eine " "transparente Referenz auf ein anderes Objekt im Dateisystem verhält, und " "somit Programmen die Möglichkeit bietet, indirekt auf dieses Objekt " "zuzugreifen, indem sie Operationen auf dem Symlink ausführen." # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:527 msgid "" "When a symlink is committed into a Subversion repository, Subversion " "remembers that the file was in fact a symlink, as well as the object to " "which the symlink <quote>points.</quote> When that symlink is checked out to " "another working copy on a non-Windows system, Subversion reconstructs a real " "filesystem-level symbolic link from the versioned symlink. But that doesn't " "in any way limit the usability of working copies on systems such as Windows " "that do not support symlinks. On such systems, Subversion simply creates a " "regular text file whose contents are the path to which to the original " "symlink pointed. While that file can't be used as a symlink on a Windows " "system, it also won't prevent Windows users from performing their other " "Subversion-related activities." msgstr "" "Wenn ein Symlink in Subversion committet wird, merkt sich Subversion sowohl, " "dass die Datei eigentlich ein Symlink ist, als auch das Objekt, auf das der " "Symlink <quote>zeigt</quote>. Wenn dieser Symlink auf einem Nicht-Windows-" "System in einer anderen Arbeitskopie ausgecheckt wird, rekonstruiert " "Subversion aus dem versionierten Symlink einen echten Symlink auf " "Dateisystemebene. Jedoch beeinträchtigt das keineswegs die Benutzbarkeit von " "Arbeitskopien auf Systemen wie Windows, die keine Symlinks unterstützen. Auf " "diesen Systemen erzeugt Subversion einfach eine Textdatei, deren Inhalt der " "Pfad ist, auf den der ursprüngliche Symlink gezeigt hat. Obwohl diese Datei " "unter Windows nicht als Symlink verwendet werden kann, hindert es Windows-" "Benutzer nicht an der Ausübung anderer Tätigkeiten mit Subversion." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:542 msgid "" "Here is an overview of the five Subversion subcommands that you'll use most " "often to make tree changes:" msgstr "" "Hier ist ein Überblick der fünf Subversion-Unterbefehle, die Sie am " "häufigsten benutzen werden, um Änderungen am Verzeichnisbaum vorzunehmen:" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:548 msgid "<userinput>svn add foo</userinput>" msgstr "<userinput>svn add foo</userinput>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:550 msgid "" "Schedule file, directory, or symbolic link <filename>foo</filename> to be " "added to the repository. When you next commit, <filename>foo</filename> " "will become a child of its parent directory. Note that if <filename>foo</" "filename> is a directory, everything underneath <filename>foo</filename> " "will be scheduled for addition. If you want only to add <filename>foo</" "filename> itself, pass the <option>--depth empty</option> option." msgstr "" "Die Datei, das Verzeichnis oder den symbolischen Link <filename>foo</" "filename> zum Hinzufügen in das Repository vormerken. Wenn Sie das nächste " "Mal committen, wird <filename>foo</filename> ein Kind seines " "Elternverzeichnisses. Beachten Sie, dass alles unterhalb von <filename>foo</" "filename> zum Hinzufügen vorgemerkt wird, falls <filename>foo</filename> ein " "Verzeichnis ist. Falls Sie nur <filename>foo</filename> selber hinzufügen " "möchten, geben Sie die <option>--depth empty</option>-Option an." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:563 msgid "<userinput>svn delete foo</userinput>" msgstr "<userinput>svn delete foo</userinput>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote> #: ../en/book/ch02-basic-usage.xml:565 msgid "" "Schedule file, directory, or symbolic link <filename>foo</filename> to be " "deleted from the repository. If <filename>foo</filename> is a file or link, " "it is immediately deleted from your working copy. If <filename>foo</" "filename> is a directory, it is not deleted, but Subversion schedules it for " "deletion. When you commit your changes, <filename>foo</filename> will be " "entirely removed from your working copy and the repository. <footnote>" msgstr "" "Die Datei, das Verzeichnis oder den symbolischen Link <filename>foo</" "filename> zum Löschen aus dem Repository vormerken. <filename>foo</filename> " "wird sofort aus der Arbeitskopie entfernt, falls es eine Datei oder ein Link " "ist. Falls <filename>foo</filename> ein Verzeichnis ist, wird es nicht " "gelöscht, sondern zum Löschen vorgemerkt. Wenn Sie Ihre Änderungen " "committen, wird das gesamte Verzeichnis <filename>foo</filename> aus der " "Arbeitskopie und dem Repository entfernt. <footnote>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote><para> #: ../en/book/ch02-basic-usage.xml:575 msgid "" "Of course, nothing is ever totally deleted from the repository—just " "from the <literal>HEAD</literal> of the repository. You can get back " "anything you delete by checking out (or updating your working copy to) a " "revision earlier than the one in which you deleted it. Also see <xref " "linkend=\"svn.branchmerge.basicmerging.resurrect\" />." msgstr "" "Selbstverständlich wird nichts jemals vollständig aus dem Repository " "gelöscht – lediglich aus der <literal>HEAD</literal>-Revision des " "Repositorys. Sie können alles was Sie gelöscht haben zurückholen, indem Sie " "eine Revision auschecken (oder hierauf aktualisieren), die älter ist, als " "die Revision Ihrer Löschung. Siehe auch <xref linkend=\"svn.branchmerge." "basicmerging.resurrect\" />." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:589 msgid "<userinput>svn copy foo bar</userinput>" msgstr "<userinput>svn copy foo bar</userinput>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:591 msgid "" "Create a new item <filename>bar</filename> as a duplicate of <filename>foo</" "filename> and automatically schedule <filename>bar</filename> for addition. " "When <filename>bar</filename> is added to the repository on the next commit, " "its copy history is recorded (as having originally come from <filename>foo</" "filename>). <command>svn copy</command> does not create intermediate " "directories unless you pass the <option>--parents</option> option." msgstr "" "Erzeuge ein neues Objekt <filename>bar</filename> als Duplikat von " "<filename>foo</filename> und merke <filename>bar</filename> automatisch zum " "Hinzufügen vor. Wird beim nächsten Commit <filename>bar</filename> dem " "Repository hinzugefügt, wird die Historie der Kopie mitaufgezeichnet (so wie " "sie ursprünglich in <filename>foo</filename> war). <command>svn copy</" "command> erzeugt keine Zwischenverzeichnisse, sofern nicht die Option " "<option>--parents</option> angegeben wird.." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:604 msgid "<userinput>svn move foo bar</userinput>" msgstr "<userinput>svn move foo bar</userinput>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:606 msgid "" "This command is exactly the same as running <userinput>svn copy foo bar; svn " "delete foo</userinput>. That is, <filename>bar</filename> is scheduled for " "addition as a copy of <filename>foo</filename>, and <filename>foo</filename> " "is scheduled for removal. <command>svn move</command> does not create " "intermediate directories unless you pass the <option>--parents</option> " "option." msgstr "" "Dieser Befehl macht genau das gleiche wie <userinput>svn copy foo bar; svn " "delete foo</userinput>. D.h., <filename>bar</filename> wird zum Hinzufügen " "als Kopie von <filename>foo</filename> und <filename>foo</filename> selbst " "zum Löschen vorgemerkt. <command>svn move</command> erzeugt keine " "Zwischenverzeichnisse, sofern nicht die Option <option>--parents</option> " "angegeben wird." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:618 msgid "<userinput>svn mkdir blort</userinput>" msgstr "<userinput>svn mkdir blort</userinput>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:620 msgid "" "This command is exactly the same as running <userinput>mkdir blort; svn add " "blort</userinput>. That is, a new directory named <filename>blort</" "filename> is created and scheduled for addition." msgstr "" "Dieser Befehl macht genau das gleiche wie <userinput>mkdir blort; svn add " "blort</userinput>. D.h., ein neues Verzeichnis namens <filename>blort</" "filename> wird angelegt und zum Hinzufügen vorgemerkt." # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch02-basic-usage.xml:630 msgid "Changing the Repository Without a Working Copy" msgstr "Ändern des Repositorys ohne Arbeitskopie" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:632 msgid "" "There <emphasis>are</emphasis> some use cases that immediately commit tree " "changes to the repository. This happens only when a subcommand is operating " "directly on a URL, rather than on a working-copy path. In particular, " "specific uses of <command>svn mkdir</command>, <command>svn copy</command>, " "<command>svn move</command>, and <command>svn delete</command> can work with " "URLs (and don't forget that <command>svn import</command> always makes " "changes to a URL)." msgstr "" "Es <emphasis>gibt</emphasis> einige Anwendungsfälle, die Änderungen am " "Verzeichnisbaum unmittelbar in das Repository übertragen. Das passiert nur, " "wenn ein Unterbefehl direkt auf einen URL statt auf einen Pfad in der " "Arbeitskopie angewendet wird. Im Einzelnen können spezielle Anwendungen der " "Befehle <command>svn mkdir</command>, <command>svn copy</command>, " "<command>svn move</command> und <command>svn delete</command> mit URLs " "arbeiten (und vergessen Sie nicht, dass <command>svn import</command> immer " "Änderungen über einen URL macht)." # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:642 msgid "" "URL operations behave in this manner because commands that operate on a " "working copy can use the working copy as a sort of <quote>staging area</" "quote> to set up your changes before committing them to the repository. " "Commands that operate on URLs don't have this luxury, so when you operate " "directly on a URL, any of the aforementioned actions represents an immediate " "commit." msgstr "" "URL Operationen verhalten sich auf diese Weise, da Befehle, die auf einer " "Arbeitskopie arbeiten, diese als eine Art <quote>Bereitstellungsraum</quote> " "verwenden, in denen Ihre Änderungen vorbereitet werden können, bevor sie in " "das Repository committet werden. Befehle, die auf URLs arbeiten, haben " "diesen Luxus nicht, so dass die Arbeit direkt mit einem URL bei den oben " "genannten Aktionen einen sofortigen Commit repräsentiert." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:656 msgid "Examine Your Changes" msgstr "Untersuchen Sie Ihre Änderungen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:658 msgid "" "Once you've finished making changes, you need to commit them to the " "repository, but before you do so, it's usually a good idea to take a look at " "exactly what you've changed. By examining your changes before you commit, " "you can make a more accurate log message. You may also discover that you've " "inadvertently changed a file, and this gives you a chance to revert those " "changes before committing. Additionally, this is a good opportunity to " "review and scrutinize changes before publishing them. You can see an " "overview of the changes you've made by using <command>svn status</command>, " "and dig into the details of those changes by using <command>svn diff</" "command>." msgstr "" "Sobald Sie mit Ihren Änderungen fertig sind, müssen Sie sie ins Repository " "bringen; bevor Sie das jedoch machen, ist es normalerweise eine gute Idee, " "sich die Änderungen noch einmal anzusehen. Dadurch, dass Sie die Änderungen " "noch einmal begutachten, können Sie eine genauere Log-Nachricht schreiben. " "Sie könnten auch feststellen, dass Sie versehentlich eine Datei geändert " "haben, und hier haben Sie die Möglichkeit, vor dem Commit die Änderung " "rückgängig zu machen. Zusätzlich bietet sich hierbei eine gute Gelegenheit, " "die Änderungen vor der Veröffentlichung noch einmal genau durchzugehen. Sie " "können sich mit <command>svn status</command> einen Überblick über Ihre " "Änderungen verschaffen und mit <command>svn diff</command> die Änderungen im " "Detail anzeigen lassen." # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch02-basic-usage.xml:672 msgid "Look Ma! No Network!" msgstr "Guck mal, Mutti, kein Netzwerk!" # type: Content of: <chapter><sect1><sect2><sidebar><para><footnote> #: ../en/book/ch02-basic-usage.xml:674 msgid "" "You can use the commands <command>svn status</command>, <command>svn diff</" "command>, and <command>svn revert</command> without any network access even " "if your repository <emphasis>is</emphasis> across the network. This makes " "it easy to manage your changes-in-progress when you are somewhere without a " "network connection, such as traveling on an airplane, riding a commuter " "train, or hacking on the beach. <footnote>" msgstr "" "Sie können die Befehle <command>svn status</command>, <command>svn diff</" "command> und <command>svn revert</command> ohne Netzzugriff verwenden, " "selbst wenn das Repository im Netz <emphasis>ist</emphasis>. Das macht es " "leicht, Ihre momentanen Änderungen zu verwalten, wenn Sie irgendwo ohne " "Netzverbindung sind, etwa im Flugzeug, im Pendlerzug oder am Strand. " "<footnote>" # type: Content of: <chapter><sect1><sect2><sidebar><para><footnote><para> #: ../en/book/ch02-basic-usage.xml:683 msgid "And you don't have a WLAN card. Thought you got us, huh?" msgstr "" "Und Sie haben keine WLAN-Karte. Sie dachten wohl, Sie kriegen uns, was?" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:688 msgid "" "Subversion does this by keeping private caches of pristine versions of each " "versioned file inside the <filename>.svn</filename> administrative areas. " "This allows Subversion to report—and revert—local modifications " "to those files <emphasis>without network access</emphasis>. This cache " "(called the <quote>text-base</quote>) also allows Subversion to send the " "user's local modifications during a commit to the server as a compressed " "<firstterm>delta</firstterm> (or <quote>difference</quote>) against the " "pristine version. Having this cache is a tremendous benefit—even if " "you have a fast Internet connection, it's much faster to send only a file's " "changes rather than the whole file to the server." msgstr "" "Subversion bewerkstelligt das, indem es unveränderte Versionen jeder " "versionierten Datei in einem privaten Cache innerhalb des <filename>.svn</" "filename>-Verwaltungsbereichs vorhält. Das erlaubt Subversion, lokale " "Änderungen an diesen Dateien <emphasis>ohne Netzzugriff</emphasis> " "anzuzeigen – und rückgängig zu machen. Dieser Cache (<quote>Text-Base</" "quote> genannt) erlaubt es Subversion ebenfalls, bei einem Commit die " "lokalen Änderungen des Benutzers als komprimiertes <firstterm>Delta</" "firstterm> (oder <quote>Differenz</quote>) gegenüber der unveränderten " "Version zum Server zu senden. Diesen Cache zu haben, bedeutet einen riesigen " "Vorteil – selbst wenn Sie eine schnelle Internet-Verbindung haben, ist " "es viel schneller, nur die Änderungen an einer Datei an den Server zu " "übermitteln, anstatt die gesamte Datei." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:705 msgid "" "Subversion has been optimized to help you with this task, and it is able to " "do many things without communicating with the repository. In particular, " "your working copy contains a hidden cached <quote>pristine</quote> copy of " "each version-controlled file within the <filename>.svn</filename> area. " "Because of this, Subversion can quickly show you how your working files have " "changed or even allow you to undo your changes without contacting the " "repository." msgstr "" "Subversion ist optimiert worden, um Ihnen bei dieser Aufgabe zu helfen, und " "es ist in der Lage, viele Dinge zu tun, ohne mit dem Repository " "kommunizieren zu müssen. Im Besonderen enthält Ihre Arbeitskopie eine " "versteckte <quote>unveränderte</quote> Kopie jeder versionskontrollierten " "Datei innerhalb des <filename>.svn</filename>-Bereichs. Deswegen kann Ihnen " "Subversion schnell zeigen, wie sich Ihre bearbeiteten Dateien geändert " "haben, und es erlaubt Ihnen sogar, Ihre Änderungen zurückzunehmen, ohne " "Verbindung mit dem Repository aufnehmen zu müssen." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:716 msgid "See an overview of your changes" msgstr "Verschaffen Sie sich einen Überblick über Ihre Änderungen" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:718 msgid "" "To get an overview of your changes, you'll use the <command>svn status</" "command> command. You'll probably use <command>svn status</command> more " "than any other Subversion command." msgstr "" "Um einen Überblick über Ihre Änderungen zu bekommen, werden Sie den " "<command>svn status</command>-Befehl verwenden. Wahrscheinlich werden Sie " "den Befehl <command>svn status</command> häufiger benutzen als alle anderen " "Subversion-Befehle." # type: Content of: <chapter><sect1><sect2><sect3><sidebar><title> #: ../en/book/ch02-basic-usage.xml:724 msgid "CVS Users: Hold That Update!" msgstr "CVS Anwender: Zurückhaltung mit Update!" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para> #: ../en/book/ch02-basic-usage.xml:726 msgid "" "You're probably used to using <command>cvs update</command> to see what " "changes you've made to your working copy. <command>svn status</command> " "will give you all the information you need regarding what has changed in " "your working copy—without accessing the repository or potentially " "incorporating new changes published by other users." msgstr "" "Sehr wahrscheinlich sind Sie es gewohnt, <command>cvs update</command> zu " "benutzen, um zu sehen, welche Änderungen Sie an Ihrer Arbeitskopie " "vorgenommen haben. <command>svn status</command> stellt Ihnen alle " "Informationen zur Verfügung, die Sie über Änderungen an der Arbeitskopie " "benötigen – ohne mit dem Repository in Verbindung zu treten oder " "möglicherweise neue Änderungen von anderen Benutzern einzupflegen." # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para> #: ../en/book/ch02-basic-usage.xml:734 msgid "" "In Subversion, <command>svn update</command> does just that—it updates " "your working copy with any changes committed to the repository since the " "last time you updated your working copy. You may have to break the habit of " "using the <command>update</command> command to see what local modifications " "you've made." msgstr "" "In Subversion, macht <command>svn update</command> genau das – es " "aktualisiert Ihre Arbeitskopie mit jeglichen Änderungen, die seit Ihrer " "letzten Aktualisierung in das Repository eingebracht worden sind. Sie " "sollten sich abgewöhnen, <command>update</command> zu verwenden, um " "nachzusehen, welche lokalen Änderungen Sie gemacht haben." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:743 msgid "" "If you run <command>svn status</command> at the top of your working copy " "with no arguments, it will detect all file and tree changes you've made. " "Here are a few examples of the most common status codes that <command>svn " "status</command> can return. (Note that the text following <literal>#</" "literal> is not actually printed by <command>svn status</command>.)" msgstr "" "Wenn Sie <command>svn status</command> ganz oben in Ihrer Arbeitskopie " "aufrufen, werden alle Datei- und Verzeichnisbaumänderungen erfasst, die Sie " "gemacht haben. Hier sind einige Beispiele der häufigsten Statuscodes, die " "<command>svn status</command> zurückgeben kann. (Beachten Sie, dass der " "Text, der <literal>#</literal> folgt, nicht von <command>svn status</" "command> ausgegeben wird.)" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:751 #, no-wrap msgid "" "\n" "? scratch.c # file is not under version control\n" "A stuff/loot/bloo.h # file is scheduled for addition\n" "C stuff/loot/lump.c # file has textual conflicts from an update\n" "D stuff/fish.c # file is scheduled for deletion\n" "M bar.c # the content in bar.c has local modifications\n" msgstr "" "\n" "? scratch.c # Datei ist nicht versionskontrolliert\n" "A stuff/loot/bloo.h # Datei ist zum Hinzufügen vorgemerkt\n" "C stuff/loot/lump.c # Datei hat Konflikte durch einen Update\n" "D stuff/fish.c # Datei ist zum Löschen vorgemerkt\n" "M bar.c # Der Inhalt von bar.c hat lokale Änderungen\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:759 msgid "" "In this output format, <command>svn status</command> prints six columns of " "characters, followed by several whitespace characters, followed by a file or " "directory name. The first column tells the status of a file or directory " "and/or its contents. The codes we listed are:" msgstr "" "In diesem Ausgabeformat zeigt <command>svn status</command> sechs Spalten " "mit Zeichen, gefolgt von mehreren Leerzeichen, gefolgt von einem Datei- oder " "Verzeichnisnamen an. Die erste Spalte gibt Aufschluss über den Zustand einer " "Datei oder eines Verzeichnisses und/oder des entsprechenden Inhalts." # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:768 msgid "<computeroutput>A item</computeroutput>" msgstr "<computeroutput>A item</computeroutput>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:770 msgid "" "The file, directory, or symbolic link <filename>item</filename> has been " "scheduled for addition into the repository." msgstr "" "Die Datei, das Verzeichnis oder der symbolische Link <filename>item</" "filename> ist zum Hinzufügen in das Repository vorgemerkt." # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:777 msgid "<computeroutput>C item</computeroutput>" msgstr "<computeroutput>C item</computeroutput>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:780 msgid "" "The file <filename>item</filename> is in a state of conflict. That is, " "changes received from the server during an update overlap with local changes " "that you have in your working copy (and weren't resolved during the " "update). You must resolve this conflict before committing your changes to " "the repository." msgstr "" "Die Datei <filename>item</filename> befindet sich in einem Konfliktzustand. " "D.h., Änderungen, die vom Server bei einer Aktualisierung empfangen wurden, " "überlappen sich mit lokalen Änderungen, die Sie in Ihrer Arbeitskopie haben " "(und konnten beim Aktualisieren nicht automatisch aufgelöst werden). Sie " "müssen den Konflikt auflösen, bevor Sie Ihre Änderungen in das Repository " "committen können." # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:792 msgid "<computeroutput>D item</computeroutput>" msgstr "<computeroutput>D item</computeroutput>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:794 msgid "" "The file, directory, or symbolic link <filename>item</filename> has been " "scheduled for deletion from the repository." msgstr "" "Die Datei, das Verzeichnis oder der symbolische Link <filename>item</" "filename> ist zum Löschen im Repository vorgemerkt." # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:801 msgid "<computeroutput>M item</computeroutput>" msgstr "<computeroutput>M item</computeroutput>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:803 msgid "The contents of the file <filename>item</filename> have been modified." msgstr "Der Inhalt der Datei <filename>item</filename> ist geändert worden." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:810 msgid "" "If you pass a specific path to <command>svn status</command>, you get " "information about that item alone:" msgstr "" "Wenn Sie einen speziellen Pfad an <command>svn status</command> übergeben, " "bekommen Sie nur Informationen über das Objekt alleine:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:814 #, no-wrap msgid "" "\n" "$ svn status stuff/fish.c\n" "D stuff/fish.c\n" msgstr "" "\n" "$ svn status stuff/fish.c\n" "D stuff/fish.c\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:819 msgid "" "<command>svn status</command> also has a <option>--verbose</option> " "(<option>-v</option>) option, which will show you the status of " "<emphasis>every</emphasis> item in your working copy, even if it has not " "been changed:" msgstr "" "<command>svn status</command> hat auch eine <option>--verbose</option>-" "Option (<option>-v</option>), die Ihnen den Zustand <emphasis>jedes</" "emphasis> Objektes in der Arbeitskopie anzeigt, selbst wenn es sich nicht " "geändert hat:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:825 #, no-wrap msgid "" "\n" "$ svn status -v\n" "M 44 23 sally README\n" " 44 30 sally INSTALL\n" "M 44 20 harry bar.c\n" " 44 18 ira stuff\n" " 44 35 harry stuff/trout.c\n" "D 44 19 ira stuff/fish.c\n" " 44 21 sally stuff/things\n" "A 0 ? ? stuff/things/bloo.h\n" " 44 36 harry stuff/things/gloo.c\n" msgstr "" "\n" "$ svn status -v\n" "M 44 23 sally README\n" " 44 30 sally INSTALL\n" "M 44 20 harry bar.c\n" " 44 18 ira stuff\n" " 44 35 harry stuff/trout.c\n" "D 44 19 ira stuff/fish.c\n" " 44 21 sally stuff/things\n" "A 0 ? ? stuff/things/bloo.h\n" " 44 36 harry stuff/things/gloo.c\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:838 msgid "" "This is the <quote>long form</quote> output of <command>svn status</" "command>. The letters in the first column mean the same as before, but the " "second column shows the working revision of the item. The third and fourth " "columns show the revision in which the item last changed, and who changed it." msgstr "" "Dies ist das <quote>lange Format</quote> der Ausgabe von <command>svn " "status</command>. Die Buchstaben in der ersten Spalte bedeuten dasselbe wie " "vorher, jedoch zeigt die zweite Spalte die Arbeitsrevision des Objektes an. " "Die dritte und vierte Spalte zeigen die Revision der letzten Änderung an und " "wer es geändert hat." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:845 msgid "" "None of the prior invocations to <command>svn status</command> contact the " "repository—instead, they compare the metadata in the <filename>.svn</" "filename> directory with the working copy. Finally, there is the <option>--" "show-updates</option> (<option>-u</option>) option, which contacts the " "repository and adds information about things that are out of date:" msgstr "" "Keiner der vorangegangenen Aufrufe von <command>svn status</command> stellt " "eine Verbindung zum Repository her – stattdessen werden die Metadaten " "im Verzeichnis <filename>.svn</filename> mit der Arbeitskopie verglichen. " "Schließlich gibt es die <option>--show-updates</option>-Option (<option>-u</" "option>), die eine Verbindung zum Repository herstellt, und Informationen " "darüber bereitstellt, was nicht mehr aktuell ist:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:853 #, no-wrap msgid "" "\n" "$ svn status -u -v\n" "M * 44 23 sally README\n" "M 44 20 harry bar.c\n" " * 44 35 harry stuff/trout.c\n" "D 44 19 ira stuff/fish.c\n" "A 0 ? ? stuff/things/bloo.h\n" "Status against revision: 46\n" msgstr "" "\n" "$ svn status -u -v\n" "M * 44 23 sally README\n" "M 44 20 harry bar.c\n" " * 44 35 harry stuff/trout.c\n" "D 44 19 ira stuff/fish.c\n" "A 0 ? ? stuff/things/bloo.h\n" "Status against revision: 46\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:863 msgid "" "Notice the two asterisks: if you were to run <userinput>svn update</" "userinput> at this point, you would receive changes to <filename>README</" "filename> and <filename>trout.c</filename>. This tells you some very useful " "information—you'll need to update and get the server changes on " "<filename>README</filename> before you commit, or the repository will reject " "your commit for being out of date (more on this subject later)." msgstr "" "Beachten Sie die zwei Sternchen: Wenn Sie an dieser Stelle <userinput>svn " "update</userinput> aufrufen würden, erhielten Sie Änderungen an " "<filename>README</filename> und <filename>trout.c</filename>. Das gibt Ihnen " "einige sehr wichtige Informationen – Sie müssen aktualisieren, um die " "Änderungen auf dem Server an <filename>README</filename> mitzubekommen, " "bevor Sie committen, oder das Repository wird Ihren Commit ablehnen, da er " "nicht aktuell ist (mehr dazu später)." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:872 msgid "" "<command>svn status</command> can display much more information about the " "files and directories in your working copy than we've shown here—for " "an exhaustive description of <command>svn status</command> and its output, " "see <xref linkend=\"svn.ref.svn.c.status\"/>." msgstr "" "<command>svn status</command> kann viel mehr Informationen über Dateien und " "Verzeichnisse in Ihrer Arbeitskopie anzeigen als wir hier gezeigt haben " "– für eine erschöpfende Beschreibung von <command>svn status</command> " "und dessen Ausgabe, siehe <xref linkend=\"svn.ref.svn.c.status\"/>." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:882 msgid "Examine the details of your local modifications" msgstr "Untersuchen Sie die Details Ihrer lokalen Änderungen" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:884 msgid "" "Another way to examine your changes is with the <command>svn diff</command> " "command. You can find out <emphasis>exactly</emphasis> how you've modified " "things by running <userinput>svn diff</userinput> with no arguments, which " "prints out file changes in <firstterm>unified diff format</firstterm>:" msgstr "" "Eine andere Möglichkeit, Ihre Änderungen zu untersuchen, ist, den " "<command>svn diff</command>-Befehl zu verwenden. Sie können " "<emphasis>genau</emphasis> herausfinden, wie sie etwas geändert haben, indem " "Sie <userinput>svn diff</userinput> ohne Argumente aufrufen, das Ihnen " "Dateiänderungen im <firstterm>unified-diff-Format</firstterm> anzeigt:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:891 #, no-wrap msgid "" "\n" "$ svn diff\n" "Index: bar.c\n" "===================================================================\n" "--- bar.c\t(revision 3)\n" "+++ bar.c\t(working copy)\n" "@@ -1,7 +1,12 @@\n" "+#include <sys/types.h>\n" "+#include <sys/stat.h>\n" "+#include <unistd.h>\n" "+\n" "+#include <stdio.h>\n" "\n" " int main(void) {\n" "- printf(\"Sixty-four slices of American Cheese...\\n\");\n" "+ printf(\"Sixty-five slices of American Cheese...\\n\");\n" " return 0;\n" " }\n" "\n" "Index: README\n" "===================================================================\n" "--- README\t(revision 3)\n" "+++ README\t(working copy)\n" "@@ -193,3 +193,4 @@\n" "+Note to self: pick up laundry.\n" "\n" "Index: stuff/fish.c\n" "===================================================================\n" "--- stuff/fish.c\t(revision 1)\n" "+++ stuff/fish.c\t(working copy)\n" "-Welcome to the file known as 'fish'.\n" "-Information on fish will be here soon.\n" "\n" "Index: stuff/things/bloo.h\n" "===================================================================\n" "--- stuff/things/bloo.h\t(revision 8)\n" "+++ stuff/things/bloo.h\t(working copy)\n" "+Here is a new file to describe\n" "+things about bloo.\n" msgstr "" "\n" "$ svn diff\n" "Index: bar.c\n" "===================================================================\n" "--- bar.c\t(revision 3)\n" "+++ bar.c\t(working copy)\n" "@@ -1,7 +1,12 @@\n" "+#include <sys/types.h>\n" "+#include <sys/stat.h>\n" "+#include <unistd.h>\n" "+\n" "+#include <stdio.h>\n" "\n" " int main(void) {\n" "- printf(\"Sixty-four slices of American Cheese...\\n\");\n" "+ printf(\"Sixty-five slices of American Cheese...\\n\");\n" " return 0;\n" " }\n" "\n" "Index: README\n" "===================================================================\n" "--- README\t(revision 3)\n" "+++ README\t(working copy)\n" "@@ -193,3 +193,4 @@\n" "+Note to self: pick up laundry.\n" "\n" "Index: stuff/fish.c\n" "===================================================================\n" "--- stuff/fish.c\t(revision 1)\n" "+++ stuff/fish.c\t(working copy)\n" "-Welcome to the file known as 'fish'.\n" "-Information on fish will be here soon.\n" "\n" "Index: stuff/things/bloo.h\n" "===================================================================\n" "--- stuff/things/bloo.h\t(revision 8)\n" "+++ stuff/things/bloo.h\t(working copy)\n" "+Here is a new file to describe\n" "+things about bloo.\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:932 msgid "" "The <command>svn diff</command> command produces this output by comparing " "your working files against the cached <quote>pristine</quote> copies within " "the <filename>.svn</filename> area. Files scheduled for addition are " "displayed as all added text, and files scheduled for deletion are displayed " "as all deleted text." msgstr "" "Der <command>svn diff</command>-Befehl erzeugt diese Ausgabe, indem er Ihre " "Arbeitsdateien mit den <quote>unveränderten</quote> Kopien im Cache " "innerhalb des <filename>.svn</filename>-Bereichs vergleicht. Dateien, die " "zum Hinzufügen vorgemerkt sind, werden vollständig als hinzugefügter Text " "dargestellt, und Dateien, die zum Löschen vorgemerkt sind, werden " "vollständig als gelöschter Text dargestellt." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:940 msgid "" "Output is displayed in unified diff format. That is, removed lines are " "prefaced with <literal>-</literal>, and added lines are prefaced with " "<literal>+</literal>. <command>svn diff</command> also prints filename and " "offset information useful to the <command>patch</command> program, so you " "can generate <quote>patches</quote> by redirecting the diff output to a file:" msgstr "" "Die Ausgabe wird im unified-diff-Format dargestellt. D.h., gelöschte Zeilen " "werden mit einem vorangestellten <literal>-</literal> und hinzugefügte " "Zeilen mit einem vorangestellten <literal>+</literal> angezeigt. " "<command>svn diff</command> gibt auch Dateinamen und Offset-Informationen " "aus, die das <command>patch</command>-Programm verwenden kann, so dass Sie " "<quote>Patches</quote> erzeugen können, indem Sie die diff-Ausgabe in eine " "Datei umleiten:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:949 #, no-wrap msgid "" "\n" "$ svn diff > patchfile\n" msgstr "" "\n" "$ svn diff > patchfile\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:953 msgid "" "You could, for example, email the patch file to another developer for review " "or testing prior to a commit." msgstr "" "Zum Beispiel können Sie die Patch-Datei vor einem Commit an einen anderen " "Entwickler zur Kontrolle oder zum Testen schicken." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:956 msgid "" "Subversion uses its internal diff engine, which produces unified diff " "format, by default. If you want diff output in a different format, specify " "an external diff program using <option>--diff-cmd</option> and pass any " "flags you'd like to it using the <option>--extensions</option> (<option>-x</" "option>) option. For example, to see local differences in file " "<filename>foo.c</filename> in context output format while ignoring case " "differences, you might run <userinput>svn diff --diff-cmd /usr/bin/diff --" "extensions '-i' foo.c</userinput>." msgstr "" "Subversion verwendet seinen eingebauten diff-Algorithmus, der standardmäßig " "das unified-diff-Format benutzt. Falls Sie die Ausgabe von diff in einem " "anderen Format haben möchten, geben Sie ein externes diff-Programm mit der " "<option>--diff-cmd</option>-Option an, und übergeben Sie ihm beliebige Flags " "mit der <option>--extensions</option>-Option (<option>-x</option>). Um z.B. " "lokale Unterschiede in der Datei <filename>foo.c</filename> im Kontext-" "Ausgabeformat anzeigen zu lassen und dabei die Groß- und Kleinschreibung zu " "ignorieren, könnten Sie <userinput>svn diff --diff-cmd /usr/bin/diff --" "extensions '-i' foo.c</userinput> aufrufen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:974 msgid "Undoing Working Changes" msgstr "Zurücknehmen von Änderungen in der Arbeitskopie" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:977 msgid "" "Suppose while viewing the output of <command>svn diff</command> you " "determine that all the changes you made to a particular file are mistakes. " "Maybe you shouldn't have changed the file at all, or perhaps it would be " "easier to make different changes starting from scratch." msgstr "" "Angenommen, Sie stellen beim Ansehen der Ausgabe von <command>svn diff</" "command> fest, dass alle Änderungen, die Sie an einer bestimmten Datei " "gemacht haben, fehlerhaft waren. Vielleicht hätten Sie die Datei überhaupt " "nicht ändern sollen, oder es wäre einfacher, von Anfang an unterschiedliche " "Änderungen zu machen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:983 msgid "This is a perfect opportunity to use <command>svn revert</command>:" msgstr "" "Dies ist die perfekte Gelegenheit, <command>svn revert</command> zu benutzen:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:986 #, no-wrap msgid "" "\n" "$ svn revert README\n" "Reverted 'README'\n" msgstr "" "\n" "$ svn revert README\n" "Reverted 'README'\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:991 msgid "" "Subversion reverts the file to its premodified state by overwriting it with " "the cached <quote>pristine</quote> copy from the <filename>.svn</filename> " "area. But also note that <command>svn revert</command> can undo " "<emphasis>any</emphasis> scheduled operations—for example, you might " "decide that you don't want to add a new file after all:" msgstr "" "Subversion stellt die Datei wieder so her, wie sie vor der Änderung war, " "indem sie mit der <quote>unveränderten</quote> Kopie aus dem Cache im " "<filename>.svn</filename>-Bereich überschrieben wird. Beachten Sie aber " "auch, dass <command>svn revert</command> <emphasis>jegliche</emphasis> " "vorgemerkten Operationen rückgängig machen kann – z.B. könnten Sie " "sich entscheiden, eine neue Datei erst gar nicht hinzufügen zu wollen:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:999 #, no-wrap msgid "" "\n" "$ svn status foo\n" "? foo\n" "\n" "$ svn add foo\n" "A foo\n" "\n" "$ svn revert foo\n" "Reverted 'foo'\n" "\n" "$ svn status foo\n" "? foo\n" msgstr "" "\n" "$ svn status foo\n" "? foo\n" "\n" "$ svn add foo\n" "A foo\n" "\n" "$ svn revert foo\n" "Reverted 'foo'\n" "\n" "$ svn status foo\n" "? foo\n" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch02-basic-usage.xml:1014 msgid "" "<userinput>svn revert <replaceable>item</replaceable></userinput> has " "exactly the same effect as deleting <replaceable>item</replaceable> from " "your working copy and then running <userinput>svn update -r BASE " "<replaceable>item</replaceable></userinput>. However, if you're reverting a " "file, <command>svn revert</command> has one very noticeable difference—" "it doesn't have to communicate with the repository to restore your file." msgstr "" "<userinput>svn revert <replaceable>item</replaceable></userinput> hat genau " "denselben Effekt, wie <replaceable>item</replaceable> aus der Arbeitskopie " "zu löschen und dann <command>svn update -r BASE</command> <replaceable>item</" "replaceable> aufzurufen. Allerdings hat <command>svn revert</command> beim " "Rückgängigmachen einer Datei einen merklichen Unterschied – es muss " "beim Wiederherstellen der Datei nicht Verbindung mit dem Repository " "aufnehmen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1024 msgid "Or perhaps you mistakenly removed a file from version control:" msgstr "" "Oder vielleicht haben Sie die Datei versehentlich aus der Versionsverwaltung " "gelöscht:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1027 #, no-wrap msgid "" "\n" "$ svn status README\n" "\n" "$ svn delete README\n" "D README\n" "\n" "$ svn revert README\n" "Reverted 'README'\n" "\n" "$ svn status README\n" msgstr "" "\n" "$ svn status README\n" "\n" "$ svn delete README\n" "D README\n" "\n" "$ svn revert README\n" "Reverted 'README'\n" "\n" "$ svn status README\n" "\n" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:1043 msgid "Resolve Conflicts (Merging Others' Changes)" msgstr "Konflikte auflösen (Änderungen anderer einarbeiten)" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1045 msgid "" "We've already seen how <userinput>svn status -u</userinput> can predict " "conflicts. Suppose you run <userinput>svn update</userinput> and some " "interesting things occur:" msgstr "" "Wir haben bereits gesehen, wie <userinput>svn status -u</userinput> " "Konflikte vorhersagen kann. Angenommen, Sie starten <command>svn update</" "command> und einige interessante Dinge passieren:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1049 #, no-wrap msgid "" "\n" "$ svn update\n" "U INSTALL\n" "G README\n" "Conflict discovered in 'bar.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options:\n" msgstr "" "\n" "$ svn update\n" "U INSTALL\n" "G README\n" "Conflict discovered in 'bar.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options:\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1058 msgid "" "The <computeroutput>U</computeroutput> and <computeroutput>G</" "computeroutput> codes are no cause for concern; those files cleanly absorbed " "changes from the repository. The files marked with <computeroutput>U</" "computeroutput> contained no local changes but were <computeroutput>U</" "computeroutput>pdated with changes from the repository. The " "<computeroutput>G</computeroutput> stands for mer<computeroutput>G</" "computeroutput>ed, which means that the file had local changes to begin " "with, but the changes coming from the repository didn't overlap with the " "local changes." msgstr "" "Die Codes <computeroutput>U</computeroutput> und <computeroutput>G</" "computeroutput> sind kein Grund zur Beunruhigung; diese Dateien haben die " "Änderungen aus dem Repository sauber aufgenommen. Die mit <computeroutput>U</" "computeroutput> markierten Dateien enthielten keine lokalen Änderungen, " "wurden jedoch mit Änderungen aus dem Repository ge<computeroutput>U</" "computeroutput>pdatet. Das <computeroutput>G</computeroutput> steht für " "mer<computeroutput>G</computeroutput>ed, was bedeutet, dass die Datei zwar " "lokale Änderungen enthielt, die Änderungen aus dem Repository sich aber " "nicht damit überschnitten haben." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1070 msgid "" "But the next two lines are part of a feature (new in Subversion 1.5) called " "<firstterm>interactive conflict resolution</firstterm>. This means that the " "changes from the server overlapped with your own, and you have the " "opportunity to resolve this conflict. The most commonly used options are " "displayed, but you can see all of the options by typing <replaceable>h</" "replaceable>:" msgstr "" "Die nächsten beiden Zeilen jedoch sind Teil eines Features (neu in " "Subversion 1.5) namens <firstterm>interaktive Konfliktauflösung</firstterm>. " "Das bedeutet, dass die Änderungen vom Server sich mit Ihren eigenen " "überschneiden, uns Sie nun die Gelegenheit haben, den Konflikt aufzulösen. " "Die gebräuchlichsten Optionen werden angezeigt, aber alle Optionen können " "sie sehen, wenn Sie <replaceable>h</replaceable> eintippen:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1078 #, no-wrap msgid "" "\n" "…\n" " (p) postpone - mark the conflict to be resolved later\n" " (df) diff-full - show all changes made to merged file\n" " (e) edit - change merged file in an editor\n" " (r) resolved - accept merged version of file\n" " (mf) mine-full - accept my version of entire file (ignore their changes)\n" " (tf) theirs-full - accept their version of entire file (lose my changes)\n" " (l) launch - launch external tool to resolve conflict\n" " (h) help - show this list\n" msgstr "" "\n" "…\n" " (p) postpone - mark the conflict to be resolved later\n" " (df) diff-full - show all changes made to merged file\n" " (e) edit - change merged file in an editor\n" " (r) resolved - accept merged version of file\n" " (mf) mine-full - accept my version of entire file (ignore their changes)\n" " (tf) theirs-full - accept their version of entire file (lose my changes)\n" " (l) launch - launch external tool to resolve conflict\n" " (h) help - show this list\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1090 msgid "" "Let's briefly review each of these options before we go into detail on what " "each option means." msgstr "" "Bevor wir im Detail erklären, was jede Option bedeutet, gehen wir noch mal " "eben die Optionen durch." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1095 msgid "(<computeroutput>p</computeroutput>)ostpone" msgstr "(<computeroutput>p</computeroutput>)ostpone" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1098 msgid "" "Leave the file in a conflicted state for you to resolve after your update is " "complete." msgstr "" "Die Datei im Konfliktzustand lassen, um nach Abschluss der Aktualisierung " "die Konfliktauflösung durchzuführen." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1107 msgid "(<computeroutput>d</computeroutput>)iff" msgstr "(<computeroutput>d</computeroutput>)iff" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1110 msgid "" "Display the differences between the base revision and the conflicted file " "itself in unified diff format." msgstr "" "Die Unterschiede zwischen der Basisrevision und der Konfliktdatei im unified-" "diff-Format anzeigen." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1118 msgid "(<computeroutput>e</computeroutput>)dit" msgstr "(<computeroutput>e</computeroutput>)dit" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1121 msgid "" "Open the file in conflict with your favorite editor, as set in the " "environment variable <literal>EDITOR</literal>." msgstr "" "Die Konfliktdatei im bevorzugten Editor, wie in der Umgebungsvariablen " "<literal>EDITOR</literal> angegeben, öffnen." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1130 msgid "(<computeroutput>r</computeroutput>)esolved" msgstr "(<computeroutput>r</computeroutput>)esolved" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1133 msgid "" "After editing a file, tell <command>svn</command> that you've resolved the " "conflicts in the file and that it should accept the current contents—" "basically that you've <quote>resolved</quote> the conflict." msgstr "" "Nach dem Bearbeiten einer Datei teilen Sie <command>svn</command> mit, dass " "Sie die Konflikte in der Datei aufgelöst haben und der aktuelle Inhalt " "übernommen werden soll." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1143 msgid "" "(<computeroutput>m</computeroutput>)ine-(<computeroutput>f</computeroutput>)" "ull" msgstr "" "(<computeroutput>m</computeroutput>)ine-(<computeroutput>f</computeroutput>)" "ull" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1146 msgid "" "Discard the newly received changes from the server and use only your local " "changes for the file under review." msgstr "" "Die neuen vom Server erhaltenen Änderungen verwerfen und nur Ihre lokalen " "Änderungen an der zu überprüfenden Datei verwenden." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1153 msgid "" "(<computeroutput>t</computeroutput>)heirs-(<computeroutput>f</" "computeroutput>)ull" msgstr "" "(<computeroutput>t</computeroutput>)heirs-(<computeroutput>f</" "computeroutput>)ull" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1156 msgid "" "Discard your local changes to the file under review and use only the newly " "received changes from the server." msgstr "" "Ihre lokalen Änderungen an der zu überprüfenden Datei verwerfen und nur die " "neuen vom Server erhaltenen Änderungen verwenden." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1164 msgid "(<computeroutput>l</computeroutput>)aunch" msgstr "(<computeroutput>l</computeroutput>)aunch" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1167 msgid "" "Launch an external program to perform the conflict resolution. This " "requires a bit of preparation beforehand." msgstr "" "Ein externes Programm zur Konfliktauflösung starten. Das setzt " "Vorbereitungen voraus." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1175 msgid "(<computeroutput>h</computeroutput>)elp" msgstr "(<computeroutput>h</computeroutput>)elp" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1178 msgid "" "Show the list of all possible commands you can use in interactive conflict " "resolution." msgstr "" "Die Liste aller bei der interaktiven Konfliktauflösung möglichen Befehle " "anzeigen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1186 msgid "" "We'll cover these commands in more detail now, grouping them together by " "related functionality." msgstr "" "Wir werden diese Befehle nun detaillierter behandeln, wobei sie nach " "Funktionalität gruppiert werden." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1193 msgid "Viewing conflict differences interactively" msgstr "Interaktive Begutachtung der Konflikte" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1195 msgid "" "Before deciding how to attack a conflict interactively, odds are that you'd " "like to see exactly what is in conflict, and the <firstterm>diff</firstterm> " "command (<userinput>d</userinput>) is what you'll use for this:" msgstr "" "Bevor Sie entscheiden, wie Sie einen Konflikt beseitigen wollen, wollen Sie " "wahrscheinlich genau sehen, worin der Konflikt besteht, und benutzen hierfür " "den Befehl <firstterm>diff</firstterm> (<userinput>d</userinput>):" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1200 #, no-wrap msgid "" "\n" "…\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h)elp for more options : d\n" "--- .svn/text-base/sandwich.txt.svn-base Tue Dec 11 21:33:57 2007\n" "+++ .svn/tmp/tempfile.32.tmp Tue Dec 11 21:34:33 2007\n" "@@ -1 +1,5 @@\n" "-Just buy a sandwich.\n" "+<<<<<<< .mine\n" "+Go pick up a cheesesteak.\n" "+=======\n" "+Bring me a taco!\n" "+>>>>>>> .r32\n" "…\n" msgstr "" "\n" "…\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h)elp for more options : d\n" "--- .svn/text-base/sandwich.txt.svn-base Tue Dec 11 21:33:57 2007\n" "+++ .svn/tmp/tempfile.32.tmp Tue Dec 11 21:34:33 2007\n" "@@ -1 +1,5 @@\n" "-Just buy a sandwich.\n" "+<<<<<<< .mine\n" "+Go pick up a cheesesteak.\n" "+=======\n" "+Bring me a taco!\n" "+>>>>>>> .r32\n" "…\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1216 msgid "" "The first line of the diff content shows the previous contents of the " "working copy (the <literal>BASE</literal> revision), the next content line " "is your change, and the last content line is the change that was just " "received from the server (<emphasis>usually</emphasis> the <literal>HEAD</" "literal> revision). With this information in hand, you're ready to move on " "to the next action." msgstr "" "Die erste Zeile des diff-Inhalts zeigt den vorherigen Inhalt der " "Arbeitskopie (die <literal>BASE</literal>-Revision), die nächste Zeile " "beinhaltet Ihre Änderung und die letzte Zeile ist die Änderung, die soeben " "vom Server empfangen worden ist (<emphasis>gewöhnlich</emphasis> die " "<literal>HEAD</literal>-Revision). Mit diesen Informationen sind Sie bereit " "für den nächsten Schritt." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1229 msgid "Resolving conflict differences interactively" msgstr "Interaktive Konfliktauflösung" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1231 msgid "" "There are four different ways to resolve conflicts interactively—two " "of which allow you to selectively merge and edit changes, and two of which " "allow you to simply pick a version of the file and move along." msgstr "" "Es gibt vier verschiedene Wege, um Konflikte interaktiv aufzulösen – " "von denen Ihnen zwei erlauben, Änderungen selektiv zusammenzuführen und zu " "editieren und zwei, die es Ihnen erlauben, einfach eine Version der Datei " "auszuwählen und weiterzumachen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1236 msgid "" "If you wish to choose some combination of your local changes, you can use " "the <quote>edit</quote> command (<userinput>e</userinput>) to manually edit " "the file with conflict markers in a text editor (determined by the " "<literal>EDITOR</literal> environment variable). Editing the file by hand " "in your favorite text editor is a somewhat low-tech way of remedying " "conflicts (see <xref linkend=\"svn.tour.cycle.resolve.byhand\"/> for a " "walkthrough), so some people like to use fancy graphical merge tools instead." msgstr "" "Falls Sie eine beliebige Kombination Ihrer lokalen Änderungen auswählen " "wollen, können Sie den <quote>edit</quote>-Befehl (<userinput>e</" "userinput>) verwenden, um die Datei mit den Konfliktmarken manuell in einem " "Texteditor (der durch die Umgebungsvariable <literal>EDITOR</literal> " "bestimmt wird) zu bearbeiten. Die Datei händisch in Ihrem Lieblingseditor zu " "bearbeiten ist eine Art Konflikte zu beseitigen, die sich einer ziemlich " "schlichten Technik bedient (siehe <xref linkend=\"svn.tour.cycle.resolve." "byhand\"/> für einen Beispieldurchgang), so dass manche Leute lieber feinste " "Merge-Tools benutzen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1247 msgid "" "To use a merge tool, you need to either set the <literal>SVN_MERGE</literal> " "environment variable or define the <literal>merge-tool-cmd</literal> option " "in your Subversion configuration file (see <xref linkend=\"svn.advanced." "confarea.opts\"/> for more details). Subversion will pass four arguments to " "the merge tool: the <literal>BASE</literal> revision of the file, the " "revision of the file received from the server as part of the update, the " "copy of the file containing your local edits, and the merged copy of the " "file (which contains conflict markers). If your merge tool is expecting " "arguments in a different order or format, you'll need to write a wrapper " "script for Subversion to invoke. After you've edited the file, if you're " "satisfied with the changes you've made, you can tell Subversion that the " "edited file is no longer in conflict by using the <quote>resolve</quote> " "command (<literal>r</literal>)." msgstr "" "Um ein Merge-Tool benutzen zu können, müssen Sie entweder die " "Umgebungsvariable <literal>SVN_MERGE</literal> setzen oder die " "<literal>merge-tool-cmd</literal>-Option in Ihrer Subversion-" "Konfigurationsdatei definieren (siehe <xref linkend=\"svn.advanced.confarea." "opts\"/> für weitere Details). Subversion übergibt vier Argumente an das " "Merge-Tool: die <literal>BASE</literal>-Revision der Datei, die " "Dateirevision, die durch die Aktualisierung vom Server empfangen wurde, die " "Dateirevision, die Ihre lokale Bearbeitung beinhaltet und die " "zusammengeführte Kopie der Datei (die Konfliktmarken enthält). Falls Ihr " "Merge-Tool die Argumente in einer anderen Reihenfolge oder in einem anderen " "Format erwartet, werden Sie ein Wrapper-Script schreiben müssen, das von " "Subversion aufgerufen wird. Nachdem Sie die Datei bearbeitet haben und " "zufrieden mit Ihren Änderungen sind, können Sie Subversion mitteilen, dass " "für die bearbeitete Datei kein Konflikt mehr besteht, indem sie den " "<quote>resolve</quote>-Befehl (<literal>r</literal>) benutzen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1268 msgid "" "If you decide that you don't need to merge any changes, but just want to " "accept one version of the file or the other, you can either choose your " "changes (a.k.a. <quote>mine</quote>) by using the <quote>mine-full</quote> " "command (<userinput>mf</userinput>) or choose theirs by using the " "<quote>theirs-full</quote> command (<userinput>tf</userinput>)." msgstr "" "Falls Sie entscheiden, dass Sie keine Änderungen zusammenführen brauchen, " "sondern lediglich eine der beiden Dateiversionen akzeptieren wollen, können " "Sie entweder Ihre Änderungen (auch <quote>meine</quote>) mit dem <quote>mine-" "full</quote>-Befehl (<userinput>mf</userinput>) oder die der Anderen mit " "dem <quote>theirs-full</quote>-Befehl (<userinput>tf</userinput>) auswählen." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1281 msgid "Postponing conflict resolution" msgstr "Aufschieben der Konfliktauflösung" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1283 msgid "" "This may sound like an appropriate section for avoiding marital " "disagreements, but it's actually still about Subversion, so read on. If " "you're doing an update and encounter a conflict that you're not prepared to " "review or resolve, you can type <userinput>p</userinput> to postpone " "resolving a conflict on a file-by-file basis when you run <userinput>svn " "update</userinput>. If you're running an update and don't want to resolve " "any conflicts, you can pass the <option>--non-interactive</option> option to " "<command>svn update</command>, and any file in conflict will be marked with " "a <computeroutput>C</computeroutput> automatically." msgstr "" "Das hört sich vielleicht an wie ein passender Abschnitt zur Vermeidung von " "Ehestreitigkeiten, doch es geht immer noch um Subversion; also lesen Sie " "weiter. Falls Sie eine Aktualisierung vornehmen und ein Konflikt auftaucht, " "den Sie nicht begutachten oder auflösen können, ermöglicht Ihnen das " "Eingeben von <userinput>p</userinput> die Konfliktauflösung Datei für Datei " "aufzuschieben, wenn Sie <userinput>svn update</userinput> aufrufen. Falls " "Sie aktualisieren wollen, ohne Konflikte aufzulösen, können Sie die " "<option>--non-interactive</option>-Option an <command>svn update</command> " "übergeben, und jede Datei mit Konflikten wird automatisch mit einem " "<computeroutput>C</computeroutput> gekennzeichnet." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1296 msgid "" "The <computeroutput>C</computeroutput> stands for <computeroutput>c</" "computeroutput>onflict. This means that the changes from the server " "overlapped with your own, and now you have to manually choose between them " "after the update has completed. When you postpone a conflict resolution, " "<command>svn</command> typically does three things to assist you in noticing " "and resolving that conflict:" msgstr "" "Das <computeroutput>C</computeroutput> bedeutet <computeroutput>c</" "computeroutput>onflict. Das heißt, dass die Änderungen vom Server sich mit " "Ihren eigenen überschneiden, und Sie nach Abschluss der Aktualisierung " "manuell aus den Änderungen wählen müssen. Wenn Sie eine Konfliktauflösung " "verschieben, macht <command>svn</command> typischerweise drei Dinge, um " "Ihnen bei der Konfliktauflösung zu helfen:" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1308 msgid "" "Subversion prints a <computeroutput>C</computeroutput> during the update and " "remembers that the file is in a state of conflict." msgstr "" "Subversion gibt ein <computeroutput>C</computeroutput> während der " "Aktualisierung aus und merkt sich, dass die Datei in einem Konfliktzustand " "ist." # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1314 msgid "" "If Subversion considers the file to be mergeable, it places " "<firstterm>conflict markers</firstterm>—special strings of text that " "delimit the <quote>sides</quote> of the conflict—into the file to " "visibly demonstrate the overlapping areas. (Subversion uses the " "<literal>svn:mime-type</literal> property to decide whether a file is " "capable of contextual, line-based merging. See <xref linkend=\"svn.advanced." "props.special.mime-type\"/> to learn more.)" msgstr "" "Falls Subversion die Datei als geeignet zum Zusammenführen ansieht, fügt es " "<firstterm>Konfliktmarken</firstterm> – besondere Zeichenketten, die " "die Konfliktregion begrenzen – in die Datei ein, um die überlappenden " "Bereiche besonders hervorzuheben. (Subversion verwendet das <literal>svn:" "mime-type</literal>-Property, um festzustellen, ob sich die Datei " "kontextuell zeilenweise zusammenführen lässt. Siehe <xref linkend=\"svn." "advanced.props.special.mime-type\"/>, um mehr zu erfahren.)" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1327 msgid "" "For every conflicted file, Subversion places three extra unversioned files " "in your working copy:" msgstr "" "Für jede Datei mit Konflikten stellt Subversion drei zusätzliche " "unversionierte Dateien in Ihre Arbeitskopie:" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1333 msgid "<filename>filename.mine</filename>" msgstr "<filename>filename.mine</filename>" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1335 msgid "" "This is your file as it existed in your working copy before you updated your " "working copy—that is, without conflict markers. This file has only " "your latest changes in it. (If Subversion considers the file to be " "unmergeable, the <filename>.mine</filename> file isn't created, since it " "would be identical to the working file.)" msgstr "" "Dies ist Ihre Datei aus der Arbeitskopie bevor Sie aktualisierten – d." "h. ohne Konfliktmarken. Diese Datei beinhaltet nur Ihre letzten Änderungen. " "(Falls Subversion diese Datei als nicht-zusammenführbar erachtet, wird die " "<filename>.mine</filename>-Datei nicht erstellt, da sie identisch mit der " "Datei der Arbeitskopie wäre.)" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1346 msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1349 msgid "" "This is the file that was the <literal>BASE</literal> revision before you " "updated your working copy. That is, the file that you checked out before " "you made your latest edits." msgstr "" "Dies ist die Datei, die die <literal>BASE</literal>-Revision war bevor Sie " "Ihre Arbeitskopie aktualisiert haben; also die Datei, die Sie ausgecheckt " "hatten, bevor Sie Ihre letzten Änderungen machten." # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1358 msgid "<filename>filename.r<replaceable>NEWREV</replaceable> </filename>" msgstr "<filename>filename.r<replaceable>NEWREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1361 msgid "" "This is the file that your Subversion client just received from the server " "when you updated your working copy. This file corresponds to the " "<literal>HEAD</literal> revision of the repository." msgstr "" "Dies ist die Datei, die Ihr Subversion-Client soeben vom Server erhalten hat " "als Sie Ihre Arbeitskopie aktualisierten. Diese Datei entspricht der " "<literal>HEAD</literal>-Revision des Repositorys." # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1371 msgid "" "Here <replaceable>OLDREV</replaceable> is the revision number of the file in " "your <filename>.svn</filename> directory, and <replaceable>NEWREV</" "replaceable> is the revision number of the repository <literal>HEAD</" "literal>." msgstr "" "Hierbei ist <replaceable>OLDREV</replaceable> die Revisionsnummer der Datei " "in Ihrem Verzeichnis <filename>.svn</filename>, und <replaceable>NEWREV</" "replaceable> ist die Revisionsnummer von <literal>HEAD</literal> im " "Repository." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1379 msgid "" "For example, Sally makes changes to the file <filename>sandwich.txt</" "filename> in the repository. Harry has just changed the file in his working " "copy and checked it in. Sally updates her working copy before checking in " "and she gets a conflict, which she postpones:" msgstr "" "Beispielsweise ändert Sally die Datei <filename>sandwich.txt</filename> aus " "dem Repository. Harry hat gerade diese Datei in seiner Arbeitskopie geändert " "und eingecheckt. Sally aktualisiert Ihre Arbeitskopie vor dem einchecken und " "bekommt einen Konflikt, den sie verschiebt:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1385 #, no-wrap msgid "" "\n" "$ svn update\n" "Conflict discovered in 'sandwich.txt'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h)elp for more options : p\n" "C sandwich.txt\n" "Updated to revision 2.\n" "$ ls -1\n" "sandwich.txt\n" "sandwich.txt.mine\n" "sandwich.txt.r1\n" "sandwich.txt.r2\n" msgstr "" "\n" "$ svn update\n" "Conflict discovered in 'sandwich.txt'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h)elp for more options : p\n" "C sandwich.txt\n" "Updated to revision 2.\n" "$ ls -1\n" "sandwich.txt\n" "sandwich.txt.mine\n" "sandwich.txt.r1\n" "sandwich.txt.r2\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1399 msgid "" "At this point, Subversion will <emphasis>not</emphasis> allow Sally to " "commit the file <filename>sandwich.txt</filename> until the three temporary " "files are removed:" msgstr "" "An dieser Stelle erlaubt Subversion Sally <emphasis>nicht</emphasis>, die " "Datei <filename>sandwich.txt</filename> an das Repository zu übergeben, " "solange die drei temporären Dateien nicht entfernt werden:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1404 #, no-wrap msgid "" "\n" "$ svn commit -m \"Add a few more things\"\n" "svn: Commit failed (details follow):\n" "svn: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains in conflict\n" msgstr "" "\n" "$ svn commit -m \"Add a few more things\"\n" "svn: Commit failed (details follow):\n" "svn: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains in conflict\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1410 msgid "" "If you've postponed a conflict, you need to resolve the conflict before " "Subversion will allow you to commit your changes. You'll do this with the " "<command>svn resolve</command> command and one of several arguments to the " "<option>--accept</option> option." msgstr "" "Falls Sie eine Konfliktauflösung aufgeschoben haben, müssen Sie den Konflikt " "auflösen, bevor Ihnen Subversion erlaubt, Ihre Änderungen in das Repository " "einzustellen. Sie werden dafür den <command>svn resolve</command>-Befehl mit " "einem von mehreren Argumenten für die <option>--accept</option>-Option " "aufrufen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1416 msgid "" "If you want to choose the version of the file that you last checked out " "before making your edits, choose the <replaceable>base</replaceable> " "argument." msgstr "" "Falls Sie die Dateiversion vor Ihren Änderungen haben möchten, wählen Sie " "das <replaceable>base</replaceable>-Argument." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1420 msgid "" "If you want to choose the version that contains only your edits, choose the " "<replaceable>mine-full</replaceable> argument." msgstr "" "Falls Sie die Version möchten, die nur Ihre Änderungen enthält, wählen Sie " "das <replaceable>mine-full</replaceable>-Argument." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1424 msgid "" "If you want to choose the version that your most recent update pulled from " "the server (and thus discarding your edits entirely), choose the " "<replaceable>theirs-full</replaceable> argument." msgstr "" "Falls Sie die Version möchten, die Ihre letzte Aktualisierung vom Server " "gezogen hat (und somit Ihre Änderungen vollständig verwerfen wollen), wählen " "Sie das Argument <replaceable>theirs-full</replaceable>." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1429 msgid "" "However, if you want to pick and choose from your changes and the changes " "that your update fetched from the server, merge the conflicted text " "<quote>by hand</quote> (by examining and editing the conflict markers within " "the file) and then choose the <replaceable>working</replaceable> argument." msgstr "" "Wenn Sie jedoch frei aus Ihren Änderungen und den Änderungen vom Server " "wählen möchten, führen Sie den konfliktbehafteten Text <quote>händisch</" "quote> zusammen (indem Sie die Konfliktmarken in der Datei begutachten und " "editieren) und wählen das <replaceable>working</replaceable>-Argument." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1436 msgid "" "<command>svn resolve</command> removes the three temporary files and accepts " "the version of the file that you specified with the <option>--accept</" "option> option, and Subversion no longer considers the file to be in a state " "of conflict:" msgstr "" "<command>svn resolve</command> entfernt die drei temporären Dateien und " "akzeptiert die Version, die Sie mit der <option>--accept</option>-Option " "angeben. Subversion betrachtet die Datei nun als nicht mehr konfliktbehaftet:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1442 #, no-wrap msgid "" "\n" "$ svn resolve --accept working sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" msgstr "" "\n" "$ svn resolve --accept working sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1451 msgid "Merging conflicts by hand" msgstr "Manuelle Konfliktauflösung" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1453 msgid "" "Merging conflicts by hand can be quite intimidating the first time you " "attempt it, but with a little practice, it can become as easy as falling off " "a bike." msgstr "" "Das manuelle Auflösen von Konflikten kann ganz schön einschüchternd sein, " "wenn Sie es das erste Mal versuchen; jedoch kann es mit etwas Übung so " "leicht werden, wie vom Fahrrad zu fallen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1457 msgid "" "Here's an example. Due to a miscommunication, you and Sally, your " "collaborator, both edit the file <filename>sandwich.txt</filename> at the " "same time. Sally commits her changes, and when you go to update your " "working copy, you get a conflict and you're going to have to edit " "<filename>sandwich.txt</filename> to resolve the conflict. First, let's " "take a look at the file:" msgstr "" "Hier ist ein Beispiel. Aufgrund einer schlechten Absprache bearbeiten Sie " "und Ihre Mitarbeiterin Sally gleichzeitig die Datei <filename>sandwich.txt</" "filename>. Sally übergibt ihre Änderungen an das Repository, und sobald Sie " "versuchen, Ihre Arbeitskopie zu aktualisieren, erhalten Sie einen Konflikt " "und müssen <filename>sandwich.txt</filename> bearbeiten, um den Konflikt " "aufzulösen. Zunächst wollen wir uns die Datei einmal ansehen:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1465 #, no-wrap msgid "" "\n" "$ cat sandwich.txt\n" "Top piece of bread\n" "Mayonnaise\n" "Lettuce\n" "Tomato\n" "Provolone\n" "<<<<<<< .mine\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "=======\n" "Sauerkraut\n" "Grilled Chicken\n" ">>>>>>> .r2\n" "Creole Mustard\n" "Bottom piece of bread\n" msgstr "" "\n" "$ cat sandwich.txt\n" "Top piece of bread\n" "Mayonnaise\n" "Lettuce\n" "Tomato\n" "Provolone\n" "<<<<<<< .mine\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "=======\n" "Sauerkraut\n" "Grilled Chicken\n" ">>>>>>> .r2\n" "Creole Mustard\n" "Bottom piece of bread\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1484 msgid "" "The strings of less-than signs, equals signs, and greater-than signs are " "conflict markers and are not part of the actual data in conflict. You " "generally want to ensure that those are removed from the file before your " "next commit. The text between the first two sets of markers is composed of " "the changes you made in the conflicting area:" msgstr "" "Die Zeichenketten aus Kleiner-als-Zeichen, Gleichheitszeichen und Größer-als-" "Zeichen sind Konfliktmarken und gehören nicht zu den eigentlichen Daten, die " "in Konflikt stehen. Im Allgemeinen werden Sie sicherstellen wollen, dass die " "Konflikte aus der Datei entfernt werden, bevor sie das nächste Mal einen " "Commit durchführen. Der Text zwischen den ersten beiden Marken besteht aus " "den Änderungen, die Sie im Konfliktbereich vorgenommen haben:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1492 #, no-wrap msgid "" "\n" "<<<<<<< .mine\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "=======\n" msgstr "" "\n" "<<<<<<< .mine\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "=======\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1500 msgid "" "The text between the second and third sets of conflict markers is the text " "from Sally's commit:" msgstr "" "Der Text zwischen der zweiten und der dritten Marke ist der Text aus Sallys " "Commit:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1503 #, no-wrap msgid "" "\n" "=======\n" "Sauerkraut\n" "Grilled Chicken\n" ">>>>>>> .r2\n" msgstr "" "\n" "=======\n" "Sauerkraut\n" "Grilled Chicken\n" ">>>>>>> .r2\n" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch02-basic-usage.xml:1510 msgid "" "Usually you won't want to just delete the conflict markers and Sally's " "changes—she's going to be awfully surprised when the sandwich arrives " "and it's not what she wanted. This is where you pick up the phone or walk " "across the office and explain to Sally that you can't get sauerkraut from an " "Italian deli. <footnote>" msgstr "" "Für gewöhnlich werden Sie nicht einfach die Konfliktmarken mitsamt der " "Änderungen von Sally löschen wollen – sie wird furchtbar überrascht " "sein, wenn das Sandwich kommt und nicht das drauf ist, was sie wollte. Hier " "ist der Zeipunkt gekommen, zu dem Sie zum Telefon greifen oder durch das " "Büro gehen und Sally erklären, dass man in einem italienischen " "Delikatessenladen kein Sauerkraut bekommt. <footnote>" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch02-basic-usage.xml:1517 msgid "" "And if you ask them for it, they may very well ride you out of town on a " "rail." msgstr "" "Und wenn Sie danach fragen, wird man Sie wahrscheinlich auf einer Schiene " "aus der Stadt tragen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1519 msgid "" "</footnote> Once you've agreed on the changes you will check in, edit your " "file and remove the conflict markers:" msgstr "" "</footnote> Sobald Sie sich über die einzucheckenden Änderungen einig sind, " "können Sie Ihre Datei bearbeiten und die Konfliktmarken entfernen:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1523 #, no-wrap msgid "" "\n" "Top piece of bread\n" "Mayonnaise\n" "Lettuce\n" "Tomato\n" "Provolone\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "Creole Mustard\n" "Bottom piece of bread\n" msgstr "" "\n" "Top piece of bread\n" "Mayonnaise\n" "Lettuce\n" "Tomato\n" "Provolone\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "Creole Mustard\n" "Bottom piece of bread\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1536 msgid "" "Now use <command>svn resolve</command>, and you're ready to commit your " "changes:" msgstr "" "Verwenden Sie jetzt <command>svn resolve</command>, und Sie sind bereit, " "Ihre Änderungen an das repository zu übergeben:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1539 #, no-wrap msgid "" "\n" "$ svn resolve --accept working sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" "$ svn commit -m \"Go ahead and use my sandwich, discarding Sally's edits.\"\n" msgstr "" "\n" "$ svn resolve --accept working sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" "$ svn commit -m \"Go ahead and use my sandwich, discarding Sally's edits.\"\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1545 msgid "" "Note that <command>svn resolve</command>, unlike most of the other commands " "we deal with in this chapter, requires that you explicitly list any " "filenames that you wish to resolve. In any case, you want to be careful and " "use <command>svn resolve</command> only when you're certain that you've " "fixed the conflict in your file—once the temporary files are removed, " "Subversion will let you commit the file even if it still contains conflict " "markers." msgstr "" "Beachten Sie, dass <command>svn resolve</command>, anders als die meisten " "anderen Befehle, die wir in diesem Kapitel behandeln, erwartet, dass Sie " "ausdrücklich alle Dateien aufzählen, deren Konflikt Sie beseitigt haben. Auf " "alle Fälle sollten Sie sorgfältig vorgehen und <command>svn resolve</" "command> nur verwenden, falls Sie sicher sind, den Konflikt in Ihrer Datei " "beseitigt zu haben – sobald die temporären Dateien entfernt sind, " "lässt Subversion zu, dass Sie die Datei in das Repository stellen, selbst " "wenn sie noch Konfliktmarken enthält." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1554 msgid "" "If you ever get confused while editing the conflicted file, you can always " "consult the three files that Subversion creates for you in your working " "copy—including your file as it was before you updated. You can even " "use a third-party interactive merging tool to examine those three files." msgstr "" "Falls Sie mal bei der Bearbeitung der konfliktbehafteten Datei verwirrt sein " "sollten, können Sie jederzeit in den drei Dateien nachsehen, die Subversion " "für Sie in der Arbeitskopie bereitstellt – dazu gehört auch Ihre Datei " "vor der Aktualisierung. Sie können sogar ein Merge-Tool eines Drittanbieters " "verwenden, um diese drei Dateien zu untersuchen." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1565 msgid "Discarding your changes in favor of a newly fetched revision" msgstr "" "Verwerfen Ihrer Änderungen zugunsten einer aktualisierten Revision aus dem " "Repository" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1567 msgid "" "If you get a conflict and decide that you want to throw out your changes, " "you can run <userinput>svn resolve --accept theirs-full " "<replaceable>CONFLICTED-PATH</replaceable></userinput> and Subversion will " "discard your edits and remove the temporary files:" msgstr "" "Falls Sie einen Konflikt erhalten und entscheiden, dass Sie Ihre Änderungen " "verwerfen wollen, können Sie <userinput>svn resolve --accept theirs-full " "<replaceable>CONFLICTED-PATH</replaceable></userinput> aufrufen, und " "Subversion wird Ihre Änderungen ignorieren und die temporären Dateien " "entfernen:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1572 #, no-wrap msgid "" "\n" "$ svn update\n" "Conflict discovered in 'sandwich.txt'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options: p\n" "C sandwich.txt\n" "Updated to revision 2.\n" "$ ls sandwich.*\n" "sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1\n" "$ svn resolve --accept theirs-full sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" msgstr "" "\n" "$ svn update\n" "Conflict discovered in 'sandwich.txt'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options: p\n" "C sandwich.txt\n" "Updated to revision 2.\n" "$ ls sandwich.*\n" "sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1\n" "$ svn resolve --accept theirs-full sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1589 msgid "Punting: Using svn revert" msgstr "Die Verwendung von svn revert" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1591 msgid "" "If you decide that you want to throw out your changes and start your edits " "again (whether this occurs after a conflict or anytime), just revert your " "changes:" msgstr "" "Falls Sie sich entscheiden, Ihre Änderungen zu verwerfen und erneut mit der " "Bearbeitung zu beginnen (ob nach einem Konflikt oder sonst zu jeder Zeit), " "machen Sie einfach Ihre Änderungen rückgängig:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1595 #, no-wrap msgid "" "\n" "$ svn revert sandwich.txt\n" "Reverted 'sandwich.txt'\n" "$ ls sandwich.*\n" "sandwich.txt\n" msgstr "" "\n" "$ svn revert sandwich.txt\n" "Reverted 'sandwich.txt'\n" "$ ls sandwich.*\n" "sandwich.txt\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1602 msgid "" "Note that when you revert a conflicted file, you don't have to use " "<command>svn resolve</command>." msgstr "" "Beachten Sie, dass Sie beim Rückgängigmachen einer konfliktbehafteten Datei " "nicht <command>svn resolve</command> zu verwenden brauchen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:1611 msgid "Commit Your Changes" msgstr "Übergeben Ihrer Änderungen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1613 msgid "" "Finally! Your edits are finished, you've merged all changes from the server, " "and you're ready to commit your changes to the repository." msgstr "" "Endlich! Sie haben die Bearbeitung abgeschlossen, Sie haben alle Änderungen " "vom Server eingearbeitet, und Sie sind bereit, Ihre Änderungen an das " "Repository zu übergeben." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1617 msgid "" "The <command>svn commit</command> command sends all of your changes to the " "repository. When you commit a change, you need to supply a <firstterm>log " "message</firstterm> describing your change. Your log message will be " "attached to the new revision you create. If your log message is brief, you " "may wish to supply it on the command line using the <option>--message</" "option> (or <option>-m</option>) option:" msgstr "" "Der Befehl <command>svn commit</command> schickt all Ihre Änderungen zum " "Repository. Wenn Sie eine Änderung übergeben, müssen Sie einen " "<firstterm>Protokolleintrag</firstterm> erstellen, der die Änderung " "beschreibt. Dieser Eintrag wird mit der von Ihnen erzeugten neuen Revision " "verknüpft. Wenn Ihr Eintrag kurz ist, können Sie ihn mit der Option " "<option>--message</option> (oder <option>-m</option>) in der Kommandozeile " "angeben:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1626 #, no-wrap msgid "" "\n" "$ svn commit -m \"Corrected number of cheese slices.\"\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 3.\n" msgstr "" "\n" "$ svn commit -m \"Corrected number of cheese slices.\"\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 3.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1633 msgid "" "However, if you've been composing your log message as you work, you may want " "to tell Subversion to get the message from a file by passing the filename " "with the <option>--file</option> (<option>-F</option>) option:" msgstr "" "Falls Sie jedoch Ihren Protokolleintrag während der Arbeit erstellen " "möchten, können Sie Subversion mitteilen, sich den Eintrag aus einer Datei " "zu holen, indem Sie den Dateinamen mit der Option <option>--file</option> " "(<option>-F</option>) angeben:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1638 #, no-wrap msgid "" "\n" "$ svn commit -F logmsg\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 4.\n" msgstr "" "\n" "$ svn commit -F logmsg\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 4.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1645 msgid "" "If you fail to specify either the <option>--message</option> or <option>--" "file</option> option, Subversion will automatically launch your favorite " "editor (see the information on <literal>editor-cmd</literal> in <xref " "linkend=\"svn.advanced.confarea.opts.config\"/>) for composing a log message." msgstr "" "Sollten Sie vergessen, entweder die Option <option>--message</option> oder " "die <option>--file</option>-Option anzugeben, startet Subversion automatisch " "Ihren Lieblingseditor (siehe die Information zu <literal>editor-cmd</" "literal> in <xref linkend=\"svn.advanced.confarea.opts.config\"/>), damit " "Sie einen Protokolleintrag erstellen können." # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch02-basic-usage.xml:1653 msgid "" "If you're in your editor writing a commit message and decide that you want " "to cancel your commit, you can just quit your editor without saving " "changes. If you've already saved your commit message, simply delete the " "text, save again, and then abort:" msgstr "" "Wenn Sie gerade in Ihrem Editor einen Eintrag schreiben und sich " "entschließen, die Übergabe abzubrechen, können Sie einfach Ihren Editor " "beenden, ohne die Änderungen zu sichern. Falls Sie den Eintrag bereits " "gesichert haben sollten, löschen Sie einfach den Text, sichern Sie erneut " "und brechen dann ab:" # type: Content of: <chapter><sect1><sect2><tip><screen> #: ../en/book/ch02-basic-usage.xml:1659 #, no-wrap msgid "" "\n" "$ svn commit\n" "Waiting for Emacs...Done\n" "\n" "Log message unchanged or not specified\n" "(a)bort, (c)ontinue, (e)dit\n" "a\n" "$\n" msgstr "" "\n" "$ svn commit\n" "Waiting for Emacs...Done\n" "\n" "Log message unchanged or not specified\n" "(a)bort, (c)ontinue, (e)dit\n" "a\n" "$\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1670 msgid "" "The repository doesn't know or care whether your changes make any sense as a " "whole; it checks only to make sure nobody else has changed any of the same " "files that you did when you weren't looking. If somebody <emphasis>has</" "emphasis> done that, the entire commit will fail with a message informing " "you that one or more of your files are out of date:" msgstr "" "Das Repository weiß nicht, ob Ihre Änderung im Ganzen einen Sinn ergeben, es " "ist ihm auch egal; es überprüft lediglich, ob nicht irgendjemand anderes " "irgendeine derselben Dateien geändert hat wie Sie, als Sie mal weggeschaut " "haben. Falls jemand das gemacht <emphasis>hat</emphasis>, wird die gesamte " "Übergabe mit einer Meldung fehlschlagen, dass eine oder mehrere Ihrer " "Dateien nicht mehr aktuell sind:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1677 #, no-wrap msgid "" "\n" "$ svn commit -m \"Add another rule\"\n" "Sending rules.txt\n" "svn: Commit failed (details follow):\n" "svn: File '/sandwich.txt' is out of date\n" "…\n" msgstr "" "\n" "$ svn commit -m \"Add another rule\"\n" "Sending rules.txt\n" "svn: Commit failed (details follow):\n" "svn: File '/sandwich.txt' is out of date\n" "…\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1685 msgid "" "(The exact wording of this error message depends on the network protocol and " "server you're using, but the idea is the same in all cases.)" msgstr "" "(Der genaue Wortlaut dieser Fehlermeldung hängt vom verwendeten " "Netzwerkprotokoll und vom Server ab, doch die Bedeutung ist in allen Fällen " "gleich.)" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1689 msgid "" "At this point, you need to run <userinput>svn update</userinput>, deal with " "any merges or conflicts that result, and attempt your commit again." msgstr "" "Zu diesem Zeitpunkt müssen Sie <userinput>svn update</userinput> aufrufen, " "sich um eventuelle Zusammenführungen oder Konflikte kümmern und die Übergabe " "erneut versuchen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1693 msgid "" "That covers the basic work cycle for using Subversion. Subversion offerse " "many other features that you can use to manage your repository and working " "copy, but most of your day-to-day use of Subversion will involve only the " "commands that we've discussed so far in this chapter. We will, however, " "cover a few more commands that you'll use fairly often." msgstr "" "Das deckt den grundlegenden Arbeitszyklus für die Verwendung von Subversion " "ab. Subversion bietet viele andere Möglichkeiten, die Sie benutzen können, " "um Ihr Repository und Ihre Arbeitskopie zu verwalten, doch der größte Teil " "Ihrer täglichen Arbeit mit Subversion wird lediglich die in diesem Kapitel " "behandelten Befehle berühren. Wir werden jedoch noch ein paar mehr Befehle " "behandeln, die Sie ziemlich oft verwenden werden." # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:1709 msgid "Examining History" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:1711 msgid "" "Your Subversion repository is like a time machine. It keeps a record of " "every change ever committed and allows you to explore this history by " "examining previous versions of files and directories as well as the metadata " "that accompanies them. With a single Subversion command, you can check out " "the repository (or restore an existing working copy) exactly as it was at " "any date or revision number in the past. However, sometimes you just want " "to <emphasis>peer into</emphasis> the past instead of <emphasis>going into</" "emphasis> it." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:1721 msgid "" "Several commands can provide you with historical data from the repository:" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1727 #, fuzzy #| msgid "<command>svn copy</command>" msgid "<command>svn log</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1729 msgid "" "Shows you broad information: log messages with date and author information " "attached to revisions and which paths changed in each revision" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1738 msgid "Shows line-level details of a particular change" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1743 #, fuzzy #| msgid "<command>svn add</command>" msgid "<command>svn cat</command>" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1745 msgid "" "Retrieves a file as it existed in a particular revision number and displays " "it on your screen" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1751 #, fuzzy #| msgid "<command>svn delete</command>" msgid "<command>svn list</command>" msgstr "<command>svn delete</command>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1753 msgid "Displays the files in a directory for any given revision" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:1763 msgid "Generating a List of Historical Changes" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1765 msgid "" "To find information about the history of a file or directory, use the " "<command>svn log</command> command. <command>svn log</command> will provide " "you with a record of who made changes to a file or directory, at what " "revision it changed, the time and date of that revision, and—if it was " "provided—the log message that accompanied the commit:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1773 #, no-wrap msgid "" "\n" "$ svn log\n" "------------------------------------------------------------------------\n" "r3 | sally | 2008-05-15 23:09:28 -0500 (Thu, 15 May 2008) | 1 line\n" "\n" "Added include lines and corrected # of cheese slices.\n" "------------------------------------------------------------------------\n" "r2 | harry | 2008-05-14 18:43:15 -0500 (Wed, 14 May 2008) | 1 line\n" "\n" "Added main() methods.\n" "------------------------------------------------------------------------\n" "r1 | sally | 2008-05-10 19:50:31 -0500 (Sat, 10 May 2008) | 1 line\n" "\n" "Initial import\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1790 msgid "" "Note that the log messages are printed in <emphasis>reverse chronological " "order</emphasis> by default. If you wish to see a different range of " "revisions in a particular order or just a single revision, pass the " "<option>--revision</option> (<option>-r</option>) option:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1797 #, no-wrap msgid "" "\n" "$ svn log -r 5:19 # shows logs 5 through 19 in chronological order\n" "\n" "$ svn log -r 19:5 # shows logs 5 through 19 in reverse order\n" "\n" "$ svn log -r 8 # shows log for revision 8\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1805 msgid "" "You can also examine the log history of a single file or directory. For " "example:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1808 #, no-wrap msgid "" "\n" "$ svn log foo.c\n" "…\n" "$ svn log http://foo.com/svn/trunk/code/foo.c\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1815 msgid "" "These will display log messages <emphasis>only</emphasis> for those " "revisions in which the working file (or URL) changed." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch02-basic-usage.xml:1821 msgid "Why Does svn log Not Show Me What I Just Committed?" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:1824 msgid "" "If you make a commit and immediately type <userinput>svn log</userinput> " "with no arguments, you may notice that your most recent commit doesn't show " "up in the list of log messages. This is due to a combination of the " "behavior of <command>svn commit</command> and the default behavior of " "<command>svn log</command>. First, when you commit changes to the " "repository, <command>svn</command> bumps only the revision of files (and " "directories) that it commits, so usually the parent directory remains at the " "older revision (See <xref linkend=\"svn.basic.in-action.mixedrevs.update-" "commit\"/> for an explanation of why). <command>svn log</command> then " "defaults to fetching the history of the directory at its current revision, " "and thus you don't see the newly committed changes. The solution here is to " "either update your working copy or explicitly provide a revision number to " "<command>svn log</command> by using the <option>--revision</option> " "(<option>-r</option>) option." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1845 msgid "" "If you want even more information about a file or directory, <command>svn " "log</command> also takes a <option>--verbose</option> (<option>-v</option>) " "option. Because Subversion allows you to move and copy files and " "directories, it is important to be able to track path changes in the " "filesystem. So, in verbose mode, <command>svn log</command> will include a " "list of changed paths in a revision in its output:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1854 #, no-wrap msgid "" "\n" "$ svn log -r 8 -v\n" "------------------------------------------------------------------------\n" "r8 | sally | 2008-05-21 13:19:25 -0500 (Wed, 21 May 2008) | 1 line\n" "Changed paths:\n" " M /trunk/code/foo.c\n" " M /trunk/code/bar.h\n" " A /trunk/code/doc/README\n" "\n" "Frozzled the sub-space winch.\n" "\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1869 #, fuzzy #| msgid "" #| "<command>svn status</command> also has a <option>--verbose</option> " #| "(<option>-v</option>) option, which will show you the status of " #| "<emphasis>every</emphasis> item in your working copy, even if it has not " #| "been changed:" msgid "" "<command>svn log</command> also takes a <option>--quiet</option> (<option>-" "q</option>) option, which suppresses the body of the log message. When " "combined with <option>--verbose</option>, it gives just the names of the " "changed files." msgstr "" "<command>svn status</command> hat auch eine <option>--verbose</option>-" "Option (<option>-v</option>), die Ihnen den Zustand <emphasis>jedes</" "emphasis> Objektes in der Arbeitskopie anzeigt, selbst wenn es sich nicht " "geändert hat:" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch02-basic-usage.xml:1875 msgid "Why Does svn log Give Me an Empty Response?" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:1878 msgid "" "After working with Subversion for a bit, most users will come across " "something like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch02-basic-usage.xml:1881 #, no-wrap msgid "" "\n" "$ svn log -r 2\n" "------------------------------------------------------------------------\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:1887 msgid "" "At first glance, this seems like an error. But recall that while revisions " "are repository-wide, <command>svn log</command> operates on a path in the " "repository. If you supply no path, Subversion uses the current working " "directory as the default target. As a result, if you're operating in a " "subdirectory of your working copy and attempt to see the log of a revision " "in which neither that directory nor any of its children was changed, " "Subversion will show you an empty log. If you want to see what changed in " "that revision, try pointing <command>svn log</command> directly at the " "topmost URL of your repository, as in <userinput>svn log -r 2 http://svn." "collab.net/repos/svn</userinput>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1906 #, fuzzy #| msgid "Examine the details of your local modifications" msgid "Examining the Details of Historical Changes" msgstr "Untersuchen Sie die Details Ihrer lokalen Änderungen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1908 msgid "" "We've already seen <command>svn diff</command> before—it displays file " "differences in unified diff format; we used it to show the local " "modifications made to our working copy before committing to the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1913 msgid "" "In fact, it turns out that there are <emphasis>three</emphasis> distinct " "uses of <command>svn diff</command>:" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1920 ../en/book/ch02-basic-usage.xml:1935 #, fuzzy #| msgid "Examine your changes." msgid "Examining local changes" msgstr "Untersuchen Sie Ihre Änderungen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:1924 #, fuzzy #| msgid "How Working Copies Track the Repository" msgid "Comparing your working copy to the repository" msgstr "Wie Arbeitskopien das Repository verfolgen" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1928 msgid "Comparing one repository to another" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1937 msgid "" "As we've seen, invoking <userinput>svn diff</userinput> with no options will " "compare your working files to the cached <quote>pristine</quote> copies in " "the <filename>.svn</filename> area:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1942 #, no-wrap msgid "" "\n" "$ svn diff\n" "Index: rules.txt\n" "===================================================================\n" "--- rules.txt\t(revision 3)\n" "+++ rules.txt\t(working copy)\n" "@@ -1,4 +1,5 @@\n" " Be kind to others\n" " Freedom = Responsibility\n" " Everything in moderation\n" "-Chew with your mouth open\n" "+Chew with your mouth closed\n" "+Listen when others are speaking\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:1962 #, fuzzy #| msgid "How Working Copies Track the Repository" msgid "Comparing working copy to repository" msgstr "Wie Arbeitskopien das Repository verfolgen" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1964 msgid "" "If a single <option>--revision</option> (<option>-r</option>) number is " "passed, your working copy is compared to the specified revision in the " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1969 #, no-wrap msgid "" "\n" "$ svn diff -r 3 rules.txt\n" "Index: rules.txt\n" "===================================================================\n" "--- rules.txt\t(revision 3)\n" "+++ rules.txt\t(working copy)\n" "@@ -1,4 +1,5 @@\n" " Be kind to others\n" " Freedom = Responsibility\n" " Everything in moderation\n" "-Chew with your mouth open\n" "+Chew with your mouth closed\n" "+Listen when others are speaking\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1989 msgid "Comparing repository to repository" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1991 msgid "" "If two revision numbers, separated by a colon, are passed via <option>--" "revision</option> (<option>-r</option>), the two revisions are directly " "compared:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1996 #, no-wrap msgid "" "\n" "$ svn diff -r 2:3 rules.txt\n" "Index: rules.txt\n" "===================================================================\n" "--- rules.txt\t(revision 2)\n" "+++ rules.txt\t(revision 3)\n" "@@ -1,4 +1,4 @@\n" " Be kind to others\n" "-Freedom = Chocolate Ice Cream\n" "+Freedom = Responsibility\n" " Everything in moderation\n" " Chew with your mouth open\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2011 msgid "" "A more convenient way of comparing one revision to the previous revision is " "to use the <option>--change</option> (<option>-c</option>) option:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:2015 #, no-wrap msgid "" "\n" "$ svn diff -c 3 rules.txt\n" "Index: rules.txt\n" "===================================================================\n" "--- rules.txt\t(revision 2)\n" "+++ rules.txt\t(revision 3)\n" "@@ -1,4 +1,4 @@\n" " Be kind to others\n" "-Freedom = Chocolate Ice Cream\n" "+Freedom = Responsibility\n" " Everything in moderation\n" " Chew with your mouth open\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2030 msgid "" "Lastly, you can compare repository revisions even when you don't have a " "working copy on your local machine, just by including the appropriate URL on " "the command line:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:2034 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.example.com:9834/repos\n" #| "…\n" msgid "" "\n" "$ svn diff -c 5 http://svn.example.com/repos/example/trunk/text/rules.txt\n" "…\n" "$\n" msgstr "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:2046 #, fuzzy #| msgid "The Repository" msgid "Browsing the Repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2048 msgid "" "Using <command>svn cat</command> and <command>svn list</command>, you can " "view various revisions of files and directories without changing the working " "revision of your working copy. In fact, you don't even need a working copy " "to use either one." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:2056 ../en/book/ch09-reference.xml:967 #, fuzzy #| msgid "svn" msgid "svn cat" msgstr "svn" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2059 msgid "" "If you want to examine an earlier version of a file and not necessarily the " "differences between two files, you can use <command>svn cat</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:2063 #, no-wrap msgid "" "\n" "$ svn cat -r 2 rules.txt\n" "Be kind to others\n" "Freedom = Chocolate Ice Cream\n" "Everything in moderation\n" "Chew with your mouth open\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2072 msgid "You can also redirect the output directly into a file:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:2075 #, no-wrap msgid "" "\n" "$ svn cat -r 2 rules.txt > rules.txt.v2\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:2084 ../en/book/ch09-reference.xml:2607 #, fuzzy #| msgid "svn import" msgid "svn list" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2086 msgid "" "The <command>svn list</command> command shows you what files are in a " "repository directory without actually downloading the files to your local " "machine:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:2090 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn list file:///var/svn/repos\n" #| "/trunk\n" #| "/branches\n" #| "/tags\n" msgid "" "\n" "$ svn list http://svn.collab.net/repos/svn\n" "README\n" "branches/\n" "clients/\n" "tags/\n" "trunk/\n" msgstr "" "\n" "$ svn list file:///var/svn/repos\n" "/trunk\n" "/branches\n" "/tags\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2099 msgid "" "If you want a more detailed listing, pass the <option>--verbose</option> " "(<option>-v</option>) flag to get output like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:2103 #, no-wrap msgid "" "\n" "$ svn list -v http://svn.collab.net/repos/svn\n" " 20620 harry 1084 Jul 13 2006 README\n" " 23339 harry Feb 04 01:40 branches/\n" " 21282 sally Aug 27 09:41 developer-resources/\n" " 23198 harry Jan 23 17:17 tags/\n" " 23351 sally Feb 05 13:26 trunk/\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2112 msgid "" "The columns tell you the revision at which the file or directory was last " "modified, the user who modified it, the size if it is a file, the date it " "was last modified, and the item's name." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><warning><para> #: ../en/book/ch02-basic-usage.xml:2118 msgid "" "The <userinput>svn list</userinput> command with no arguments defaults to " "the <emphasis>repository URL</emphasis> of the current working directory, " "<emphasis>not</emphasis> the local working copy directory. After all, if " "you want a listing of your local directory, you could use just plain " "<command>ls</command> (or any reasonable non-Unixy equivalent)." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:2133 #, fuzzy #| msgid "Recommended Repository Layout" msgid "Fetching Older Repository Snapshots" msgstr "Empfohlene Repository Aufteilung" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch02-basic-usage.xml:2135 msgid "" "In addition to all of the previous commands, you can use <command>svn " "update</command> and <command>svn checkout</command> with the <option>--" "revision</option> option to take an entire working copy <quote>back in time</" "quote>: <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch02-basic-usage.xml:2140 msgid "See? We told you that Subversion was a time machine." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:2144 #, no-wrap msgid "" "\n" "$ svn checkout -r 1729 # Checks out a new working copy at r1729\n" "…\n" "$ svn update -r 1729 # Updates an existing working copy to r1729\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch02-basic-usage.xml:2152 msgid "" "Many Subversion newcomers attempt to use the preceding <command>svn update</" "command> example to <quote>undo</quote> committed changes, but this won't " "work as you can't commit changes that you obtain from backdating a working " "copy if the changed files have newer revisions. See <xref linkend=\"svn." "branchmerge.basicmerging.resurrect\"/> for a description of how to " "<quote>undo</quote> a commit." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2161 msgid "" "Lastly, if you're building a release and wish to bundle up your files from " "Subversion but don't want those pesky <filename>.svn</filename> directories " "in the way, you can use <command>svn export</command> to create a local copy " "of all or part of your repository sans <filename>.svn</filename> " "directories. As with <command>svn update</command> and <command>svn " "checkout</command>, you can also pass the <option>--revision</option> option " "to <command>svn export</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:2172 #, no-wrap msgid "" "\n" "$ svn export http://svn.example.com/svn/repos1 # Exports latest revision\n" "…\n" "$ svn export http://svn.example.com/svn/repos1 -r 1729\n" "# Exports revision r1729\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:2189 msgid "Sometimes You Just Need to Clean Up" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:2191 msgid "" "Now that we've covered the day-to-day tasks that you'll frequently use " "Subversion for, we'll review a few administrative tasks relating to your " "working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:2198 #, fuzzy #| msgid "Update Your Working Copy" msgid "Disposing of a Working Copy" msgstr "Aktualisieren Sie Ihre Arbeitskopie" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2200 msgid "" "Subversion doesn't track either the state or the existence of working copies " "on the server, so there's no server overhead to keeping working copies " "around. Likewise, there's no need to let the server know that you're going " "to delete a working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2206 msgid "" "If you're likely to use a working copy again, there's nothing wrong with " "just leaving it on disk until you're ready to use it again, at which point " "all it takes is an <command>svn update</command> to bring it up to date and " "ready for use." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2212 msgid "" "However, if you're definitely not going to use a working copy again, you can " "safely delete the entire thing, but you'd be well served to take a look " "through the working copy for unversioned files. To find these files, run " "<userinput>svn status</userinput> and review any files that are prefixed " "with a <literal>?</literal> to make certain that they're not of importance. " "After you're done reviewing, you can safely delete your working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:2225 msgid "Recovering from an Interruption" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2227 msgid "" "When Subversion modifies your working copy (or any information within " "<filename>.svn</filename>), it tries to do so as safely as possible. Before " "changing the working copy, Subversion writes its intentions to a logfile. " "Next, it executes the commands in the logfile to apply the requested change, " "holding a lock on the relevant part of the working copy while it works—" "to prevent other Subversion clients from accessing the working copy mid-" "change. Finally, Subversion removes the logfile. Architecturally, this is " "similar to a journaled filesystem. If a Subversion operation is interrupted " "(e.g, if the process is killed or if the machine crashes), the logfiles " "remain on disk. By reexecuting the logfiles, Subversion can complete the " "previously started operation, and your working copy can get itself back into " "a consistent state." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2243 msgid "" "And this is exactly what <command>svn cleanup</command> does: it searches " "your working copy and runs any leftover logs, removing working copy locks in " "the process. If Subversion ever tells you that some part of your working " "copy is <quote>locked,</quote> this is the command that you should run. " "Also, <command>svn status</command> will display an <literal>L</literal> " "next to locked items:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:2251 #, no-wrap msgid "" "\n" "$ svn status\n" " L somedir\n" "M somedir/foo.c\n" "\n" "$ svn cleanup\n" "$ svn status\n" "M somedir/foo.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2261 msgid "" "Don't confuse these working copy locks with the ordinary locks that " "Subversion users create when using the lock-modify-unlock model of " "concurrent version control; see the sidebar <xref linkend=\"svn.advanced." "locking.meanings\"/> for clarification." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:2278 msgid "" "Now we've covered most of the Subversion client commands. Notable " "exceptions are those dealing with branching and merging (see <xref linkend=" "\"svn.branchmerge\"/>) and properties (see <xref linkend=\"svn.advanced.props" "\"/>). However, you may want to take a moment to skim through <xref linkend=" "\"svn.ref\"/> to get an idea of all the different commands that Subversion " "has—and how you can use them to make your work easier." msgstr "" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch03-advanced-topics.xml:2 #, fuzzy #| msgid "Advanced users" msgid "Advanced Topics" msgstr "Fortgeschrittene" # type: Content of: <chapter><para> #: ../en/book/ch03-advanced-topics.xml:4 msgid "" "If you've been reading this book chapter by chapter, from start to finish, " "you should by now have acquired enough knowledge to use the Subversion " "client to perform the most common version control operations. You " "understand how to check out a working copy from a Subversion repository. " "You are comfortable with submitting and receiving changes using the " "<command>svn commit</command> and <command>svn update</command> operations. " "You've probably even developed a reflex that causes you to run the " "<command>svn status</command> command almost unconsciously. For all intents " "and purposes, you are ready to use Subversion in a typical environment." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch03-advanced-topics.xml:16 msgid "" "But the Subversion feature set doesn't stop at <quote>common version control " "operations.</quote> It has other bits of functionality besides just " "communicating file and directory changes to and from a central repository." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch03-advanced-topics.xml:21 msgid "" "This chapter highlights some of Subversion's features that, while important, " "aren't part of the typical user's daily routine. It assumes that you are " "familiar with Subversion's basic file and directory versioning " "capabilities. If you aren't, you'll want to first read <xref linkend=\"svn." "basic\" /> and <xref linkend=\"svn.tour\" />. Once you've mastered those " "basics and consumed this chapter, you'll be a Subversion power user!" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:34 #, fuzzy #| msgid "Revisions" msgid "Revision Specifiers" msgstr "Revisionen" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:36 msgid "" "As we described in <xref linkend=\"svn.basic.in-action.revs\" />, revision " "numbers in Subversion are pretty straightforward—integers that keep " "getting larger as you commit more changes to your versioned data. Still, it " "doesn't take long before you can no longer remember exactly what happened in " "each and every revision. Fortunately, the typical Subversion workflow " "doesn't often demand that you supply arbitrary revisions to the Subversion " "operations you perform. For operations that <emphasis>do</emphasis> require " "a revision specifier, you generally supply a revision number that you saw in " "a commit email, in the output of some other Subversion operation, or in some " "other context that would give meaning to that particular number." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:50 msgid "" "But occasionally, you need to pinpoint a moment in time for which you don't " "already have a revision number memorized or handy. So besides the integer " "revision numbers, <command>svn</command> allows as input some additional " "forms of revision specifiers: <firstterm>revision keywords</firstterm> and " "revision dates." msgstr "" # type: Content of: <chapter><sect1><note><para> #: ../en/book/ch03-advanced-topics.xml:58 msgid "" "The various forms of Subversion revision specifiers can be mixed and matched " "when used to specify revision ranges. For example, you can use <option>-r " "<replaceable>REV1</replaceable>:<replaceable>REV2</replaceable></option> " "where <replaceable>REV1</replaceable> is a revision keyword and " "<replaceable>REV2</replaceable> is a revision number, or where " "<replaceable>REV1</replaceable> is a date and <replaceable>REV2</" "replaceable> is a revision keyword, and so on. The individual revision " "specifiers are independently evaluated, so you can put whatever you want on " "the opposite sides of that colon." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:73 #, fuzzy #| msgid "Revisions" msgid "Revision Keywords" msgstr "Revisionen" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:76 #: ../en/book/ch03-advanced-topics.xml:183 #, fuzzy #| msgid "Revisions" msgid "revisions" msgstr "Revisionen" # type: Content of: <preface><sect1><sect2><para><indexterm> #: ../en/book/ch03-advanced-topics.xml:78 #: ../en/book/ch03-advanced-topics.xml:81 #: ../en/book/ch03-advanced-topics.xml:84 #: ../en/book/ch03-advanced-topics.xml:87 #, fuzzy #| msgid "<indexterm>" msgid "</indexterm> <indexterm>" msgstr "<indexterm>" # type: Content of: <chapter><sect1><sect2><indexterm><primary> #: ../en/book/ch03-advanced-topics.xml:80 msgid "HEAD" msgstr "" # type: Content of: <chapter><sect1><sect2><indexterm><primary> #: ../en/book/ch03-advanced-topics.xml:83 msgid "BASE" msgstr "" # type: Content of: <chapter><sect1><sect2><indexterm><primary> #: ../en/book/ch03-advanced-topics.xml:86 msgid "COMMITTED" msgstr "" # type: Content of: <chapter><sect1><sect2><indexterm><primary> #: ../en/book/ch03-advanced-topics.xml:89 msgid "PREV" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:92 msgid "" "The Subversion client understands a number of revision keywords. These " "keywords can be used instead of integer arguments to the <option>--revision</" "option> (<option>-r</option>) option, and are resolved into specific " "revision numbers by Subversion:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:101 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>HEAD</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:103 msgid "The latest (or <quote>youngest</quote>) revision in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:109 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>BASE</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:111 msgid "" "The revision number of an item in a working copy. If the item has been " "locally modified, this refers to the way the item appears without those " "local modifications." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:119 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>COMMITTED</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:121 msgid "" "The most recent revision prior to, or equal to, <literal>BASE</literal>, in " "which an item changed." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:127 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>PREV</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:129 msgid "" "The revision immediately <emphasis>before</emphasis> the last revision in " "which an item changed. Technically, this boils down to <literal>COMMITTED</" "literal>−1." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:138 msgid "" "As can be derived from their descriptions, the <literal>PREV</literal>, " "<literal>BASE</literal>, and <literal>COMMITTED</literal> revision keywords " "are used only when referring to a working copy path—they don't apply " "to repository URLs. <literal>HEAD</literal>, on the other hand, can be used " "in conjunction with both of these path types." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:146 msgid "Here are some examples of revision keywords in action:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:149 #, no-wrap msgid "" "\n" "$ svn diff -r PREV:COMMITTED foo.c\n" "# shows the last change committed to foo.c\n" "\n" "$ svn log -r HEAD\n" "# shows log message for the latest repository commit\n" "\n" "$ svn diff -r HEAD\n" "# compares your working copy (with all of its local changes) to the\n" "# latest version of that tree in the repository\n" "\n" "$ svn diff -r BASE:HEAD foo.c\n" "# compares the unmodified version of foo.c with the latest version of\n" "# foo.c in the repository\n" "\n" "$ svn log -r BASE:HEAD\n" "# shows all commit logs for the current versioned directory since you\n" "# last updated\n" "\n" "$ svn update -r PREV foo.c\n" "# rewinds the last change on foo.c, decreasing foo.c's working revision\n" "\n" "$ svn diff -r BASE:14 foo.c\n" "# compares the unmodified version of foo.c with the way foo.c looked\n" "# in revision 14\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:180 #, fuzzy #| msgid "Revisions" msgid "Revision Dates" msgstr "Revisionen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:187 msgid "" "Revision numbers reveal nothing about the world outside the version control " "system, but sometimes you need to correlate a moment in real time with a " "moment in version history. To facilitate this, the <option>--revision</" "option> (<option>-r</option>) option can also accept as input date " "specifiers wrapped in curly braces (<literal>{</literal> and <literal>}</" "literal>). Subversion accepts the standard ISO-8601 date and time formats, " "plus a few others. Here are some examples. (Remember to use quotes around " "any date that contains spaces.)" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:198 #, no-wrap msgid "" "\n" "$ svn checkout -r {2006-02-17}\n" "$ svn checkout -r {15:30}\n" "$ svn checkout -r {15:30:00.200000}\n" "$ svn checkout -r {\"2006-02-17 15:30\"}\n" "$ svn checkout -r {\"2006-02-17 15:30 +0230\"}\n" "$ svn checkout -r {2006-02-17T15:30}\n" "$ svn checkout -r {2006-02-17T15:30Z}\n" "$ svn checkout -r {2006-02-17T15:30-04:00}\n" "$ svn checkout -r {20060217T1530}\n" "$ svn checkout -r {20060217T1530Z}\n" "$ svn checkout -r {20060217T1530-0500}\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:213 msgid "" "When you specify a date, Subversion resolves that date to the most recent " "revision of the repository as of that date, and then continues to operate " "against that resolved revision number:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:218 #, no-wrap msgid "" "\n" "$ svn log -r {2006-11-28}\n" "------------------------------------------------------------------------\n" "r12 | ira | 2006-11-27 12:31:51 -0600 (Mon, 27 Nov 2006) | 6 lines\n" "…\n" msgstr "" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:226 #, fuzzy #| msgid "Is Subversion the Right Tool?" msgid "Is Subversion a Day Early?" msgstr "Ist Subversion das richtige Werkzeug?" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:228 msgid "" "If you specify a single date as a revision without specifying a time of day " "(for example <literal>2006-11-27</literal>), you may think that Subversion " "should give you the last revision that took place on the 27th of November. " "Instead, you'll get back a revision from the 26th, or even earlier. " "Remember that Subversion will find the <emphasis>most recent revision of the " "repository</emphasis> as of the date you give. If you give a date without a " "timestamp, such as <literal>2006-11-27</literal>, Subversion assumes a time " "of 00:00:00, so looking for the most recent revision won't return anything " "on the 27th." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:241 msgid "" "If you want to include the 27th in your search, you can either specify the " "27th with the time (<literal>{\"2006-11-27 23:59\"}</literal>), or just " "specify the next day (<literal>{2006-11-28}</literal>)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:248 msgid "" "You can also use a range of dates. Subversion will find all revisions " "between both dates, inclusive:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:251 #, no-wrap msgid "" "\n" "$ svn log -r {2006-11-20}:{2006-11-29}\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch03-advanced-topics.xml:257 msgid "" "Since the timestamp of a revision is stored as an unversioned, modifiable " "property of the revision (see <xref linkend=\"svn.advanced.props\" />), " "revision timestamps can be changed to represent complete falsifications of " "true chronology, or even removed altogether. Subversion's ability to " "correctly convert revision dates into real revision numbers depends on " "revision datestamps maintaining a sequential ordering—the younger the " "revision, the younger its timestamp. If this ordering isn't maintained, you " "will likely find that trying to use dates to specify revision ranges in your " "repository doesn't always return the data you might have expected." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:279 msgid "Properties" msgstr "" # type: Content of: <chapter><sect1><indexterm><primary> #: ../en/book/ch03-advanced-topics.xml:281 msgid "properties" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:284 msgid "" "We've already covered in detail how Subversion stores and retrieves various " "versions of files and directories in its repository. Whole chapters have " "been devoted to this most fundamental piece of functionality provided by the " "tool. And if the versioning support stopped there, Subversion would still " "be complete from a version control perspective." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:291 msgid "But it doesn't stop there." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:293 msgid "" "In addition to versioning your directories and files, Subversion provides " "interfaces for adding, modifying, and removing versioned metadata on each of " "your versioned directories and files. We refer to this metadata as " "<firstterm>properties</firstterm>, and they can be thought of as two-column " "tables that map property names to arbitrary values attached to each item in " "your working copy. Generally speaking, the names and values of the " "properties can be whatever you want them to be, with the constraint that the " "names must contain only ASCII characters. And the best part about these " "properties is that they, too, are versioned, just like the textual contents " "of your files. You can modify, commit, and revert property changes as " "easily as you can file content changes. And the sending and receiving of " "property changes occurs as part of your typical commit and update " "operations—you don't have to change your basic processes to " "accommodate them." msgstr "" # type: Content of: <chapter><sect1><note><para> #: ../en/book/ch03-advanced-topics.xml:311 msgid "" "Subversion has reserved the set of properties whose names begin with " "<literal>svn:</literal> as its own. While there are only a handful of such " "properties in use today, you should avoid creating custom properties for " "your own needs whose names begin with this prefix. Otherwise, you run the " "risk that a future release of Subversion will grow support for a feature or " "behavior driven by a property of the same name but with perhaps an entirely " "different interpretation." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:321 msgid "" "Properties show up elsewhere in Subversion, too. Just as files and " "directories may have arbitrary property names and values attached to them, " "each revision as a whole may have arbitrary properties attached to it. The " "same constraints apply—human-readable names and anything-you-want " "binary values. The main difference is that revision properties are not " "versioned. In other words, if you change the value of, or delete, a " "revision property, there's no way, within the scope of Subversion's " "functionality, to recover the previous value." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:331 msgid "" "Subversion has no particular policy regarding the use of properties. It " "asks only that you not use property names that begin with the prefix " "<literal>svn:</literal>. That's the namespace that it sets aside for its " "own use. And Subversion does, in fact, use properties—both the " "versioned and unversioned variety. Certain versioned properties have " "special meaning or effects when found on files and directories, or they " "house a particular bit of information about the revisions on which they are " "found. Certain revision properties are automatically attached to revisions " "by Subversion's commit process, and they carry information about the " "revision. Most of these properties are mentioned elsewhere in this or other " "chapters as part of the more general topics to which they are related. For " "an exhaustive list of Subversion's predefined properties, see <xref linkend=" "\"svn.ref.properties\" />." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:347 msgid "" "In this section, we will examine the utility—both to users of " "Subversion and to Subversion itself—of property support. You'll learn " "about the property-related <command>svn</command> subcommands and how " "property modifications affect your normal Subversion workflow." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:355 msgid "Why Properties?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:357 msgid "" "Just as Subversion uses properties to store extra information about the " "files, directories, and revisions that it contains, you might also find " "properties to be of similar use. You might find it useful to have a place " "close to your versioned data to hang custom metadata about that data." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:364 msgid "" "Say you wish to design a web site that houses many digital photos and " "displays them with captions and a datestamp. Now, your set of photos is " "constantly changing, so you'd like to have as much of this site automated as " "possible. These photos can be quite large, so as is common with sites of " "this nature, you want to provide smaller thumbnail images to your site " "visitors." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:372 msgid "" "Now, you can get this functionality using traditional files. That is, you " "can have your <filename>image123.jpg</filename> and an <filename>image123-" "thumbnail.jpg</filename> side by side in a directory. Or if you want to " "keep the filenames the same, you might have your thumbnails in a different " "directory, such as <filename>thumbnails/image123.jpg</filename>. You can " "also store your captions and datestamps in a similar fashion, again " "separated from the original image file. But the problem here is that your " "collection of files multiplies with each new photo added to the site." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:384 msgid "" "Now consider the same web site deployed in a way that makes use of " "Subversion's file properties. Imagine having a single image file, " "<filename>image123.jpg</filename>, with properties set on that file that are " "named <literal>caption</literal>, <literal>datestamp</literal>, and even " "<literal>thumbnail</literal>. Now your working copy directory looks much " "more manageable—in fact, it looks to the casual browser like there are " "nothing but image files in it. But your automation scripts know better. " "They know that they can use <command>svn</command> (or better yet, they can " "use the Subversion language bindings—see <xref linkend=\"svn.developer." "usingapi\" />) to dig out the extra information that your site needs to " "display without having to read an index file or play path manipulation games." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch03-advanced-topics.xml:400 msgid "" "While Subversion places few restrictions on the names and values you use for " "properties, it has not been designed to optimally carry large property " "values or large sets of properties on a given file or directory. Subversion " "commonly holds all the property names and values associated with a single " "item in memory at the same time, which can cause detrimental performance or " "failed operations when extremely large property sets are used." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:410 msgid "" "Custom revision properties are also frequently used. One common such use is " "a property whose value contains an issue tracker ID with which the revision " "is associated, perhaps because the change made in that revision fixes a bug " "filed in the tracker issue with that ID. Other uses include hanging more " "friendly names on the revision—it might be hard to remember that " "revision 1935 was a fully tested revision. But if there's, say, a " "<literal>test-results</literal> property on that revision with the value " "<literal>all passing</literal>, that's meaningful information to have." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:422 msgid "Searchability (or, Why <emphasis>Not</emphasis> Properties)" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:425 msgid "" "For all their utility, Subversion properties—or, more accurately, the " "available interfaces to them—have a major shortcoming: while it is a " "simple matter to <emphasis>set</emphasis> a custom property, " "<emphasis>finding</emphasis> that property later is a whole different ball " "of wax." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:432 msgid "" "Trying to locate a custom revision property generally involves performing a " "linear walk across all the revisions of the repository, asking of each " "revision, \"Do you have the property I'm looking for?\" Trying to find a " "custom versioned property is painful, too, and often involves a recursive " "<command>svn propget</command> across an entire working copy. In your " "situation, that might not be as bad as a linear walk across all revisions. " "But it certainly leaves much to be desired in terms of both performance and " "likelihood of success, especially if the scope of your search would require " "a working copy from the root of your repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:445 msgid "" "For this reason, you might choose—especially in the revision property " "use case—to simply add your metadata to the revision's log message " "using some policy-driven (and perhaps programmatically enforced) formatting " "that is designed to be quickly parsed from the output of <command>svn log</" "command>. It is quite common to see the following in Subversion log " "messages:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><programlisting> #: ../en/book/ch03-advanced-topics.xml:453 #, no-wrap msgid "" "\n" "Issue(s): IZ2376, IZ1919\n" "Reviewed by: sally\n" "\n" "This fixes a nasty segfault in the wort frabbing process\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:461 msgid "" "But here again lies some misfortune. Subversion doesn't yet provide a log " "message templating mechanism, which would go a long way toward helping users " "be consistent with the formatting of their log-embedded revision metadata." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:472 msgid "Manipulating Properties" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:474 msgid "" "The <command>svn</command> program affords a few ways to add or modify file " "and directory properties. For properties with short, human-readable values, " "perhaps the simplest way to add a new property is to specify the property " "name and value on the command line of the <command>svn propset</command> " "subcommand:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:481 #, no-wrap msgid "" "\n" "$ svn propset copyright '(c) 2006 Red-Bean Software' calc/button.c\n" "property 'copyright' set on 'calc/button.c'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:487 msgid "" "But we've been touting the flexibility that Subversion offers for your " "property values. And if you are planning to have a multiline textual, or " "even binary, property value, you probably do not want to supply that value " "on the command line. So the <command>svn propset</command> subcommand takes " "a <option>--file</option> (<option>-F</option>) option for specifying the " "name of a file that contains the new property value." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:496 #, no-wrap msgid "" "\n" "$ svn propset license -F /path/to/LICENSE calc/button.c\n" "property 'license' set on 'calc/button.c'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch03-advanced-topics.xml:502 msgid "" "There are some restrictions on the names you can use for properties. A " "property name must start with a letter, a colon (<literal>:</literal>), or " "an underscore (<literal>_</literal>); after that, you can also use digits, " "hyphens (<literal>-</literal>), and periods (<literal>.</literal>). " "<footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:509 msgid "" "If you're familiar with XML, this is pretty much the ASCII subset of the " "syntax for XML \"Name\"." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:514 msgid "" "In addition to the <command>propset</command> command, the <command>svn</" "command> program supplies the <command>propedit</command> command. This " "command uses the configured editor program (see <xref linkend=\"svn.advanced." "confarea.opts.config\" />) to add or modify properties. When you run the " "command, <command>svn</command> invokes your editor program on a temporary " "file that contains the current value of the property (or that is empty, if " "you are adding a new property). Then, you just modify that value in your " "editor program until it represents the new value you wish to store for the " "property, save the temporary file, and then exit the editor program. If " "Subversion detects that you've actually changed the existing value of the " "property, it will accept that as the new property value. If you exit your " "editor without making any changes, no property modification will occur:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:531 #, no-wrap msgid "" "\n" "$ svn propedit copyright calc/button.c ### exit the editor without changes\n" "No changes to property 'copyright' on 'calc/button.c'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:537 msgid "" "We should note that, as with other <command>svn</command> subcommands, those " "related to properties can act on multiple paths at once. This enables you " "to modify properties on whole sets of files with a single command. For " "example, we could have done the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:543 #, no-wrap msgid "" "\n" "$ svn propset copyright '(c) 2006 Red-Bean Software' calc/*\n" "property 'copyright' set on 'calc/Makefile'\n" "property 'copyright' set on 'calc/button.c'\n" "property 'copyright' set on 'calc/integer.c'\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:552 msgid "" "All of this property adding and editing isn't really very useful if you " "can't easily get the stored property value. So the <command>svn</command> " "program supplies two subcommands for displaying the names and values of " "properties stored on files and directories. The <command>svn proplist</" "command> command will list the names of properties that exist on a path. " "Once you know the names of the properties on the node, you can request their " "values individually using <command>svn propget</command>. This command " "will, given a property name and a path (or set of paths), print the value of " "the property to the standard output stream." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:564 #, no-wrap msgid "" "\n" "$ svn proplist calc/button.c\n" "Properties on 'calc/button.c':\n" " copyright\n" " license\n" "$ svn propget copyright calc/button.c\n" "(c) 2006 Red-Bean Software\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:573 msgid "" "There's even a variation of the <command>proplist</command> command that " "will list both the name and the value for all of the properties. Simply " "supply the <option>--verbose</option> (<option>-v</option>) option." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:578 #, no-wrap msgid "" "\n" "$ svn proplist -v calc/button.c\n" "Properties on 'calc/button.c':\n" " copyright : (c) 2006 Red-Bean Software\n" " license : ================================================================\n" "Copyright (c) 2006 Red-Bean Software. All rights reserved.\n" "\n" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions \n" "are met:\n" "\n" "1. Redistributions of source code must retain the above copyright\n" "notice, this list of conditions, and the recipe for Fitz's famous\n" "red-beans-and-rice.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:595 msgid "" "The last property-related subcommand is <command>propdel</command>. Since " "Subversion allows you to store properties with empty values, you can't " "remove a property altogether using <command>svn propedit</command> or " "<command>svn propset</command>. For example, this command will " "<emphasis>not</emphasis> yield the desired effect:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:602 #, no-wrap msgid "" "\n" "$ svn propset license '' calc/button.c\n" "property 'license' set on 'calc/button.c'\n" "$ svn proplist -v calc/button.c\n" "Properties on 'calc/button.c':\n" " copyright : (c) 2006 Red-Bean Software\n" " license : \n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:612 msgid "" "You need to use the <command>propdel</command> subcommand to delete " "properties altogether. The syntax is similar to the other property commands:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:616 #, no-wrap msgid "" "\n" "$ svn propdel license calc/button.c\n" "property 'license' deleted from 'calc/button.c'.\n" "$ svn proplist -v calc/button.c\n" "Properties on 'calc/button.c':\n" " copyright : (c) 2006 Red-Bean Software\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch03-advanced-topics.xml:625 msgid "" "Remember those unversioned revision properties? You can modify those, too, " "using the same <command>svn</command> subcommands that we just described. " "Simply add the <option>--revprop</option> command-line parameter and specify " "the revision whose property you wish to modify. Since revisions are global, " "you don't need to specify a target path to these property-related commands " "so long as you are positioned in a working copy of the repository whose " "revision property you wish to modify. Otherwise, you can simply provide the " "URL of any path in the repository of interest (including the repository's " "root URL). For example, you might want to replace the commit log message of " "an existing revision. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:639 msgid "" "Fixing spelling errors, grammatical gotchas, and <quote>just-plain-" "wrongness</quote> in commit log messages is perhaps the most common use case " "for the <option>--revprop</option> option." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:643 msgid "" "</footnote> If your current working directory is part of a working copy of " "your repository, you can simply run the <command>svn propset</command> " "command with no target path:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:648 #, no-wrap msgid "" "\n" "$ svn propset svn:log '* button.c: Fix a compiler warning.' -r11 --revprop\n" "property 'svn:log' set on repository revision '11'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:654 msgid "" "But even if you haven't checked out a working copy from that repository, you " "can still affect the property change by providing the repository's root URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:658 #, no-wrap msgid "" "\n" "$ svn propset svn:log '* button.c: Fix a compiler warning.' -r11 --revprop \\\n" " http://svn.example.com/repos/project\n" "property 'svn:log' set on repository revision '11'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:665 msgid "" "Note that the ability to modify these unversioned properties must be " "explicitly added by the repository administrator (see <xref linkend=\"svn." "reposadmin.maint.setlog\" />). That's because the properties aren't " "versioned, so you run the risk of losing information if you aren't careful " "with your edits. The repository administrator can set up methods to protect " "against this loss, and by default, modification of unversioned properties is " "disabled." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch03-advanced-topics.xml:675 msgid "" "Users should, where possible, use <command>svn propedit</command> instead of " "<command>svn propset</command>. While the end result of the commands is " "identical, the former will allow them to see the current value of the " "property that they are about to change, which helps them to verify that they " "are, in fact, making the change they think they are making. This is " "especially true when modifying unversioned revision properties. Also, it is " "significantly easier to modify multiline property values in a text editor " "than at the command line." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:691 msgid "Properties and the Subversion Workflow" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:693 msgid "" "Now that you are familiar with all of the property-related <command>svn</" "command> subcommands, let's see how property modifications affect the usual " "Subversion workflow. As we mentioned earlier, file and directory properties " "are versioned, just like your file contents. As a result, Subversion " "provides the same opportunities for merging—cleanly or with " "conflicts—someone else's modifications into your own." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:702 msgid "" "As with file contents, your property changes are local modifications, made " "permanent only when you commit them to the repository with <command>svn " "commit</command>. Your property changes can be easily unmade, too—the " "<command>svn revert</command> command will restore your files and " "directories to their unedited states—contents, properties, and all. " "Also, you can receive interesting information about the state of your file " "and directory properties by using the <command>svn status</command> and " "<command>svn diff</command> commands." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:713 #, no-wrap msgid "" "\n" "$ svn status calc/button.c\n" " M calc/button.c\n" "$ svn diff calc/button.c\n" "Property changes on: calc/button.c\n" "___________________________________________________________________\n" "Name: copyright\n" " + (c) 2006 Red-Bean Software\n" "\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:725 msgid "" "Notice how the <command>status</command> subcommand displays <literal>M</" "literal> in the second column instead of the first. That is because we have " "modified the properties on <filename>calc/button.c</filename>, but not its " "textual contents. Had we changed both, we would have seen <literal>M</" "literal> in the first column, too. (We cover <command>svn status</command> " "in <xref linkend=\"svn.tour.cycle.examine.status\" />)." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:735 msgid "Property Conflicts" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:737 msgid "" "As with file contents, local property modifications can conflict with " "changes committed by someone else. If you update your working copy " "directory and receive property changes on a versioned object that clash with " "your own, Subversion will report that the object is in a conflicted state." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:744 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn update\n" #| "U INSTALL\n" #| "G README\n" #| "Conflict discovered in 'bar.c'.\n" #| "Select: (p) postpone, (df) diff-full, (e) edit,\n" #| " (h) help for more options:\n" msgid "" "\n" "$ svn update calc\n" "M calc/Makefile.in\n" "Conflict for property 'linecount' discovered on 'calc/button.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (s) show all options: p\n" " C calc/button.c\n" "Updated to revision 143.\n" "$ \n" msgstr "" "\n" "$ svn update\n" "U INSTALL\n" "G README\n" "Conflict discovered in 'bar.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options:\n" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:755 msgid "" "Subversion will also create, in the same directory as the conflicted object, " "a file with a <filename>.prej</filename> extension that contains the details " "of the conflict. You should examine the contents of this file so you can " "decide how to resolve the conflict. Until the conflict is resolved, you " "will see a <literal>C</literal> in the second column of <command>svn status</" "command> output for that object, and attempts to commit your local " "modifications will fail." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch03-advanced-topics.xml:765 #, no-wrap msgid "" "\n" "$ svn status calc\n" " C calc/button.c\n" "? calc/button.c.prej\n" "$ cat calc/button.c.prej \n" "Trying to change property 'linecount' from '1267' to '1301',\n" "but property has been locally changed from '1267' to '1256'.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:775 msgid "" "To resolve property conflicts, simply ensure that the conflicting properties " "contain the values that they should, and then use the <command>svn resolved</" "command> command to alert Subversion that you have manually resolved the " "problem." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:783 msgid "" "You might also have noticed the nonstandard way that Subversion currently " "displays property differences. You can still use <command>svn diff</" "command> and redirect its output to create a usable patch file. The " "<command>patch</command> program will ignore property patches—as a " "rule, it ignores any noise it can't understand. This does, unfortunately, " "mean that to fully apply a patch generated by <command>svn diff</command>, " "any property modifications will need to be applied by hand." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:797 msgid "Automatic Property Setting" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:799 msgid "" "Properties are a powerful feature of Subversion, acting as key components of " "many Subversion features discussed elsewhere in this and other " "chapters—textual diff and merge support, keyword substitution, newline " "translation, and so on. But to get the full benefit of properties, they " "must be set on the right files and directories. Unfortunately, that step " "can be easily forgotten in the routine of things, especially since failing " "to set a property doesn't usually result in an obvious error (at least " "compared to, say, failing to add a file to version control). To help your " "properties get applied to the places that need them, Subversion provides a " "couple of simple but useful features." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:812 msgid "" "Whenever you introduce a file to version control using the <command>svn add</" "command> or <command>svn import</command> commands, Subversion tries to " "assist by setting some common file properties automatically. First, on " "operating systems whose filesystems support an execute permission bit, " "Subversion will automatically set the <literal>svn:executable</literal> " "property on newly added or imported files whose execute bit is enabled. " "(See <xref linkend=\"svn.advanced.props.special.executable\" /> later in " "this chapter for more about this property.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:823 msgid "" "Second, Subversion tries to determine the file's MIME type. If you've " "configured a <literal>mime-types-files</literal> runtime configuration " "parameter, Subversion will try to find a MIME type mapping in that file for " "your file's extension. If it finds such a mapping, it will set your file's " "<literal>svn:mime-type</literal> property to the MIME type it found. If no " "mapping file is configured, or no mapping for your file's extension could be " "found, Subversion runs a very basic heuristic to determine whether the file " "contains nontextual content. If so, it automatically sets the <literal>svn:" "mime-type</literal> property on that file to <literal>application/octet-" "stream</literal> (the generic <quote>this is a collection of bytes</quote> " "MIME type). Of course, if Subversion guesses incorrectly, or if you wish to " "set the <literal>svn:mime-type</literal> property to something more " "precise—perhaps <literal>image/png</literal> or <literal>application/x-" "shockwave-flash</literal>—you can always remove or edit that " "property. (For more on Subversion's use of MIME types, see <xref linkend=" "\"svn.advanced.props.special.mime-type\" /> later in this chapter.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:846 msgid "" "Subversion also provides, via its runtime configuration system (see <xref " "linkend=\"svn.advanced.confarea\" />), a more flexible automatic property " "setting feature that allows you to create mappings of filename patterns to " "property names and values. Once again, these mappings affect adds and " "imports, and can not only override the default MIME type decision made by " "Subversion during those operations, but can also set additional Subversion " "or custom properties, too. For example, you might create a mapping that " "says that anytime you add JPEG files—ones whose names match the " "pattern <literal>*.jpg</literal>—Subversion should automatically set " "the <literal>svn:mime-type</literal> property on those files to " "<literal>image/jpeg</literal>. Or perhaps any files that match <literal>*." "cpp</literal> should have <literal>svn:eol-style</literal> set to " "<literal>native</literal>, and <literal>svn:keywords</literal> set to " "<literal>Id</literal>. Automatic property support is perhaps the handiest " "property-related tool in the Subversion toolbox. See <xref linkend=\"svn." "advanced.confarea.opts.config\"/> for more about configuring that support." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:875 msgid "File Portability" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:877 msgid "" "Fortunately for Subversion users who routinely find themselves on different " "computers with different operating systems, Subversion's command-line " "program behaves almost identically on all those systems. If you know how to " "wield <command>svn</command> on one platform, you know how to wield it " "everywhere." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:884 msgid "" "However, the same is not always true of other general classes of software or " "of the actual files you keep in Subversion. For example, on a Windows " "machine, the definition of a <quote>text file</quote> would be similar to " "that used on a Linux box, but with a key difference—the character " "sequences used to mark the ends of the lines of those files. There are " "other differences, too. Unix platforms have (and Subversion supports) " "symbolic links; Windows does not. Unix platforms use filesystem permission " "to determine executability; Windows uses filename extensions." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:895 msgid "" "Because Subversion is in no position to unite the whole world in common " "definitions and implementations of all of these things, the best it can do " "is to try to help make your life simpler when you need to work with your " "versioned files and directories on multiple computers and operating " "systems. This section describes some of the ways Subversion does this." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:904 msgid "File Content Type" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:906 msgid "" "Subversion joins the ranks of the many applications that recognize and make " "use of Multipurpose Internet Mail Extensions (MIME) content types. Besides " "being a general-purpose storage location for a file's content type, the " "value of the <literal>svn:mime-type</literal> file property determines some " "behavioral characteristics of Subversion itself." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:915 msgid "Identifying File Types" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:917 msgid "" "Various programs on most modern operating systems make assumptions about the " "type and format of the contents of a file by the file's name, specifically " "its file extension. For example, files whose names end in <filename>.txt</" "filename> are generally assumed to be human-readable; that is, able to be " "understood by simple perusal rather than requiring complex processing to " "decipher. Files whose names end in <filename>.png</filename>, on the other " "hand, are assumed to be of the Portable Network Graphics type—not " "human-readable at all, and sensible only when interpreted by software that " "understands the PNG format and can render the information in that format as " "a raster image." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para><footnote> #: ../en/book/ch03-advanced-topics.xml:931 msgid "" "Unfortunately, some of those extensions have changed their meanings over " "time. When personal computers first appeared, a file named <filename>README." "DOC</filename> would have almost certainly been a plain-text file, just like " "today's <filename>.txt</filename> files. But by the mid-1990s, you could " "almost bet that a file of that name would not be a plain-text file at all, " "but instead a Microsoft Word document in a proprietary, non-human-readable " "format. But this change didn't occur overnight—there was certainly a " "period of confusion for computer users over what exactly they had in hand " "when they saw a <filename>.DOC</filename> file. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:944 msgid "" "You think that was rough? During that same era, WordPerfect also used " "<filename>.DOC</filename> for their proprietary file format's preferred " "extension!" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:950 msgid "" "The popularity of computer networking cast still more doubt on the mapping " "between a file's name and its content. With information being served across " "networks and generated dynamically by server-side scripts, there was often " "no real file per se, and therefore no filename. Web servers, for example, " "needed some other way to tell browsers what they were downloading so that " "the browser could do something intelligent with that information, whether " "that was to display the data using a program registered to handle that " "datatype or to prompt the user for where on the client machine to store the " "downloaded data." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:962 msgid "" "Eventually, a standard emerged for, among other things, describing the " "contents of a data stream. In 1996, RFC 2045 was published. It was the " "first of five RFCs describing MIME. It describes the concept of media types " "and subtypes and recommends a syntax for the representation of those types. " "Today, MIME media types—or <quote>MIME types</quote>—are used " "almost universally across email applications, web servers, and other " "software as the de facto mechanism for clearing up the file content " "confusion." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:975 msgid "" "For example, one of the benefits that Subversion typically provides is " "contextual, line-based merging of changes received from the server during an " "update into your working file. But for files containing nontextual data, " "there is often no concept of a <quote>line.</quote> So, for versioned files " "whose <literal>svn:mime-type</literal> property is set to a nontextual MIME " "type (generally, something that doesn't begin with <literal>text/</literal>, " "though there are exceptions), Subversion does not attempt to perform " "contextual merges during updates. Instead, any time you have locally " "modified a binary working copy file that is also being updated, your file is " "left untouched and Subversion creates two new files. One file has a " "<filename>.oldrev</filename> extension and contains the BASE revision of the " "file. The other file has a <filename>.newrev</filename> extension and " "contains the contents of the updated revision of the file. This behavior is " "really for the protection of the user against failed attempts at performing " "contextual merges on files that simply cannot be contextually merged." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch03-advanced-topics.xml:996 msgid "" "The <literal>svn:mime-type</literal> property, when set to a value that does " "not indicate textual file contents, can cause some unexpected behaviors with " "respect to other properties. For example, since the idea of line endings " "(and therefore, line-ending conversion) makes no sense when applied to " "nontextual files, Subversion will prevent you from setting the <literal>svn:" "eol-style</literal> property on such files. This is obvious when attempted " "on a single file target—<command>svn propset</command> will error " "out. But it might not be as clear if you perform a recursive property set, " "where Subversion will silently skip over files that it deems unsuitable for " "a given property." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1011 msgid "" "Beginning in Subversion 1.5, users can configure a new <literal>mime-types-" "file</literal> runtime configuration parameter, which identifies the " "location of a MIME types mapping file. Subversion will consult this mapping " "file to determine the MIME type of newly added and imported files." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1018 msgid "" "Also, if the <literal>svn:mime-type</literal> property is set, then the " "Subversion Apache module will use its value to populate the <literal>Content-" "type:</literal> HTTP header when responding to GET requests. This gives " "your web browser a crucial clue about how to display a file when you use it " "to peruse your Subversion repository's contents." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:1029 msgid "File Executability" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1031 msgid "" "On many operating systems, the ability to execute a file as a command is " "governed by the presence of an execute permission bit. This bit usually " "defaults to being disabled, and must be explicitly enabled by the user for " "each file that needs it. But it would be a monumental hassle to have to " "remember exactly which files in a freshly checked-out working copy were " "supposed to have their executable bits toggled on, and then to have to do " "that toggling. So, Subversion provides the <literal>svn:executable</" "literal> property as a way to specify that the executable bit for the file " "on which that property is set should be enabled, and Subversion honors that " "request when populating working copies with such files." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch03-advanced-topics.xml:1044 msgid "" "This property has no effect on filesystems that have no concept of an " "executable permission bit, such as FAT32 and NTFS. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:1048 msgid "" "The Windows filesystems use file extensions (such as <filename>.EXE</" "filename>, <filename>.BAT</filename>, and <filename>.COM</filename>) to " "denote executable files." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1052 msgid "" "</footnote> Also, although it has no defined values, Subversion will force " "its value to <literal>*</literal> when setting this property. Finally, this " "property is valid only on files, not on directories." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:1062 msgid "End-of-Line Character Sequences" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1064 msgid "" "Unless otherwise noted using a versioned file's <literal>svn:mime-type</" "literal> property, Subversion assumes the file contains human-readable " "data. Generally speaking, Subversion uses this knowledge only to determine " "whether contextual difference reports for that file are possible. " "Otherwise, to Subversion, bytes are bytes." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1071 msgid "" "This means that by default, Subversion doesn't pay any attention to the type " "of <firstterm>end-of-line (EOL) markers</firstterm> used in your files. " "Unfortunately, different operating systems have different conventions about " "which character sequences represent the end of a line of text in a file. " "For example, the usual line-ending token used by software on the Windows " "platform is a pair of ASCII control characters—a carriage return " "(<literal>CR</literal>) followed by a line feed (<literal>LF</literal>). " "Unix software, however, just uses the <literal>LF</literal> character to " "denote the end of a line." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1083 msgid "" "Not all of the various tools on these operating systems understand files " "that contain line endings in a format that differs from the " "<firstterm>native line-ending style</firstterm> of the operating system on " "which they are running. So, typically, Unix programs treat the <literal>CR</" "literal> character present in Windows files as a regular character (usually " "rendered as <literal>^M</literal>), and Windows programs combine all of the " "lines of a Unix file into one giant line because no carriage return-linefeed " "(or <literal>CRLF</literal>) character combination was found to denote the " "ends of the lines." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1095 msgid "" "This sensitivity to foreign EOL markers can be frustrating for folks who " "share a file across different operating systems. For example, consider a " "source code file, and developers that edit this file on both Windows and " "Unix systems. If all the developers always use tools that preserve the line-" "ending style of the file, no problems occur." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1103 msgid "" "But in practice, many common tools either fail to properly read a file with " "foreign EOL markers, or convert the file's line endings to the native style " "when the file is saved. If the former is true for a developer, he has to " "use an external conversion utility (such as <command>dos2unix</command> or " "its companion, <command>unix2dos</command>) to prepare the file for " "editing. The latter case requires no extra preparation. But both cases " "result in a file that differs from the original quite literally on every " "line! Prior to committing his changes, the user has two choices. Either he " "can use a conversion utility to restore the modified file to the same line-" "ending style that it was in before his edits were made, or he can simply " "commit the file—new EOL markers and all." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1119 msgid "" "The result of scenarios like these include wasted time and unnecessary " "modifications to committed files. Wasted time is painful enough. But when " "commits change every line in a file, this complicates the job of determining " "which of those lines were changed in a nontrivial way. Where was that bug " "really fixed? On what line was a syntax error introduced?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1127 msgid "" "The solution to this problem is the <literal>svn:eol-style</literal> " "property. When this property is set to a valid value, Subversion uses it to " "determine what special processing to perform on the file so that the file's " "line-ending style isn't flip-flopping with every commit that comes from a " "different operating system. The valid values are:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1137 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>native</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1139 msgid "" "This causes the file to contain the EOL markers that are native to the " "operating system on which Subversion was run. In other words, if a user on " "a Windows machine checks out a working copy that contains a file with an " "<literal>svn:eol-style</literal> property set to <literal>native</literal>, " "that file will contain <literal>CRLF</literal> EOL markers. A Unix user " "checking out a working copy that contains the same file will see " "<literal>LF</literal> EOL markers in his copy of the file." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1151 msgid "" "Note that Subversion will actually store the file in the repository using " "normalized <literal>LF</literal> EOL markers regardless of the operating " "system. This is basically transparent to the user, though." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1159 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>CRLF</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1161 msgid "" "This causes the file to contain <literal>CRLF</literal> sequences for EOL " "markers, regardless of the operating system in use." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1167 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>LF</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1169 msgid "" "This causes the file to contain <literal>LF</literal> characters for EOL " "markers, regardless of the operating system in use." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1175 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>CR</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1177 msgid "" "This causes the file to contain <literal>CR</literal> characters for EOL " "markers, regardless of the operating system in use. This line-ending style " "is not very common." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:1192 msgid "Ignoring Unversioned Items" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1194 msgid "" "In any given working copy, there is a good chance that alongside all those " "versioned files and directories are other files and directories that are " "neither versioned nor intended to be. Text editors litter directories with " "backup files. Software compilers generate intermediate—or even " "final—files that you typically wouldn't bother to version. And users " "themselves drop various other files and directories wherever they see fit, " "often in version control working copies." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1204 msgid "" "It's ludicrous to expect Subversion working copies to be somehow impervious " "to this kind of clutter and impurity. In fact, Subversion counts it as a " "<emphasis>feature</emphasis> that its working copies are just typical " "directories, just like unversioned trees. But these not-to-be-versioned " "files and directories can cause some annoyance for Subversion users. For " "example, because the <command>svn add</command> and <command>svn import</" "command> commands act recursively by default and don't know which files in a " "given tree you do and don't wish to version, it's easy to accidentally add " "stuff to version control that you didn't mean to. And because <command>svn " "status</command> reports, by default, every item of interest in a working " "copy—including unversioned files and directories—its output can " "get quite noisy where many of these things exist." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1220 msgid "" "So Subversion provides two ways for telling it which files you would prefer " "that it simply disregard. One of the ways involves the use of Subversion's " "runtime configuration system (see <xref linkend=\"svn.advanced.confarea\" /" ">), and therefore applies to all the Subversion operations that make use of " "that runtime configuration—generally those performed on a particular " "computer or by a particular user of a computer. The other way makes use of " "Subversion's directory property support and is more tightly bound to the " "versioned tree itself, and therefore affects everyone who has a working copy " "of that tree. Both of the mechanisms use <firstterm>file patterns</" "firstterm> (strings of literal and special wildcard characters used to match " "against filenames) to decide which files to ignore." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1234 msgid "" "The Subversion runtime configuration system provides an option, " "<literal>global-ignores</literal>, whose value is a whitespace-delimited " "collection of file patterns. The Subversion client checks these patterns " "against the names of the files that are candidates for addition to version " "control, as well as to unversioned files that the <command>svn status</" "command> command notices. If any file's name matches one of the patterns, " "Subversion will basically act as if the file didn't exist at all. This is " "really useful for the kinds of files that you almost never want to version, " "such as editor backup files such as Emacs' <literal>*~</literal> and " "<literal>.*~</literal> files." msgstr "" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:1248 #, fuzzy #| msgid "What's New in Subversion" msgid "File Patterns in Subversion" msgstr "Was gibt es Neues in Subversion" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1250 msgid "" "File patterns (also called <firstterm>globs</firstterm> or <firstterm>shell " "wildcard patterns</firstterm>) are strings of characters that are intended " "to be matched against filenames, typically for the purpose of quickly " "selecting some subset of similar files from a larger grouping without having " "to explicitly name each file. The patterns contain two types of characters: " "regular characters, which are compared explicitly against potential matches, " "and special wildcard characters, which are interpreted differently for " "matching purposes." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1261 msgid "" "There are different types of file pattern syntaxes, but Subversion uses the " "one most commonly found in Unix systems implemented as the " "<function>fnmatch</function> system function. It supports the following " "wildcards, described here simply for your convenience:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1269 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>?</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sidebar><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1271 msgid "Matches any single character" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1275 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>*</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sidebar><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1277 msgid "Matches any string of characters, including the empty string" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1282 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>[</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sidebar><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1284 msgid "" "Begins a character class definition terminated by <literal>]</literal>, used " "for matching a subset of characters" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1291 msgid "" "You can see this same pattern matching behavior at a Unix shell prompt. The " "following are some examples of patterns being used for various things:" msgstr "" # type: Content of: <chapter><sect1><sidebar><screen> #: ../en/book/ch03-advanced-topics.xml:1295 #, no-wrap msgid "" "\n" "$ ls ### the book sources\n" "appa-quickstart.xml ch06-server-configuration.xml\n" "appb-svn-for-cvs-users.xml ch07-customizing-svn.xml\n" "appc-webdav.xml ch08-embedding-svn.xml\n" "book.xml ch09-reference.xml\n" "ch00-preface.xml ch10-world-peace-thru-svn.xml\n" "ch01-fundamental-concepts.xml copyright.xml\n" "ch02-basic-usage.xml foreword.xml\n" "ch03-advanced-topics.xml images/\n" "ch04-branching-and-merging.xml index.xml\n" "ch05-repository-admin.xml styles.css\n" "$ ls ch* ### the book chapters\n" "ch00-preface.xml ch06-server-configuration.xml\n" "ch01-fundamental-concepts.xml ch07-customizing-svn.xml\n" "ch02-basic-usage.xml ch08-embedding-svn.xml\n" "ch03-advanced-topics.xml ch09-reference.xml\n" "ch04-branching-and-merging.xml ch10-world-peace-thru-svn.xml\n" "ch05-repository-admin.xml\n" "$ ls ch?0-* ### the book chapters whose numbers end in zero\n" "ch00-preface.xml ch10-world-peace-thru-svn.xml\n" "$ ls ch0[3578]-* ### the book chapters that Mike is responsible for\n" "ch03-advanced-topics.xml ch07-customizing-svn.xml\n" "ch05-repository-admin.xml ch08-embedding-svn.xml\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1322 msgid "" "File pattern matching is a bit more complex than what we've described here, " "but this basic usage level tends to suit the majority of Subversion users." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1328 msgid "" "When found on a versioned directory, the <literal>svn:ignore</literal> " "property is expected to contain a list of newline-delimited file patterns " "that Subversion should use to determine ignorable objects in that same " "directory. These patterns do not override those found in the " "<literal>global-ignores</literal> runtime configuration option, but are " "instead appended to that list. And it's worth noting again that, unlike the " "<literal>global-ignores</literal> option, the patterns found in the " "<literal>svn:ignore</literal> property apply only to the directory on which " "that property is set, and not to any of its subdirectories. The " "<literal>svn:ignore</literal> property is a good way to tell Subversion to " "ignore files that are likely to be present in every user's working copy of " "that directory, such as compiler output or—to use an example more " "appropriate to this book—the HTML, PDF, or PostScript files generated " "as the result of a conversion of some source DocBook XML files to a more " "legible output format." msgstr "" # type: Content of: <chapter><sect1><note><para> #: ../en/book/ch03-advanced-topics.xml:1348 msgid "" "Subversion's support for ignorable file patterns extends only to the one-" "time process of adding unversioned files and directories to version " "control. Once an object is under Subversion's control, the ignore pattern " "mechanisms no longer apply to it. In other words, don't expect Subversion " "to avoid committing changes you've made to a versioned file simply because " "that file's name matches an ignore pattern—Subversion " "<emphasis>always</emphasis> notices all of its versioned objects." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:1360 msgid "Ignore Patterns for CVS Users" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1362 msgid "" "The Subversion <literal>svn:ignore</literal> property is very similar in " "syntax and function to the CVS <filename>.cvsignore</filename> file. In " "fact, if you are migrating a CVS working copy to Subversion, you can " "directly migrate the ignore patterns by using the <filename>.cvsignore</" "filename> file as input file to the <command>svn propset</command> command:" msgstr "" # type: Content of: <chapter><sect1><sidebar><screen> #: ../en/book/ch03-advanced-topics.xml:1370 #, no-wrap msgid "" "\n" "$ svn propset svn:ignore -F .cvsignore .\n" "property 'svn:ignore' set on '.'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1376 msgid "" "There are, however, some differences in the ways that CVS and Subversion " "handle ignore patterns. The two systems use the ignore patterns at some " "different times, and there are slight discrepancies in what the ignore " "patterns apply to. Also, Subversion does not recognize the use of the " "<literal>!</literal> pattern as a reset back to having no ignore patterns at " "all." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1386 msgid "" "The global list of ignore patterns tends to be more a matter of personal " "taste and ties more closely to a user's particular tool chain than to the " "details of any particular working copy's needs. So, the rest of this " "section will focus on the <literal>svn:ignore</literal> property and its " "uses." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1393 msgid "Say you have the following output from <command>svn status</command>:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1396 #, no-wrap msgid "" "\n" "$ svn status calc\n" " M calc/button.c\n" "? calc/calculator\n" "? calc/data.c\n" "? calc/debug_log\n" "? calc/debug_log.1\n" "? calc/debug_log.2.gz\n" "? calc/debug_log.3.gz\n" msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:1407 msgid "" "In this example, you have made some property modifications to " "<filename>button.c</filename>, but in your working copy, you also have some " "unversioned files: the latest <filename>calculator</filename> program that " "you've compiled from your source code, a source file named <filename>data.c</" "filename>, and a set of debugging output logfiles. Now, you know that your " "build system always results in the <filename>calculator</filename> program " "being generated. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:1416 msgid "Isn't that the whole point of a build system?" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1417 msgid "" "</footnote> And you know that your test suite always leaves those debugging " "logfiles lying around. These facts are true for all working copies of this " "project, not just your own. And you know that you aren't interested in " "seeing those things every time you run <command>svn status</command>, and " "you are pretty sure that nobody else is interested in them either. So you " "use <userinput>svn propedit svn:ignore calc</userinput> to add some ignore " "patterns to the <filename>calc</filename> directory. For example, you might " "add this as the new value of the <literal>svn:ignore</literal> property:" msgstr "" # type: Content of: <chapter><sect1><programlisting> #: ../en/book/ch03-advanced-topics.xml:1429 #, no-wrap msgid "" "\n" "calculator\n" "debug_log*\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1434 msgid "" "After you've added this property, you will now have a local property " "modification on the <filename>calc</filename> directory. But notice what " "else is different about your <command>svn status</command> output:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1439 #, no-wrap msgid "" "\n" "$ svn status\n" " M calc\n" " M calc/button.c\n" "? calc/data.c\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1446 msgid "" "Now, all that cruft is missing from the output! Your <filename>calculator</" "filename> compiled program and all those logfiles are still in your working " "copy; Subversion just isn't constantly reminding you that they are present " "and unversioned. And now with all the uninteresting noise removed from the " "display, you are left with more intriguing items—such as that source " "code file <filename>data.c</filename> that you probably forgot to add to " "version control." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1455 msgid "" "Of course, this less-verbose report of your working copy status isn't the " "only one available. If you actually want to see the ignored files as part " "of the status report, you can pass the <option>--no-ignore</option> option " "to Subversion:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1460 #, no-wrap msgid "" "\n" "$ svn status --no-ignore\n" " M calc\n" " M calc/button.c\n" "I calc/calculator\n" "? calc/data.c\n" "I calc/debug_log\n" "I calc/debug_log.1\n" "I calc/debug_log.2.gz\n" "I calc/debug_log.3.gz\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1472 msgid "" "As mentioned earlier, the list of file patterns to ignore is also used by " "<command>svn add</command> and <command>svn import</command>. Both of these " "operations involve asking Subversion to begin managing some set of files and " "directories. Rather than force the user to pick and choose which files in a " "tree she wishes to start versioning, Subversion uses the ignore " "patterns—both the global and the per-directory lists—to " "determine which files should not be swept into the version control system as " "part of a larger recursive addition or import operation. And here again, " "you can use the <option>--no-ignore</option> option to tell Subversion " "ignore its ignores list and operate on all the files and directories present." msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch03-advanced-topics.xml:1487 msgid "" "Even if <literal>svn:ignore</literal> is set, you may run into problems if " "you use shell wildcards in a command. Shell wildcards are expanded into an " "explicit list of targets before Subversion operates on them, so running " "<userinput>svn <replaceable>SUBCOMMAND</replaceable> *</userinput> is just " "like running <userinput>svn <replaceable>SUBCOMMAND</replaceable> file1 " "file2 file3 …</userinput>. In the case of the <command>svn add</" "command> command, this has an effect similar to passing the <option>--no-" "ignore</option> option. So instead of using a wildcard, use <userinput>svn " "add --force .</userinput> to do a bulk scheduling of unversioned things for " "addition. The explicit target will ensure that the current directory isn't " "overlooked because of being already under version control, and the <option>--" "force</option> option will cause Subversion to crawl through that directory, " "adding unversioned files while still honoring the <literal>svn:ignore</" "literal> property and <literal>global-ignores</literal> runtime " "configuration variable. Be sure to also provide the <option>--depth files</" "option> option to the <command>svn add</command> command if you don't want a " "fully recursive crawl for things to add." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:1518 msgid "Keyword Substitution" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1520 msgid "" "Subversion has the ability to substitute <firstterm>keywords</" "firstterm>—pieces of useful, dynamic information about a versioned " "file—into the contents of the file itself. Keywords generally provide " "information about the last modification made to the file. Because this " "information changes each time the file changes, and more importantly, just " "<emphasis>after</emphasis> the file changes, it is a hassle for any process " "except the version control system to keep the data completely up to date. " "Left to human authors, the information would inevitably grow stale." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1532 msgid "" "For example, say you have a document in which you would like to display the " "last date on which it was modified. You could burden every author of that " "document to, just before committing their changes, also tweak the part of " "the document that describes when it was last changed. But sooner or later, " "someone would forget to do that. Instead, simply ask Subversion to perform " "keyword substitution on the <literal>LastChangedDate</literal> keyword. You " "control where the keyword is inserted into your document by placing a " "<firstterm>keyword anchor</firstterm> at the desired location in the file. " "This anchor is just a string of text formatted as <literal>$</" "literal><replaceable>KeywordName</replaceable><literal>$</literal>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1546 msgid "" "All keywords are case-sensitive where they appear as anchors in files: you " "must use the correct capitalization for the keyword to be expanded. You " "should consider the value of the <literal>svn:keywords</literal> property to " "be case-sensitive, too—certain keyword names will be recognized " "regardless of case, but this behavior is deprecated." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1553 msgid "" "Subversion defines the list of keywords available for substitution. That " "list contains the following five keywords, some of which have aliases that " "you can also use:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1559 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>Date</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1561 msgid "" "This keyword describes the last time the file was known to have been changed " "in the repository, and is of the form <literal>$Date: 2006-07-22 21:42:37 -" "0700 (Sat, 22 Jul 2006) $</literal>. It may also be specified as " "<literal>LastChangedDate</literal>. Unlike the <literal>Id</literal> " "keyword, which uses UTC, the <literal>Date</literal> keyword displays dates " "using the local time zone." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1572 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>Revision</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1574 msgid "" "This keyword describes the last known revision in which this file changed in " "the repository, and looks something like <literal>$Revision: 144 $</" "literal>. It may also be specified as <literal>LastChangedRevision</" "literal> or <literal>Rev</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1583 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>Author</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1585 msgid "" "This keyword describes the last known user to change this file in the " "repository, and looks something like <literal>$Author: harry $</literal>. " "It may also be specified as <literal>LastChangedBy</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1593 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>HeadURL</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1595 msgid "" "This keyword describes the full URL to the latest version of the file in the " "repository, and looks something like <literal>$HeadURL: http://svn.collab." "net/repos/trunk/README $</literal>. It may be abbreviated as <literal>URL</" "literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1604 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>Id</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1606 msgid "" "This keyword is a compressed combination of the other keywords. Its " "substitution looks something like <literal>$Id: calc.c 148 2006-07-28 " "21:30:43Z sally $</literal>, and is interpreted to mean that the file " "<filename>calc.c</filename> was last changed in revision 148 on the evening " "of July 28, 2006 by the user <literal>sally</literal>. The date displayed " "by this keyword is in UTC, unlike that of the <literal>Date</literal> " "keyword (which uses the local time zone)." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1620 msgid "" "Several of the preceding descriptions use the phrase <quote>last known</" "quote> or similar wording. Keep in mind that keyword expansion is a client-" "side operation, and your client <quote>knows</quote> only about changes that " "have occurred in the repository when you update your working copy to include " "those changes. If you never update your working copy, your keywords will " "never expand to different values even if those versioned files are being " "changed regularly in the repository." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:1630 msgid "" "Simply adding keyword anchor text to your file does nothing special. " "Subversion will never attempt to perform textual substitutions on your file " "contents unless explicitly asked to do so. After all, you might be writing " "a document <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:1636 msgid "… or maybe even a section of a book …" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1637 msgid "" "</footnote> about how to use keywords, and you don't want Subversion to " "substitute your beautiful examples of unsubstituted keyword anchors!" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1642 msgid "" "To tell Subversion whether to substitute keywords on a particular file, we " "again turn to the property-related subcommands. The <literal>svn:keywords</" "literal> property, when set on a versioned file, controls which keywords " "will be substituted on that file. The value is a space-delimited list of " "keyword names or aliases." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1649 msgid "" "For example, say you have a versioned file named <filename>weather.txt</" "filename> that looks like this:" msgstr "" # type: Content of: <chapter><sect1><programlisting> #: ../en/book/ch03-advanced-topics.xml:1653 #, no-wrap msgid "" "\n" "Here is the latest report from the front lines.\n" "$LastChangedDate$\n" "$Rev$\n" "Cumulus clouds are appearing more frequently as summer approaches.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1660 msgid "" "With no <literal>svn:keywords</literal> property set on that file, " "Subversion will do nothing special. Now, let's enable substitution of the " "<literal>LastChangedDate</literal> keyword." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1665 #, no-wrap msgid "" "\n" "$ svn propset svn:keywords \"Date Author\" weather.txt\n" "property 'svn:keywords' set on 'weather.txt'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1671 msgid "" "Now you have made a local property modification on the <filename>weather." "txt</filename> file. You will see no changes to the file's contents (unless " "you made some of your own prior to setting the property). Notice that the " "file contained a keyword anchor for the <literal>Rev</literal> keyword, yet " "we did not include that keyword in the property value we set. Subversion " "will happily ignore requests to substitute keywords that are not present in " "the file and will not substitute keywords that are not present in the " "<literal>svn:keywords</literal> property value." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1682 msgid "" "Immediately after you commit this property change, Subversion will update " "your working file with the new substitute text. Instead of seeing your " "keyword anchor <literal>$LastChangedDate$</literal>, you'll see its " "substituted result. That result also contains the name of the keyword and " "continues to be delimited by the dollar sign (<literal>$</literal>) " "characters. And as we predicted, the <literal>Rev</literal> keyword was not " "substituted because we didn't ask for it to be." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1692 msgid "" "Note also that we set the <literal>svn:keywords</literal> property to " "<literal>Date Author</literal>, yet the keyword anchor used the alias " "<literal>$LastChangedDate$</literal> and still expanded correctly:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1697 #, no-wrap msgid "" "\n" "Here is the latest report from the front lines.\n" "$LastChangedDate: 2006-07-22 21:42:37 -0700 (Sat, 22 Jul 2006) $\n" "$Rev$\n" "Cumulus clouds are appearing more frequently as summer approaches.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1704 msgid "" "If someone else now commits a change to <filename>weather.txt</filename>, " "your copy of that file will continue to display the same substituted keyword " "value as before—until you update your working copy. At that time, the " "keywords in your <filename>weather.txt</filename> file will be resubstituted " "with information that reflects the most recent known commit to that file." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:1713 msgid "Where's $GlobalRev$?" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1715 msgid "" "New users are often confused by how the <literal>$Rev$</literal> keyword " "works. Since the repository has a single, globally increasing revision " "number, many people assume that it is this number that is reflected by the " "<literal>$Rev$</literal> keyword's value. But <literal>$Rev$</literal> " "expands to show the last revision in which the file <emphasis>changed</" "emphasis>, not the last revision to which it was updated. Understanding " "this clears the confusion, but frustration often remains—without the " "support of a Subversion keyword to do so, how can you automatically get the " "global revision number into your files?" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1728 msgid "" "To do this, you need external processing. Subversion ships with a tool " "called <command>svnversion</command>, which was designed for just this " "purpose. It crawls your working copy and generates as output the revision" "(s) it finds. You can use this program, plus some additional tooling, to " "embed that revision information into your files. For more information on " "<command>svnversion</command>, see <xref linkend=\"svn.ref.svnversion\"/>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1739 msgid "" "Subversion 1.2 introduced a new variant of the keyword syntax, which brought " "additional, useful—though perhaps atypical—functionality. You " "can now tell Subversion to maintain a fixed length (in terms of the number " "of bytes consumed) for the substituted keyword. By using a double colon " "(<literal>::</literal>) after the keyword name, followed by a number of " "space characters, you define that fixed width. When Subversion goes to " "substitute your keyword for the keyword and its value, it will essentially " "replace only those space characters, leaving the overall width of the " "keyword field unchanged. If the substituted value is shorter than the " "defined field width, there will be extra padding characters (spaces) at the " "end of the substituted field; if it is too long, it is truncated with a " "special hash (<literal>#</literal>) character just before the final dollar " "sign terminator." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1756 msgid "" "For example, say you have a document in which you have some section of " "tabular data reflecting the document's Subversion keywords. Using the " "original Subversion keyword substitution syntax, your file might look " "something like:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1762 #, no-wrap msgid "" "\n" "$Rev$: Revision of last commit\n" "$Author$: Author of last commit\n" "$Date$: Date of last commit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1768 msgid "" "Now, that looks nice and tabular at the start of things. But when you then " "commit that file (with keyword substitution enabled, of course), you see:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1772 #, no-wrap msgid "" "\n" "$Rev: 12 $: Revision of last commit\n" "$Author: harry $: Author of last commit\n" "$Date: 2006-03-15 02:33:03 -0500 (Wed, 15 Mar 2006) $: Date of last commit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1778 msgid "" "The result is not so beautiful. And you might be tempted to then adjust the " "file after the substitution so that it again looks tabular. But that holds " "only as long as the keyword values are the same width. If the last " "committed revision rolls into a new place value (say, from 99 to 100), or if " "another person with a longer username commits the file, stuff gets all " "crooked again. However, if you are using Subversion 1.2 or later, you can " "use the new fixed-length keyword syntax and define some field widths that " "seem sane, so your file might look like this:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1789 #, no-wrap msgid "" "\n" "$Rev:: $: Revision of last commit\n" "$Author:: $: Author of last commit\n" "$Date:: $: Date of last commit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1795 msgid "" "You commit this change to your file. This time, Subversion notices the new " "fixed-length keyword syntax and maintains the width of the fields as defined " "by the padding you placed between the double colon and the trailing dollar " "sign. After substitution, the width of the fields is completely " "unchanged—the short values for <literal>Rev</literal> and " "<literal>Author</literal> are padded with spaces, and the long " "<literal>Date</literal> field is truncated by a hash character:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1805 #, no-wrap msgid "" "\n" "$Rev:: 13 $: Revision of last commit\n" "$Author:: harry $: Author of last commit\n" "$Date:: 2006-03-15 0#$: Date of last commit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1811 msgid "" "The use of fixed-length keywords is especially handy when performing " "substitutions into complex file formats that themselves use fixed-length " "fields for data, or for which the stored size of a given data field is " "overbearingly difficult to modify from outside the format's native " "application (such as for Microsoft Office documents)." msgstr "" # type: Content of: <chapter><sect1><warning><para> #: ../en/book/ch03-advanced-topics.xml:1819 msgid "" "Be aware that because the width of a keyword field is measured in bytes, the " "potential for corruption of multibyte values exists. For example, a " "username that contains some multibyte UTF-8 characters might suffer " "truncation in the middle of the string of bytes that make up one of those " "characters. The result will be a mere truncation when viewed at the byte " "level, but will likely appear as a string with an incorrect or garbled final " "character when viewed as UTF-8 text. It is conceivable that certain " "applications, when asked to load the file, would notice the broken UTF-8 " "text and deem the entire file corrupt, refusing to operate on the file " "altogether. So, when limiting keywords to a fixed size, choose a size that " "allows for this type of byte-wise expansion." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:1842 msgid "Sparse Directories" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1844 msgid "" "By default, most Subversion operations on directories act in a recursive " "manner. For example, <command>svn checkout</command> creates a working copy " "with every file and directory in the specified area of the repository, " "descending recursively through the repository tree until the entire " "structure is copied to your local disk. Subversion 1.5 introduces a feature " "called <firstterm>sparse directories</firstterm> (or <firstterm>shallow " "checkouts</firstterm>) that allows you to easily check out a working " "copy—or a portion of a working copy—more shallowly than full " "recursion, with the freedom to bring in previously ignored files and " "subdirectories at a later time." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1858 msgid "" "For example, say we have a repository with a tree of files and directories " "with names of the members of a human family with pets. (It's an odd " "example, to be sure, but bear with us.) A regular <command>svn checkout</" "command> operation will give us a working copy of the whole tree:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1864 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos mom\n" "A mom/son\n" "A mom/son/grandson\n" "A mom/daughter\n" "A mom/daughter/granddaughter1\n" "A mom/daughter/granddaughter1/bunny1.txt\n" "A mom/daughter/granddaughter1/bunny2.txt\n" "A mom/daughter/granddaughter2\n" "A mom/daughter/fishie.txt\n" "A mom/kitty1.txt\n" "A mom/doggie1.txt\n" "Checked out revision 1.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1880 msgid "" "Now, let's check out the same tree again, but this time we'll ask Subversion " "to give us only the topmost directory with none of its children at all:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1884 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos mom-empty --depth empty\n" "Checked out revision 1\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1890 msgid "" "Notice that we added to our original <command>svn checkout</command> command " "line a new <option>--depth</option> option. This option is present on many " "of Subversion's subcommands and is similar to the <option>--non-recursive</" "option> (<option>-N</option>) and <option>--recursive</option> (<option>-R</" "option>) options. In fact, it combines, improves upon, supercedes, and " "ultimately obsoletes these two older options. For starters, it expands the " "supported degrees of depth specification available to users, adding some " "previously unsupported (or inconsistently supported) depths. Here are the " "depth values that you can request for a given Subversion operation:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1906 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>--depth empty</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1908 msgid "" "Include only the immediate target of the operation, not any of its file or " "directory children." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1914 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>--depth files</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1916 msgid "" "Include the immediate target of the operation and any of its immediate file " "children." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1922 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>--depth immediates</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1924 msgid "" "Include the immediate target of the operation and any of its immediate file " "or directory children. The directory children will themselves be empty." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1931 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>--depth infinity</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1933 msgid "" "Include the immediate target, its file and directory children, its " "children's children, and so on to full recursion." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1941 msgid "" "Of course, merely combining two existing options into one hardly constitutes " "a new feature worthy of a whole section in our book. Fortunately, there is " "more to this story. This idea of depth extends not just to the operations " "you perform with your Subversion client, but also as a description of a " "working copy citizen's <firstterm>ambient depth</firstterm>, which is the " "depth persistently recorded by the working copy for that item. Its key " "strength is this very persistence—the fact that it is " "<firstterm>sticky</firstterm>. The working copy remembers the depth you've " "selected for each item in it until you later change that depth selection; by " "default, Subversion commands operate on the working copy citizens present, " "regardless of their selected depth settings." msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch03-advanced-topics.xml:1956 msgid "" "You can check the recorded ambient depth of a working copy using the " "<command>svn info</command> command. If the ambient depth is anything other " "than infinite recursion, <command>svn info</command> will display a line " "describing that depth value:" msgstr "" # type: Content of: <chapter><sect1><tip><screen> #: ../en/book/ch03-advanced-topics.xml:1962 #, no-wrap msgid "" "\n" "$ svn info mom-immediates | grep '^Depth:'\n" "Depth: immediates\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1969 msgid "" "Our previous examples demonstrated checkouts of infinite depth (the default " "for <command>svn checkout</command>) and empty depth. Let's look now at " "examples of the other depth values:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1974 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos mom-files --depth files\n" "A mom-files/kitty1.txt\n" "A mom-files/doggie1.txt\n" "Checked out revision 1.\n" "$ svn checkout file:///var/svn/repos mom-immediates --depth immediates\n" "A mom-immediates/son\n" "A mom-immediates/daughter\n" "A mom-immediates/kitty1.txt\n" "A mom-immediates/doggie1.txt\n" "Checked out revision 1.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1988 msgid "" "As described, each of these depths is something more than only the target, " "but something less than full recursion." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1991 msgid "" "We've used <command>svn checkout</command> as an example here, but you'll " "find the <option>--depth</option> option present on many other Subversion " "commands, too. In those other commands, depth specification is a way to " "limit the scope of an operation to some depth, much like the way the older " "<option>--non-recursive</option> (<option>-N</option>) and <option>--" "recursive</option> (<option>-R</option>) options behave. This means that " "when operating on a working copy of some depth, while requesting an " "operation of a shallower depth, the operation is limited to that shallower " "depth. In fact, we can make an even more general statement: given a working " "copy of any arbitrary—even mixed—ambient depth, and a Subversion " "command with some requested operational depth, the command will maintain the " "ambient depth of the working copy members while still limiting the scope of " "the operation to the requested (or default) operational depth." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2008 msgid "" "In addition to the <option>--depth</option> option, the <command>svn update</" "command> and <command>svn switch</command> subcommands also accept a second " "depth-related option: <option>--set-depth</option>. It is with this option " "that you can change the sticky depth of a working copy item. Watch what " "happens as we take our empty-depth checkout and gradually telescope it " "deeper using <userinput>svn update --set-depth <replaceable>NEW-DEPTH</" "replaceable> <replaceable>TARGET</replaceable></userinput>:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2017 #, no-wrap msgid "" "\n" "$ svn update --set-depth files mom-empty\n" "A mom-empty/kittie1.txt\n" "A mom-empty/doggie1.txt\n" "Updated to revision 1.\n" "$ svn update --set-depth immediates mom-empty\n" "A mom-empty/son\n" "A mom-empty/daughter\n" "Updated to revision 1.\n" "$ svn update --set-depth infinity mom-empty\n" "A mom-empty/son/grandson\n" "A mom-empty/daughter/granddaughter1\n" "A mom-empty/daughter/granddaughter1/bunny1.txt\n" "A mom-empty/daughter/granddaughter1/bunny2.txt\n" "A mom-empty/daughter/granddaughter2\n" "A mom-empty/daughter/fishie1.txt\n" "Updated to revision 1.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2037 msgid "" "As we gradually increased our depth selection, the repository gave us more " "pieces of our tree." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2040 msgid "" "In our example, we operated only on the root of our working copy, changing " "its ambient depth value. But we can independently change the ambient depth " "value of <emphasis>any</emphasis> subdirectory inside the working copy, " "too. Careful use of this ability allows us to flesh out only certain " "portions of the working copy tree, leaving other portions absent altogether " "(hence the <quote>sparse</quote> bit of the feature's name). Here's an " "example of how we might build out a portion of one branch of our family's " "tree, enable full recursion on another branch, and keep still other pieces " "pruned (absent from disk)." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2052 #, no-wrap msgid "" "\n" "$ rm -rf mom-empty\n" "$ svn checkout file:///var/svn/repos mom-empty --depth empty\n" "Checked out revision 1.\n" "$ svn update --set-depth empty mom-empty/son\n" "A mom-empty/son\n" "Updated to revision 1.\n" "$ svn update --set-depth empty mom-empty/daughter\n" "A mom-empty/daughter\n" "Updated to revision 1.\n" "$ svn update --set-depth infinity mom-empty/daughter/granddaughter1\n" "A mom-empty/daughter/granddaughter1\n" "A mom-empty/daughter/granddaughter1/bunny1.txt\n" "A mom-empty/daughter/granddaughter1/bunny2.txt\n" "Updated to revision 1.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2070 msgid "" "Fortunately, having a complex collection of ambient depths in a single " "working copy doesn't complicate the way you interact with that working " "copy. You can still make, revert, display, and commit local modifications " "in your working copy without providing any new options (including <option>--" "depth</option> and <option>--set-depth</option>) to the relevant " "subcommands. Even <command>svn update</command> works as it does elsewhere " "when no specific depth is provided—it updates the working copy targets " "that are present while honoring their sticky depths." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2081 msgid "" "You might at this point be wondering, <quote>So what? When would I use this?" "</quote> One scenario where this feature finds utility is tied to a " "particular repository layout, specifically where you have many related or " "codependent projects or software modules living as siblings in a single " "repository location (<filename>trunk/project1</filename>, <filename>trunk/" "project2</filename>, <filename>trunk/project3</filename>, etc.). In such " "scenarios, it might be the case that you personally care about only a " "handful of those projects—maybe some primary project and a few other " "modules on which it depends. You can check out individual working copies of " "all of these things, but those working copies are disjoint and, as a result, " "it can be cumbersome to perform operations across several or all of them at " "the same time. The alternative is to use the sparse directories feature, " "building out a single working copy that contains only the modules you care " "about. You'd start with an empty-depth checkout of the common parent " "directory of the projects, and then update with infinite depth only the " "items you wish to have, like we demonstrated in the previous example. Think " "of it like an opt-in system for working copy citizens." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2104 msgid "" "Subversion 1.5's implementation of shallow checkouts is good but does not " "support a couple of interesting behaviors. First, you cannot de-telescope a " "working copy item. Running <userinput>svn update --set-depth empty</" "userinput> in an infinite-depth working copy will not have the effect of " "discarding everything but the topmost directory—it will simply error " "out. Second, there is no depth value to indicate that you wish an item to " "be explicitly excluded. You have to do implicit exclusion of an item by " "including everything else." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:2121 msgid "Locking" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2123 msgid "" "Subversion's copy-modify-merge version control model lives and dies on its " "data merging algorithms—specifically on how well those algorithms " "perform when trying to resolve conflicts caused by multiple users modifying " "the same file concurrently. Subversion itself provides only one such " "algorithm: a three-way differencing algorithm that is smart enough to handle " "data at a granularity of a single line of text. Subversion also allows you " "to supplement its content merge processing with external differencing " "utilities (as described in <xref linkend=\"svn.advanced.externaldifftools." "diff3\" />), some of which may do an even better job, perhaps providing " "granularity of a word or a single character of text. But common among those " "algorithms is that they generally work only on text files. The landscape " "starts to look pretty grim when you start talking about content merges of " "nontextual file formats. And when you can't find a tool that can handle " "that type of merging, you begin to run into problems with the copy-modify-" "merge model." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2142 msgid "" "Let's look at a real-life example of where this model runs aground. Harry " "and Sally are both graphic designers working on the same project, a bit of " "marketing collateral for an automobile mechanic. Central to the design of a " "particular poster is an image of a car in need of some bodywork, stored in a " "file using the PNG image format. The poster's layout is almost finished, " "and both Harry and Sally are pleased with the particular photo they chose " "for their damaged car—a baby blue 1967 Ford Mustang with an " "unfortunate bit of crumpling on the left front fender." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2153 msgid "" "Now, as is common in graphic design work, there's a change in plans, which " "causes the car's color to be a concern. So Sally updates her working copy " "to <literal>HEAD</literal>, fires up her photo-editing software, and sets " "about tweaking the image so that the car is now cherry red. Meanwhile, " "Harry, feeling particularly inspired that day, decides that the image would " "have greater impact if the car also appears to have suffered greater " "impact. He, too, updates to <literal>HEAD</literal>, and then draws some " "cracks on the vehicle's windshield. He manages to finish his work before " "Sally finishes hers, and after admiring the fruits of his undeniable talent, " "he commits the modified image. Shortly thereafter, Sally is finished with " "the car's new finish and tries to commit her changes. But, as expected, " "Subversion fails the commit, informing Sally that her version of the image " "is now out of date." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2169 msgid "" "Here's where the difficulty sets in. If Harry and Sally were making changes " "to a text file, Sally would simply update her working copy, receiving " "Harry's changes in the process. In the worst possible case, they would have " "modified the same region of the file, and Sally would have to work out by " "hand the proper resolution to the conflict. But these aren't text " "files—they are binary images. And while it's a simple matter to " "describe what one would expect the results of this content merge to be, " "there is precious little chance that any software exists that is smart " "enough to examine the common baseline image that each of these graphic " "artists worked against, the changes that Harry made, and the changes that " "Sally made, and then spit out an image of a busted-up red Mustang with a " "cracked windshield!" msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:2184 msgid "" "Of course, things would have gone more smoothly if Harry and Sally had " "serialized their modifications to the image—if, say, Harry had waited " "to draw his windshield cracks on Sally's now-red car, or if Sally had " "tweaked the color of a car whose windshield was already cracked. As is " "discussed in <xref linkend=\"svn.basic.vsn-models.copy-merge\" />, most of " "these types of problems go away entirely where perfect communication between " "Harry and Sally exists. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:2193 msgid "" "Communication wouldn't have been such bad medicine for Harry and Sally's " "Hollywood namesakes, either, for that matter." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2196 msgid "" "</footnote> But as one's version control system is, in fact, one form of " "communication, it follows that having that software facilitate the " "serialization of nonparallelizable editing efforts is no bad thing. This is " "where Subversion's implementation of the lock-modify-unlock model steps into " "the spotlight. This is where we talk about Subversion's <firstterm>locking</" "firstterm> feature, which is similar to the <quote>reserved checkouts</" "quote> mechanisms of other version control systems." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2207 msgid "" "Subversion's locking feature exists ultimately to minimize wasted time and " "effort. By allowing a user to programmatically claim the exclusive right to " "change a file in the repository, that user can be reasonably confident that " "any energy he invests on unmergeable changes won't be wasted—his " "commit of those changes will succeed. Also, because Subversion communicates " "to other users that serialization is in effect for a particular versioned " "object, those users can reasonably expect that the object is about to be " "changed by someone else. They, too, can then avoid wasting their time and " "energy on unmergeable changes that won't be committable due to eventual out-" "of-dateness." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:2220 msgid "" "When referring to Subversion's locking feature, one is actually talking " "about a fairly diverse collection of behaviors, which include the ability to " "lock a versioned file <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:2224 msgid "Subversion does not currently allow locks on directories." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2225 msgid "" "</footnote> (claiming the exclusive right to modify the file), to unlock " "that file (yielding that exclusive right to modify), to see reports about " "which files are locked and by whom, to annotate files for which locking " "before editing is strongly advised, and so on. In this section, we'll cover " "all of these facets of the larger locking feature." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar> #: ../en/book/ch03-advanced-topics.xml:2233 #, fuzzy #| msgid "<sidebar id=\"svn.basic.in-action.wc.sb-1\">" msgid "<sidebar id=\"svn.advanced.locking.meanings\">" msgstr "<sidebar id=\"svn.basic.in-action.wc.sb-1\">" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:2234 msgid "The Three Meanings of <quote>Lock</quote>" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2236 msgid "" "In this section, and almost everywhere in this book, the words <quote>lock</" "quote> and <quote>locking</quote> describe a mechanism for mutual exclusion " "between users to avoid clashing commits. Unfortunately, there are two other " "sorts of <quote>lock</quote> with which Subversion, and therefore this book, " "sometimes needs to be concerned." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2243 msgid "" "The second is <firstterm>working copy locks</firstterm>, used internally by " "Subversion to prevent clashes between multiple Subversion clients operating " "on the same working copy. This is the sort of lock indicated by an " "<computeroutput>L</computeroutput> in the third column of <command>svn " "status</command> output, and removed by the <command>svn cleanup</command> " "command, as described in <xref linkend=\"svn.tour.cleanup\"/>." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2252 msgid "" "Third, there are <firstterm>database locks</firstterm>, used internally by " "the Berkeley DB backend to prevent clashes between multiple programs trying " "to access the database. This is the sort of lock whose unwanted persistence " "after an error can cause a repository to be <quote>wedged,</quote> as " "described in <xref linkend=\"svn.reposadmin.maint.recovery\" />." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2260 msgid "" "You can generally forget about these other kinds of locks until something " "goes wrong that requires you to care about them. In this book, <quote>lock</" "quote> means the first sort unless the contrary is either clear from context " "or explicitly stated." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:2270 msgid "Creating Locks" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2272 msgid "" "In the Subversion repository, a <firstterm>lock</firstterm> is a piece of " "metadata that grants exclusive access to one user to change a file. This " "user is said to be the <firstterm>lock owner</firstterm>. Each lock also " "has a unique identifier, typically a long string of characters, known as the " "<firstterm>lock token</firstterm>. The repository manages locks, ultimately " "handling their creation, enforcement, and removal. If any commit " "transaction attempts to modify or delete a locked file (or delete one of the " "parent directories of the file), the repository will demand two pieces of " "information—that the client performing the commit be authenticated as " "the lock owner, and that the lock token has been provided as part of the " "commit process as a form of proof that the client knows which lock it is " "using." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2288 msgid "" "To demonstrate lock creation, let's refer back to our example of multiple " "graphic designers working on the same binary image files. Harry has decided " "to change a JPEG image. To prevent other people from committing changes to " "the file while he is modifying it (as well as alerting them that he is about " "to change it), he locks the file in the repository using the <command>svn " "lock</command> command." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2296 #, no-wrap msgid "" "\n" "$ svn lock banana.jpg -m \"Editing file for tomorrow's release.\"\n" "'banana.jpg' locked by user 'harry'.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2302 msgid "" "The preceding example demonstrates a number of new things. First, notice " "that Harry passed the <option>--message</option> (<option>-m</option>) " "option to <command>svn lock</command>. Similar to <command>svn commit</" "command>, the <command>svn lock</command> command can take comments—" "via either <option>--message</option> (<option>-m</option>) or <option>--" "file</option> (<option>-F</option>)—to describe the reason for locking " "the file. Unlike <command>svn commit</command>, however, <command>svn lock</" "command> will not demand a message by launching your preferred text editor. " "Lock comments are optional, but still recommended to aid communication." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2315 msgid "" "Second, the lock attempt succeeded. This means that the file wasn't already " "locked, and that Harry had the latest version of the file. If Harry's " "working copy of the file had been out of date, the repository would have " "rejected the request, forcing Harry to <command>svn update</command> and " "reattempt the locking command. The locking command would also have failed " "if the file had already been locked by someone else." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2324 msgid "" "As you can see, the <command>svn lock</command> command prints confirmation " "of the successful lock. At this point, the fact that the file is locked " "becomes apparent in the output of the <command>svn status</command> and " "<command>svn info</command> reporting subcommands." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2330 #, no-wrap msgid "" "\n" "$ svn status\n" " K banana.jpg\n" "\n" "$ svn info banana.jpg\n" "Path: banana.jpg\n" "Name: banana.jpg\n" "URL: http://svn.example.com/repos/project/banana.jpg\n" "Repository UUID: edb2f264-5ef2-0310-a47a-87b0ce17a8ec\n" "Revision: 2198\n" "Node Kind: file\n" "Schedule: normal\n" "Last Changed Author: frank\n" "Last Changed Rev: 1950\n" "Last Changed Date: 2006-03-15 12:43:04 -0600 (Wed, 15 Mar 2006)\n" "Text Last Updated: 2006-06-08 19:23:07 -0500 (Thu, 08 Jun 2006)\n" "Properties Last Updated: 2006-06-08 19:23:07 -0500 (Thu, 08 Jun 2006)\n" "Checksum: 3b110d3b10638f5d1f4fe0f436a5a2a5\n" "Lock Token: opaquelocktoken:0c0f600b-88f9-0310-9e48-355b44d4a58e\n" "Lock Owner: harry\n" "Lock Created: 2006-06-14 17:20:31 -0500 (Wed, 14 Jun 2006)\n" "Lock Comment (1 line):\n" "Editing file for tomorrow's release.\n" "\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2357 msgid "" "The fact that the <command>svn info</command> command, which does not " "contact the repository when run against working copy paths, can display the " "lock token reveals an important piece of information about those tokens: " "they are cached in the working copy. The presence of the lock token is " "critical. It gives the working copy authorization to make use of the lock " "later on. Also, the <command>svn status</command> command shows a " "<literal>K</literal> next to the file (short for locKed), indicating that " "the lock token is present." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:2368 msgid "Regarding Lock Tokens" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2370 msgid "" "A lock token isn't an authentication token, so much as an " "<emphasis>authorization</emphasis> token. The token isn't a protected " "secret. In fact, a lock's unique token is discoverable by anyone who runs " "<userinput>svn info <replaceable>URL</replaceable></userinput>. A lock " "token is special only when it lives inside a working copy. It's proof that " "the lock was created in that particular working copy, and not somewhere else " "by some other client. Merely authenticating as the lock owner isn't enough " "to prevent accidents." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2380 msgid "" "For example, suppose you lock a file using a computer at your office, but " "leave work for the day before you finish your changes to that file. It " "should not be possible to accidentally commit changes to that same file from " "your home computer later that evening simply because you've authenticated as " "the lock's owner. In other words, the lock token prevents one piece of " "Subversion-related software from undermining the work of another. (In our " "example, if you really need to change the file from an alternative working " "copy, you would need to <firstterm>break</firstterm> the lock and relock the " "file.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2394 msgid "" "Now that Harry has locked <filename>banana.jpg</filename>, Sally is unable " "to change or delete that file:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2397 #, no-wrap msgid "" "\n" "$ svn delete banana.jpg\n" "D banana.jpg\n" "$ svn commit -m \"Delete useless file.\"\n" "Deleting banana.jpg\n" "svn: Commit failed (details follow):\n" "svn: Server sent unexpected return value (423 Locked) in response to DELETE\\\n" " request for '/repos/project/!svn/wrk/64bad3a9-96f9-0310-818a-df4224ddc35d/\\\n" "banana.jpg'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2409 msgid "" "But Harry, after touching up the banana's shade of yellow, is able to commit " "his changes to the file. That's because he authenticates as the lock owner " "and also because his working copy holds the correct lock token:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2414 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit -F logmsg\n" #| "Sending sandwich.txt\n" #| "Transmitting file data .\n" #| "Committed revision 4.\n" msgid "" "\n" "$ svn status\n" "M K banana.jpg\n" "$ svn commit -m \"Make banana more yellow\"\n" "Sending banana.jpg\n" "Transmitting file data .\n" "Committed revision 2201.\n" "$ svn status\n" "$\n" msgstr "" "\n" "$ svn commit -F logmsg\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 4.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2425 msgid "" "Notice that after the commit is finished, <command>svn status</command> " "shows that the lock token is no longer present in the working copy. This is " "the standard behavior of <command>svn commit</command>—it searches the " "working copy (or list of targets, if you provide such a list) for local " "modifications and sends all the lock tokens it encounters during this walk " "to the server as part of the commit transaction. After the commit completes " "successfully, all of the repository locks that were mentioned are " "released—<emphasis>even on files that weren't committed</emphasis>. " "This is meant to discourage users from being sloppy about locking or from " "holding locks for too long. If Harry haphazardly locks 30 files in a " "directory named <filename>images</filename> because he's unsure of which " "files he needs to change, yet changes only four of those files, when he runs " "<userinput>svn commit images</userinput>, the process will still release all " "30 locks." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2443 msgid "" "This behavior of automatically releasing locks can be overridden with the " "<option>--no-unlock</option> option to <command>svn commit</command>. This " "is best used for those times when you want to commit changes, but still plan " "to make more changes and thus need to retain existing locks. You can also " "make this your default behavior by setting the <literal>no-unlock</literal> " "runtime configuration option (see <xref linkend=\"svn.advanced.confarea\" /" ">)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2452 msgid "" "Of course, locking a file doesn't oblige one to commit a change to it. The " "lock can be released at any time with a simple <command>svn unlock</command> " "command:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2456 #, no-wrap msgid "" "\n" "$ svn unlock banana.c\n" "'banana.c' unlocked.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:2465 msgid "Discovering Locks" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2467 msgid "" "When a commit fails due to someone else's locks, it's fairly easy to learn " "about them. The easiest way is to run <userinput>svn status --show-updates</" "userinput>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2471 #, no-wrap msgid "" "\n" "$ svn status -u\n" "M 23 bar.c\n" "M O 32 raisin.jpg\n" " * 72 foo.h\n" "Status against revision: 105\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2480 msgid "" "In this example, Sally can see not only that her copy of <filename>foo.h</" "filename> is out of date, but also that one of the two modified files she " "plans to commit is locked in the repository. The <literal>O</literal> " "symbol stands for <quote>Other,</quote> meaning that a lock exists on the " "file and was created by somebody else. If she were to attempt a commit, the " "lock on <filename>raisin.jpg</filename> would prevent it. Sally is left " "wondering who made the lock, when, and why. Once again, <command>svn info</" "command> has the answers:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2491 #, no-wrap msgid "" "\n" "$ svn info http://svn.example.com/repos/project/raisin.jpg\n" "Path: raisin.jpg\n" "Name: raisin.jpg\n" "URL: http://svn.example.com/repos/project/raisin.jpg\n" "Repository UUID: edb2f264-5ef2-0310-a47a-87b0ce17a8ec\n" "Revision: 105\n" "Node Kind: file\n" "Last Changed Author: sally\n" "Last Changed Rev: 32\n" "Last Changed Date: 2006-01-25 12:43:04 -0600 (Sun, 25 Jan 2006)\n" "Lock Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b\n" "Lock Owner: harry\n" "Lock Created: 2006-02-16 13:29:18 -0500 (Thu, 16 Feb 2006)\n" "Lock Comment (1 line):\n" "Need to make a quick tweak to this image.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2510 msgid "" "Just as you can use <command>svn info</command> to examine objects in the " "working copy, you can also use it to examine objects in the repository. If " "the main argument to <command>svn info</command> is a working copy path, " "then all of the working copy's cached information is displayed; any mention " "of a lock means that the working copy is holding a lock token (if a file is " "locked by another user or in another working copy, <command>svn info</" "command> on a working copy path will show no lock information at all). If " "the main argument to <command>svn info</command> is a URL, the information " "reflects the latest version of an object in the repository, and any mention " "of a lock describes the current lock on the object." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2524 msgid "" "So in this particular example, Sally can see that Harry locked the file on " "February 16 to <quote>make a quick tweak.</quote> It being June, she " "suspects that he probably forgot all about the lock. She might phone Harry " "to complain and ask him to release the lock. If he's unavailable, she might " "try to forcibly break the lock herself or ask an administrator to do so." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:2536 msgid "Breaking and Stealing Locks" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2538 msgid "" "A repository lock isn't sacred—in Subversion's default configuration " "state, locks can be released not only by the person who created them, but by " "anyone. When somebody other than the original lock creator destroys a lock, " "we refer to this as <firstterm>breaking the lock</firstterm>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2544 msgid "" "From the administrator's chair, it's simple to break locks. The " "<command>svnlook</command> and <command>svnadmin</command> programs have the " "ability to display and remove locks directly from the repository. (For more " "information about these tools, see <xref linkend=\"svn.reposadmin.maint.tk\"/" ">.)" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2551 #, no-wrap msgid "" "\n" "$ svnadmin lslocks /var/svn/repos\n" "Path: /project2/images/banana.jpg\n" "UUID Token: opaquelocktoken:c32b4d88-e8fb-2310-abb3-153ff1236923\n" "Owner: frank\n" "Created: 2006-06-15 13:29:18 -0500 (Thu, 15 Jun 2006)\n" "Expires: \n" "Comment (1 line):\n" "Still improving the yellow color.\n" "\n" "Path: /project/raisin.jpg\n" "UUID Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b\n" "Owner: harry\n" "Created: 2006-02-16 13:29:18 -0500 (Thu, 16 Feb 2006)\n" "Expires: \n" "Comment (1 line):\n" "Need to make a quick tweak to this image.\n" "\n" "$ svnadmin rmlocks /var/svn/repos /project/raisin.jpg\n" "Removed lock on '/project/raisin.jpg'.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2574 msgid "" "The more interesting option is to allow users to break each other's locks " "over the network. To do this, Sally simply needs to pass the <option>--" "force</option> to the <command>svn unlock</command> command:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2579 #, no-wrap msgid "" "\n" "$ svn status -u\n" "M 23 bar.c\n" "M O 32 raisin.jpg\n" " * 72 foo.h\n" "Status against revision: 105\n" "$ svn unlock raisin.jpg\n" "svn: 'raisin.jpg' is not locked in this working copy\n" "$ svn info raisin.jpg | grep URL\n" "URL: http://svn.example.com/repos/project/raisin.jpg\n" "$ svn unlock http://svn.example.com/repos/project/raisin.jpg\n" "svn: Unlock request failed: 403 Forbidden (http://svn.example.com)\n" "$ svn unlock --force http://svn.example.com/repos/project/raisin.jpg\n" "'raisin.jpg' unlocked.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2596 msgid "" "Now, Sally's initial attempt to unlock failed because she ran <command>svn " "unlock</command> directly on her working copy of the file, and no lock token " "was present. To remove the lock directly from the repository, she needs to " "pass a URL to <command>svn unlock</command>. Her first attempt to unlock " "the URL fails, because she can't authenticate as the lock owner (nor does " "she have the lock token). But when she passes <option>--force</option>, the " "authentication and authorization requirements are ignored, and the remote " "lock is broken." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2607 msgid "" "Simply breaking a lock may not be enough. In the running example, Sally may " "not only want to break Harry's long-forgotten lock, but relock the file for " "her own use. She can accomplish this by using <command>svn unlock</command> " "with <option>--force</option> and then <command>svn lock</command> back-to-" "back, but there's a small chance that somebody else might lock the file " "between the two commands. The simpler thing to do is to <firstterm>steal</" "firstterm> the lock, which involves breaking and relocking the file all in " "one atomic step. To do this, Sally passes the <option>--force</option> " "option to <command>svn lock</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2619 #, no-wrap msgid "" "\n" "$ svn lock raisin.jpg\n" "svn: Lock request failed: 423 Locked (http://svn.example.com)\n" "$ svn lock --force raisin.jpg\n" "'raisin.jpg' locked by user 'sally'.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2627 msgid "" "In any case, whether the lock is broken or stolen, Harry may be in for a " "surprise. Harry's working copy still contains the original lock token, but " "that lock no longer exists. The lock token is said to be " "<firstterm>defunct</firstterm>. The lock represented by the lock token has " "either been broken (no longer in the repository) or stolen (replaced with a " "different lock). Either way, Harry can see this by asking <command>svn " "status</command> to contact the repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2637 #, no-wrap msgid "" "\n" "$ svn status\n" " K raisin.jpg\n" "$ svn status -u\n" " B 32 raisin.jpg\n" "$ svn update\n" " B raisin.jpg\n" "$ svn status\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2648 msgid "" "If the repository lock was broken, then <userinput>svn status --show-" "updates</userinput> displays a <literal>B</literal> (Broken) symbol next to " "the file. If a new lock exists in place of the old one, then a <literal>T</" "literal> (sTolen) symbol is shown. Finally, <command>svn update</command> " "notices any defunct lock tokens and removes them from the working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:2657 #, fuzzy #| msgid "Working Copies" msgid "Locking Policies" msgstr "Arbeitskopien" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2659 msgid "" "Different systems have different notions of how strict a lock should be. " "Some folks argue that locks must be strictly enforced at all costs, " "releasable only by the original creator or administrator. They argue that " "if anyone can break a lock, chaos runs rampant and the whole point of " "locking is defeated. The other side argues that locks are first and " "foremost a communication tool. If users are constantly breaking each " "other's locks, it represents a cultural failure within the team and the " "problem falls outside the scope of software enforcement." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2670 msgid "" "Subversion defaults to the <quote>softer</quote> approach, but still allows " "administrators to create stricter enforcement policies through the use of " "hook scripts. In particular, the <filename>pre-lock</filename> and " "<filename>pre-unlock</filename> hooks allow administrators to decide when " "lock creation and lock releases are allowed to happen. Depending on whether " "a lock already exists, these two hooks can decide whether to allow a certain " "user to break or steal a lock. The <filename>post-lock</filename> and " "<filename>post-unlock</filename> hooks are also available, and can be used " "to send email after locking actions. To learn more about repository hooks, " "see <xref linkend=\"svn.reposadmin.create.hooks\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:2691 msgid "Lock Communication" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2693 msgid "" "We've seen how <command>svn lock</command> and <command>svn unlock</command> " "can be used to create, release, break, and steal locks. This satisfies the " "goal of serializing commit access to a file. But what about the larger " "problem of preventing wasted time?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2699 msgid "" "For example, suppose Harry locks an image file and then begins editing it. " "Meanwhile, miles away, Sally wants to do the same thing. She doesn't think " "to run <userinput>svn status --show-updates</userinput>, so she has no idea " "that Harry has already locked the file. She spends hours editing the file, " "and when she tries to commit her change, she discovers that either the file " "is locked or that she's out of date. Regardless, her changes aren't " "mergeable with Harry's. One of these two people has to throw away his or " "her work, and a lot of time has been wasted." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2710 msgid "" "Subversion's solution to this problem is to provide a mechanism to remind " "users that a file ought to be locked <emphasis>before</emphasis> the editing " "begins. The mechanism is a special property: <literal>svn:needs-lock</" "literal>. If that property is attached to a file (regardless of its value, " "which is irrelevant), Subversion will try to use filesystem-level " "permissions to make the file read-only—unless, of course, the user has " "explicitly locked the file. When a lock token is present (as a result of " "using <command>svn lock</command>), the file becomes read/write. When the " "lock is released, the file becomes read-only again." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2723 msgid "" "The theory, then, is that if the image file has this property attached, " "Sally would immediately notice something is strange when she opens the file " "for editing: many applications alert users immediately when a read-only file " "is opened for editing, and nearly all would prevent her from saving changes " "to the file. This reminds her to lock the file before editing, whereby she " "discovers the preexisting lock:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2732 #, no-wrap msgid "" "\n" "$ /usr/local/bin/gimp raisin.jpg\n" "gimp: error: file is read-only!\n" "$ ls -l raisin.jpg\n" "-r--r--r-- 1 sally sally 215589 Jun 8 19:23 raisin.jpg\n" "$ svn lock raisin.jpg\n" "svn: Lock request failed: 423 Locked (http://svn.example.com)\n" "$ svn info http://svn.example.com/repos/project/raisin.jpg | grep Lock\n" "Lock Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b\n" "Lock Owner: harry\n" "Lock Created: 2006-06-08 07:29:18 -0500 (Thu, 08 June 2006)\n" "Lock Comment (1 line):\n" "Making some tweaks. Locking for the next two hours.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch03-advanced-topics.xml:2749 msgid "" "Users and administrators alike are encouraged to attach the <literal>svn:" "needs-lock</literal> property to any file that cannot be contextually " "merged. This is the primary technique for encouraging good locking habits " "and preventing wasted effort." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2756 msgid "" "Note that this property is a communication tool that works independently " "from the locking system. In other words, any file can be locked, whether or " "not this property is present. And conversely, the presence of this property " "doesn't make the repository require a lock when committing." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch03-advanced-topics.xml:2763 msgid "" "Unfortunately, the system isn't flawless. It's possible that even when a " "file has the property, the read-only reminder won't always work. Sometimes " "applications misbehave and <quote>hijack</quote> the read-only file, " "silently allowing users to edit and save the file anyway. There's not much " "that Subversion can do in this situation—at the end of the day, " "there's simply no substitution for good interpersonal communication. " "<footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:2772 msgid "Except, perhaps, a classic Vulcan mind-meld." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:2784 msgid "Externals Definitions" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2786 msgid "" "Sometimes it is useful to construct a working copy that is made out of a " "number of different checkouts. For example, you may want different " "subdirectories to come from different locations in a repository or perhaps " "from different repositories altogether. You could certainly set up such a " "scenario by hand—using <command>svn checkout</command> to create the " "sort of nested working copy structure you are trying to achieve. But if " "this layout is important for everyone who uses your repository, every other " "user will need to perform the same checkout operations that you did." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2797 msgid "" "Fortunately, Subversion provides support for <firstterm>externals " "definitions</firstterm>. An externals definition is a mapping of a local " "directory to the URL—and ideally a particular revision—of a " "versioned directory. In Subversion, you declare externals definitions in " "groups using the <literal>svn:externals</literal> property. You can create " "or modify this property using <command>svn propset</command> or <command>svn " "propedit</command> (see <xref linkend=\"svn.advanced.props.manip\" />). It " "can be set on any versioned directory, and its value describes both the " "external repository location and the client-side directory to which that " "location should be checked out." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2810 msgid "" "The convenience of the <literal>svn:externals</literal> property is that " "once it is set on a versioned directory, everyone who checks out a working " "copy with that directory also gets the benefit of the externals definition. " "In other words, once one person has made the effort to define the nested " "working copy structure, no one else has to bother—Subversion will, " "after checking out the original working copy, automatically also check out " "the external working copies." msgstr "" # type: Content of: <chapter><sect1><warning><para> #: ../en/book/ch03-advanced-topics.xml:2820 msgid "" "The relative target subdirectories of externals definitions <emphasis>must " "not</emphasis> already exist on your or other users' systems—" "Subversion will create them when it checks out the external working copy." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2826 msgid "" "You also get in the externals definition design all the regular benefits of " "Subversion properties. The definitions are versioned. If you need to " "change an externals definition, you can do so using the regular property " "modification subcommands. When you commit a change to the <literal>svn:" "externals</literal> property, Subversion will synchronize the checked-out " "items against the changed externals definition when you next run " "<userinput>svn update</userinput>. The same thing will happen when others " "update their working copies and receive your changes to the externals " "definition." msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch03-advanced-topics.xml:2838 msgid "" "Because the <literal>svn:externals</literal> property has a multiline value, " "we strongly recommend that you use <command>svn propedit</command> instead " "of <command>svn propset</command>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2844 msgid "" "Subversion releases prior to 1.5 honor an externals definition format that " "is a multiline table of subdirectories (relative to the versioned directory " "on which the property is set), optional revision flags, and fully qualified, " "absolute Subversion repository URLs. An example of this might looks as " "follows:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2851 #, no-wrap msgid "" "\n" "$ svn propget svn:externals calc\n" "third-party/sounds http://svn.example.com/repos/sounds\n" "third-party/skins -r148 http://svn.example.com/skinproj\n" "third-party/skins/toolkit -r21 http://svn.example.com/skin-maker\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2858 msgid "" "When someone checks out a working copy of the <filename>calc</filename> " "directory referred to in the previous example, Subversion also continues to " "check out the items found in its externals definition." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2863 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.example.com/repos/calc\n" "A calc\n" "A calc/Makefile\n" "A calc/integer.c\n" "A calc/button.c\n" "Checked out revision 148.\n" "\n" "Fetching external item into calc/third-party/sounds\n" "A calc/third-party/sounds/ding.ogg\n" "A calc/third-party/sounds/dong.ogg\n" "A calc/third-party/sounds/clang.ogg\n" "…\n" "A calc/third-party/sounds/bang.ogg\n" "A calc/third-party/sounds/twang.ogg\n" "Checked out revision 14.\n" "\n" "Fetching external item into calc/third-party/skins\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2884 msgid "" "As of Subversion 1.5, though, a new format of the <literal>svn:externals</" "literal> property is supported. Externals definitions are still multiline, " "but the order and format of the various pieces of information have changed. " "The new syntax more closely mimics the order of arguments you might pass to " "<command>svn checkout</command>: the optional revision flags come first, " "then the external Subversion repository URL, and finally the relative local " "subdirectory. Notice, though, that this time we didn't say <quote>fully " "qualified, absolute Subversion repository URLs.</quote> That's because the " "new format supports relative URLs and URLs that carry peg revisions. The " "previous example of an externals definition might, in Subversion 1.5, look " "like the following:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2898 #, no-wrap msgid "" "\n" "$ svn propget svn:externals calc\n" " http://svn.example.com/repos/sounds third-party/sounds\n" "-r148 http://svn.example.com/skinproj third-party/skins\n" "-r21 http://svn.example.com/skin-maker third-party/skins/toolkit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2905 msgid "" "Or, making use of the peg revision syntax (which we describe in detail in " "<xref linkend=\"svn.advanced.pegrevs\" />), it might appear as:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2909 #, no-wrap msgid "" "\n" "$ svn propget svn:externals calc\n" "http://svn.example.com/repos/sounds third-party/sounds\n" "http://svn.example.com/skinproj@148 third-party/skins\n" "http://svn.example.com/skin-maker@21 third-party/skins/toolkit\n" msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch03-advanced-topics.xml:2917 msgid "" "You should seriously consider using explicit revision numbers in all of your " "externals definitions. Doing so means that you get to decide when to pull " "down a different snapshot of external information, and exactly which " "snapshot to pull. Besides avoiding the surprise of getting changes to third-" "party repositories that you might not have any control over, using explicit " "revision numbers also means that as you backdate your working copy to a " "previous revision, your externals definitions will also revert to the way " "they looked in that previous revision, which in turn means that the external " "working copies will be updated to match the way <emphasis>they</emphasis> " "looked back when your repository was at that previous revision. For " "software projects, this could be the difference between a successful and a " "failed build of an older snapshot of your complex codebase." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2934 msgid "" "For most repositories, these three ways of formatting the externals " "definitions have the same ultimate effect. They all bring the same " "benefits. Unfortunately, they all bring the same annoyances, too. Since " "the definitions shown use absolute URLs, moving or copying a directory to " "which they are attached will not affect what gets checked out as an external " "(though the relative local target subdirectory will, of course, move with " "the renamed directory). This can be confusing—even frustrating—" "in certain situations. For example, say you have a top-level directory " "named <filename>my-project</filename>, and you've created an externals " "definition on one of its subdirectories (<filename>my-project/some-dir</" "filename>) that tracks the latest revision of another of its subdirectories " "(<filename>my-project/external-dir</filename>)." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2950 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.example.com/projects .\n" "A my-project\n" "A my-project/some-dir\n" "A my-project/external-dir\n" "…\n" "Fetching external item into 'my-project/some-dir/subdir'\n" "Checked out external at revision 11.\n" "\n" "Checked out revision 11.\n" "$ svn propget svn:externals my-project/some-dir\n" "subdir http://svn.example.com/projects/my-project/external-dir\n" "\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2966 msgid "" "Now you use <command>svn move</command> to rename the <filename>my-project</" "filename> directory. At this point, your externals definition will still " "refer to a path under the <filename>my-project</filename> directory, even " "though that directory no longer exists." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2972 #, no-wrap msgid "" "\n" "$ svn move -q my-project renamed-project\n" "$ svn commit -m \"Rename my-project to renamed-project.\"\n" "Deleting my-project\n" "Adding renamed-project\n" "\n" "Committed revision 12.\n" "$ svn update\n" "\n" "Fetching external item into 'renamed-project/some-dir/subdir'\n" "svn: Target path does not exist\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2986 msgid "" "Also, absolute URLs can cause problems with repositories that are available " "via multiple URL schemes. For example, if your Subversion server is " "configured to allow everyone to check out the repository over " "<literal>http://</literal> or <literal>https://</literal>, but only allow " "commits to come in via <literal>https://</literal>, you have an interesting " "problem on your hands. If your externals definitions use the " "<literal>http://</literal> form of the repository URLs, you won't be able to " "commit anything from the working copies created by those externals. On the " "other hand, if they use the <literal>https://</literal> form of the URLs, " "anyone who might be checking out via <literal>http://</literal> because his " "client doesn't support <literal>https://</literal> will be unable to fetch " "the external items. Be aware, too, that if you need to reparent your " "working copy (using <command>svn switch</command> with the <option>--" "relocate</option> option), externals definitions will <emphasis>not</" "emphasis> also be reparented." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3004 msgid "" "Subversion 1.5 takes a huge step in relieving these frustrations. As " "mentioned earlier, the URLs used in the new externals definition format can " "be relative, and Subversion provides syntax magic for specifying multiple " "flavors of URL relativity." msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch03-advanced-topics.xml:3012 msgid "../" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3013 msgid "" "Relative to the URL of the directory on which the <literal>svn:externals</" "literal> property is set" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch03-advanced-topics.xml:3018 msgid "^/" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3019 msgid "" "Relative to the root of the repository in which the <literal>svn:externals</" "literal> property is versioned" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch03-advanced-topics.xml:3024 msgid "//" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3025 msgid "" "Relative to the scheme of the URL of the directory on which the <literal>svn:" "externals</literal> property is set" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch03-advanced-topics.xml:3030 msgid "/" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3031 msgid "" "Relative to the root URL of the server on which the <literal>svn:externals</" "literal> property is versioned" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3037 msgid "" "So, looking a fourth time at our previous externals definition example, and " "making use of the new absolute URL syntax in various ways, we might now see:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3041 #, no-wrap msgid "" "\n" "$ svn propget svn:externals calc\n" "^/sounds third-party/sounds\n" "/skinproj@148 third-party/skins\n" "//svn.example.com/skin-maker@21 third-party/skins/toolkit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3048 msgid "" "The support that exists for externals definitions in Subversion remains less " "than ideal, though. An externals definition can point only to directories, " "not to files. Also, the local subdirectory part of the definition cannot " "contain <literal>..</literal> parent directory indicators (such as " "<filename>../../skins/myskin</filename>). Perhap most disappointingly, the " "working copies created via the externals definition support are still " "disconnected from the primary working copy (on whose versioned directories " "the <literal>svn:externals</literal> property was actually set). And " "Subversion still truly operates only on nondisjoint working copies. So, for " "example, if you want to commit changes that you've made in one or more of " "those external working copies, you must run <command>svn commit</command> " "explicitly on those working copies—committing on the primary working " "copy will not recurse into any external ones." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3065 msgid "" "We've already mentioned some of the additional shortcomings of the old " "<literal>svn:externals</literal> format and how the new Subversion 1.5 " "format improves upon it. But be careful when making use of the new format " "that you don't inadvertently cause problems for other folks accessing your " "repository who are using older Subversion clients. While Subversion 1.5 " "clients will continue to recognize and support the original externals " "definition format, older clients will <emphasis>not</emphasis> be able to " "correctly parse the new format." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3075 msgid "" "Besides the <command>svn checkout</command>, <command>svn update</command>, " "<command>svn switch</command>, and <command>svn export</command> commands " "which actually manage the <firstterm>disjoint</firstterm> (or disconnected) " "subdirectories into which externals are checked out, the <command>svn " "status</command> command also recognizes externals definitions. It displays " "a status code of <literal>X</literal> for the disjoint external " "subdirectories, and then recurses into those subdirectories to display the " "status of the external items themselves. You can pass the <option>--ignore-" "externals</option> option to any of these subcommands to disable externals " "definition processing." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:3094 msgid "Peg and Operative Revisions" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3096 msgid "" "We copy, move, rename, and completely replace files and directories on our " "computers all the time. And your version control system shouldn't get in " "the way of your doing these things with your version-controlled files and " "directories, either. Subversion's file management support is quite " "liberating, affording almost as much flexibility for versioned files as " "you'd expect when manipulating your unversioned ones. But that flexibility " "means that across the lifetime of your repository, a given versioned object " "might have many paths, and a given path might represent several entirely " "different versioned objects. This introduces a certain level of complexity " "to your interactions with those paths and objects." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3110 msgid "" "Subversion is pretty smart about noticing when an object's version history " "includes such <quote>changes of address.</quote> For example, if you ask for " "the revision history log of a particular file that was renamed last week, " "Subversion happily provides all those logs—the revision in which the " "rename itself happened, plus the logs of relevant revisions both before and " "after that rename. So, most of the time, you don't even have to think about " "such things. But occasionally, Subversion needs your help to clear up " "ambiguities." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3120 msgid "" "The simplest example of this occurs when a directory or file is deleted from " "version control, and then a new directory or file is created with the same " "name and added to version control. The thing you deleted and the thing you " "later added aren't the same thing. They merely happen to have had the same " "path—<filename>/trunk/object</filename>, for example. What, then, " "does it mean to ask Subversion about the history of <filename>/trunk/object</" "filename>? Are you asking about the thing currently at that location, or the " "old thing you deleted from that location? Are you asking about the " "operations that have happened to <emphasis>all</emphasis> the objects that " "have ever lived at that path? Subversion needs a hint about what you really " "want." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:3134 msgid "" "And thanks to moves, versioned object history can get far more twisted than " "even that. For example, you might have a directory named <filename>concept</" "filename>, containing some nascent software project you've been toying " "with. Eventually, though, that project matures to the point that the idea " "seems to actually have some wings, so you do the unthinkable and decide to " "give the project a name. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:3142 msgid "" "<quote>You're not supposed to name it. Once you name it, you start getting " "attached to it.</quote>—Mike Wazowski" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3145 msgid "" "</footnote> Let's say you called your software Frabnaggilywort. At this " "point, it makes sense to rename the directory to reflect the project's new " "name, so <filename>concept</filename> is renamed to " "<filename>frabnaggilywort</filename>. Life goes on, Frabnaggilywort " "releases a 1.0 version and is downloaded and used daily by hordes of people " "aiming to improve their lives." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3154 msgid "" "It's a nice story, really, but it doesn't end there. Entrepreneur that you " "are, you've already got another think in the tank. So you make a new " "directory, <filename>concept</filename>, and the cycle begins again. In " "fact, the cycle begins again many times over the years, each time starting " "with that old <filename>concept</filename> directory, then sometimes seeing " "that directory renamed as the idea cures, sometimes seeing it deleted when " "you scrap the idea. Or, to get really sick, maybe you rename " "<filename>concept</filename> to something else for a while, but later rename " "the thing back to <filename>concept</filename> for some reason." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3167 msgid "" "In scenarios like these, attempting to instruct Subversion to work with " "these reused paths can be a little like instructing a motorist in Chicago's " "West Suburbs to drive east down Roosevelt Road and turn left onto Main " "Street. In a mere 20 minutes, you can cross <quote>Main Street</quote> in " "Wheaton, Glen Ellyn, and Lombard. And no, they aren't the same street. Our " "motorist—and our Subversion—need a little more detail to do the " "right thing." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3176 msgid "" "In version 1.1, Subversion introduced a way for you to tell it exactly which " "Main Street you meant. It's called the <firstterm>peg revision</firstterm>, " "and it is provided to Subversion for the sole purpose of identifying a " "unique line of history. Because at most, one versioned object may occupy a " "path at any given time—or, more precisely, in any one revision—" "the combination of a path and a peg revision is all that is needed to refer " "to a specific line of history. Peg revisions are specified to the " "Subversion command-line client using <firstterm>at syntax</firstterm>, so " "called because the syntax involves appending an <quote>at sign</quote> " "(<literal>@</literal>) and the peg revision to the end of the path with " "which the revision is associated." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:3190 msgid "" "But what of the <option>--revision</option> (<option>-r</option>) of which " "we've spoken so much in this book? That revision (or set of revisions) is " "called the <firstterm>operative revision</firstterm> (or " "<firstterm>operative revision range</firstterm>). Once a particular line of " "history has been identified using a path and peg revision, Subversion " "performs the requested operation using the operative revision(s). To map " "this to our Chicagoland streets analogy, if we are told to go to 606 N. Main " "Street in Wheaton, <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:3201 msgid "" "606 N. Main Street, Wheaton, Illinois, is the home of the Wheaton " "<emphasis>History</emphasis> Center. It seemed appropriate…." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3204 msgid "" "</footnote> we can think of <quote>Main Street</quote> as our path and " "<quote>Wheaton</quote> as our peg revision. These two pieces of information " "identify a unique path that can be traveled (north or south on Main Street), " "and they keep us from traveling up and down the wrong Main Street in search " "of our destination. Now we throw in <quote>606 N.</quote> as our operative " "revision of sorts, and we know <emphasis>exactly</emphasis> where to go." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:3215 msgid "The Peg Revision Algorithm" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:3217 msgid "" "The Subversion command-line client performs the peg revision algorithm any " "time it needs to resolve possible ambiguities in the paths and revisions " "provided to it. Here's an example of such an invocation:" msgstr "" # type: Content of: <chapter><sect1><sidebar><screen> #: ../en/book/ch03-advanced-topics.xml:3222 #, no-wrap msgid "" "\n" "$ svn <replaceable>command</replaceable> -r <replaceable>OPERATIVE-REV</replaceable> item@<replaceable>PEG-REV</replaceable>\n" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:3226 msgid "" "If <replaceable>OPERATIVE-REV</replaceable> is older than <replaceable>PEG-" "REV</replaceable>, the algorithm is as follows:" msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3232 msgid "" "Locate <replaceable>item</replaceable> in the revision identified by " "<replaceable>PEG-REV</replaceable>. There can be only one such object." msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3237 msgid "" "Trace the object's history backwards (through any possible renames) to its " "ancestor in the revision <replaceable>OPERATIVE-REV</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3242 msgid "" "Perform the requested action on that ancestor, wherever it is located, or " "whatever its name might be or might have been at that time." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:3248 msgid "" "But what if <replaceable>OPERATIVE-REV</replaceable> is <emphasis>younger</" "emphasis> than <replaceable>PEG-REV</replaceable>? Well, that adds some " "complexity to the theoretical problem of locating the path in " "<replaceable>OPERATIVE-REV</replaceable>, because the path's history could " "have forked multiple times (thanks to copy operations) between " "<replaceable>PEG-REV</replaceable> and <replaceable>OPERATIVE-REV</" "replaceable>. And that's not all—Subversion doesn't store enough " "information to performantly trace an object's history forward, anyway. So " "the algorithm is a little different:" msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3262 msgid "" "Locate <replaceable>item</replaceable> in the revision identified by " "<replaceable>OPERATIVE-REV</replaceable>. There can be only one such object." msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3267 msgid "" "Trace the object's history backward (through any possible renames) to its " "ancestor in the revision <replaceable>PEG-REV</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3272 msgid "" "Verify that the object's location (path-wise) in <replaceable>PEG-REV</" "replaceable> is the same as it is in <replaceable>OPERATIVE-REV</" "replaceable>. If that's the case, at least the two locations are known to " "be directly related, so perform the requested action on the location in " "<replaceable>OPERATIVE-REV</replaceable>. Otherwise, relatedness was not " "established, so error out with a loud complaint that no viable location was " "found. (Someday, we expect that Subversion will be able to handle this " "usage scenario with more flexibility and grace.)" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:3286 msgid "" "Note that even when you don't explicitly supply a peg revision or operative " "revision, they are still present. For your convenience, the default peg " "revision is <literal>BASE</literal> for working copy items and " "<literal>HEAD</literal> for repository URLs. And when no operative revision " "is provided, it defaults to being the same revision as the peg revision." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3296 msgid "" "Say that long ago we created our repository, and in revision 1 we added our " "first <filename>concept</filename> directory, plus an <filename>IDEA</" "filename> file in that directory talking about the concept. After several " "revisions in which real code was added and tweaked, we, in revision 20, " "renamed this directory to <filename>frabnaggilywort</filename>. By revision " "27, we had a new concept, a new <filename>concept</filename> directory to " "hold it, and a new <filename>IDEA</filename> file to describe it. And then " "five years and thousands of revisions flew by, just like they would in any " "good romance story." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3307 msgid "" "Now, years later, we wonder what the <filename>IDEA</filename> file looked " "like back in revision 1. But Subversion needs to know whether we are asking " "about how the <emphasis>current</emphasis> file looked back in revision 1, " "or whether we are asking for the contents of whatever file lived at " "<filename>concepts/IDEA</filename> in revision 1. Certainly those questions " "have different answers, and because of peg revisions, you can ask those " "questions. To find out how the current <filename>IDEA</filename> file " "looked in that old revision, you run:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3318 #, no-wrap msgid "" "\n" "$ svn cat -r 1 concept/IDEA \n" "svn: Unable to find repository location for 'concept/IDEA' in revision 1\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3323 msgid "" "Of course, in this example, the current <filename>IDEA</filename> file " "didn't exist yet in revision 1, so Subversion gives an error. The previous " "command is shorthand for a longer notation which explicitly lists a peg " "revision. The expanded notation is:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3329 #, no-wrap msgid "" "\n" "$ svn cat -r 1 concept/IDEA@BASE\n" "svn: Unable to find repository location for 'concept/IDEA' in revision 1\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3334 msgid "And when executed, it has the expected results." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3336 msgid "" "The perceptive reader is probably wondering at this point whether the peg " "revision syntax causes problems for working copy paths or URLs that actually " "have at signs in them. After all, how does <command>svn</command> know " "whether <literal>news@11</literal> is the name of a directory in my tree or " "just a syntax for <quote>revision 11 of <filename>news</filename></quote>? " "Thankfully, while <command>svn</command> will always assume the latter, " "there is a trivial workaround. You need only append an at sign to the end " "of the path, such as <literal>news@11@</literal>. <command>svn</command> " "cares only about the last at sign in the argument, and it is not considered " "illegal to omit a literal peg revision specifier after that at sign. This " "workaround even applies to paths that end in an at sign—you would use " "<literal>filename@@</literal> to talk about a file named " "<filename>filename@</filename>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3353 msgid "" "Let's ask the other question, then—in revision 1, what were the " "contents of whatever file occupied the address <filename>concepts/IDEA</" "filename> at the time? We'll use an explicit peg revision to help us out." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3358 #, no-wrap msgid "" "\n" "$ svn cat concept/IDEA@1\n" "The idea behind this project is to come up with a piece of software\n" "that can frab a naggily wort. Frabbing naggily worts is tricky\n" "business, and doing it incorrectly can have serious ramifications, so\n" "we need to employ over-the-top input validation and data verification\n" "mechanisms.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3367 msgid "" "Notice that we didn't provide an operative revision this time. That's " "because when no operative revision is specified, Subversion assumes a " "default operative revision that's the same as the peg revision." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3372 msgid "" "As you can see, the output from our operation appears to be correct. The " "text even mentions frabbing naggily worts, so this is almost certainly the " "file that describes the software now called Frabnaggilywort. In fact, we " "can verify this using the combination of an explicit peg revision and " "explicit operative revision. We know that in <literal>HEAD</literal>, the " "Frabnaggilywort project is located in the <filename>frabnaggilywort</" "filename> directory. So we specify that we want to see how the line of " "history identified in <literal>HEAD</literal> as the path " "<filename>frabnaggilywort/IDEA</filename> looked in revision 1." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3385 #, no-wrap msgid "" "\n" "$ svn cat -r 1 frabnaggilywort/IDEA@HEAD\n" "The idea behind this project is to come up with a piece of software\n" "that can frab a naggily wort. Frabbing naggily worts is tricky\n" "business, and doing it incorrectly can have serious ramifications, so\n" "we need to employ over-the-top input validation and data verification\n" "mechanisms.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3394 msgid "" "And the peg and operative revisions need not be so trivial, either. For " "example, say <filename>frabnaggilywort</filename> had been deleted from " "<literal>HEAD</literal>, but we know it existed in revision 20, and we want " "to see the diffs for its <filename>IDEA</filename> file between revisions 4 " "and 10. We can use the peg revision 20 in conjunction with the URL that " "would have held Frabnaggilywort's <filename>IDEA</filename> file in revision " "20, and then use 4 and 10 as our operative revision range." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3404 #, no-wrap msgid "" "\n" "$ svn diff -r 4:10 http://svn.red-bean.com/projects/frabnaggilywort/IDEA@20\n" "Index: frabnaggilywort/IDEA\n" "===================================================================\n" "--- frabnaggilywort/IDEA\t(revision 4)\n" "+++ frabnaggilywort/IDEA\t(revision 10)\n" "@@ -1,5 +1,5 @@\n" "-The idea behind this project is to come up with a piece of software\n" "-that can frab a naggily wort. Frabbing naggily worts is tricky\n" "-business, and doing it incorrectly can have serious ramifications, so\n" "-we need to employ over-the-top input validation and data verification\n" "-mechanisms.\n" "+The idea behind this project is to come up with a piece of\n" "+client-server software that can remotely frab a naggily wort.\n" "+Frabbing naggily worts is tricky business, and doing it incorrectly\n" "+can have serious ramifications, so we need to employ over-the-top\n" "+input validation and data verification mechanisms.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3423 msgid "" "Fortunately, most folks aren't faced with such complex situations. But when " "you are, remember that peg revisions are that extra hint Subversion needs to " "clear up ambiguity." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:3433 msgid "Changelists" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3435 msgid "" "It is commonplace for a developer to find himself working at any given time " "on multiple different, distinct changes to a particular bit of source code. " "This isn't necessarily due to poor planning or some form of digital " "masochism. A software engineer often spots bugs in his peripheral vision " "while working on some nearby chunk of source code. Or perhaps he's halfway " "through some large change when he realizes the solution he's working on is " "best committed as several smaller logical units. Often, these logical units " "aren't nicely contained in some module, safely separated from other " "changes. The units might overlap, modifying different files in the same " "module, or even modifying different lines in the same file." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3448 msgid "" "developers can employ various work methodologies to keep these logical " "changes organized. Some use separate working copies of the same repository " "to hold each individual change in progress. Others might choose to create " "short-lived feature branches in the repository and use a single working copy " "that is constantly switched to point to one such branch or another. Still " "others use <command>diff</command> and <command>patch</command> tools to " "back up and restore uncommitted changes to and from patch files associated " "with each change. Each of these methods has its pros and cons, and to a " "large degree, the details of the changes being made heavily influence the " "methodology used to distinguish them." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3461 msgid "" "Subversion 1.5 brings a new <firstterm>changelists</firstterm> feature that " "adds yet another method to the mix. Changelists are basically arbitrary " "labels applied to working copy files for the express purpose of associating " "multiple files together. Users of many of Google's software offerings are " "familiar with this concept already. For example, <ulink url=\"http://mail." "google.com/\">Gmail</ulink> doesn't provide the traditional folders-based " "email organization mechanism. In Gmail, you apply arbitrary labels to " "emails, and multiple emails can be said to be part of the same group if they " "happen to share a particular label. Viewing only a group of similarly " "labeled emails then becomes a simple user interface trick. Many other Web " "2.0 sites have similar mechanisms—consider the <quote>tags</quote> " "used by sites such as <ulink url=\"http://www.youtube.com/\">YouTube</ulink> " "and <ulink url=\"http://www.flickr.com/\">Flickr</ulink>, <quote>categories</" "quote> applied to blog posts, and so on. Folks understand today that " "organization of data is critical, but that how that data is organized needs " "to be a flexible concept. The old files-and-folders paradigm is too rigid " "for some applications." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3483 msgid "" "Subversion's changelist support allows you to create changelists by applying " "labels to files you want to be associated with that changelist, remove those " "labels, and limit the scope of the files on which its subcommands operate to " "only those bearing a particular label. In this section, we'll look in " "detail at how to do these things." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:3492 msgid "Creating and Modifying Changelists" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3494 msgid "" "You can create, modify, and delete changelists using the <command>svn " "changelist</command> command. More accurately, you use this command to set " "or unset the changelist association of a particular working copy file. A " "changelist is effectively created the first time you label a file with that " "changelist; it is deleted when you remove that label from the last file that " "had it. Let's examine a usage scenario that demonstrates these concepts." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3503 msgid "" "Harry is fixing some bugs in the calculator application's mathematics " "logic. His work leads him to change a couple of files:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3507 #, no-wrap msgid "" "\n" "$ svn status\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3514 msgid "" "While testing his bug fix, Harry notices that his changes bring to light a " "tangentially related bug in the user interface logic found in " "<filename>button.c</filename>. Harry decides that he'll go ahead and fix " "that bug, too, as a separate commit from his math fixes. Now, in a small " "working copy with only a handful of files and few logical changes, Harry can " "probably keep his two logical change groupings mentally organized without " "any problem. But today he's going to use Subversion's changelists feature " "as a special favor to the authors of this book." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3525 msgid "" "Harry first creates a changelist and associates with it the two files he's " "already changed. He does this by using the <command>svn changelist</" "command> command to assign the same arbitrary changelist name to those files:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3530 #, no-wrap msgid "" "\n" "$ svn changelist math-fixes integer.c mathops.c\n" "Path 'integer.c' is now a member of changelist 'math-fixes'.\n" "Path 'mathops.c' is now a member of changelist 'math-fixes'.\n" "$ svn status\n" "\n" "--- Changelist 'math-fixes':\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3542 msgid "" "As you can see, the output of <command>svn status</command> reflects this " "new grouping." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3545 msgid "" "Harry now sets off to fix the secondary UI problem. Since he knows which " "file he'll be changing, he assigns that path to a changelist, too. " "Unfortunately, Harry carelessly assigns this third file to the same " "changelist as the previous two files:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3550 #, no-wrap msgid "" "\n" "$ svn changelist math-fixes button.c\n" "Path 'button.c' is now a member of changelist 'math-fixes'.\n" "$ svn status\n" "\n" "--- Changelist 'math-fixes':\n" " button.c\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3562 msgid "" "Fortunately, Harry catches his mistake. At this point, he has two options. " "He can remove the changelist association from <filename>button.c</filename>, " "and then assign a different changelist name:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3567 #, no-wrap msgid "" "\n" "$ svn changelist --remove button.c\n" "Path 'button.c' is no longer a member of a changelist.\n" "$ svn changelist ui-fix button.c\n" "Path 'button.c' is now a member of changelist 'ui-fix'.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3575 msgid "" "Or, he can skip the removal and just assign a new changelist name. In this " "case, Subversion will first warn Harry that <filename>button.c</filename> is " "being removed from the first changelist:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3580 #, no-wrap msgid "" "\n" "$ svn changelist ui-fix button.c\n" "svn: warning: Removing 'button.c' from changelist 'math-fixes'.\n" "Path 'button.c' is now a member of changelist 'ui-fix'.\n" "$ svn status\n" "\n" "--- Changelist 'ui-fix':\n" " button.c\n" "\n" "--- Changelist 'math-fixes':\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3595 msgid "" "Harry now has two distinct changelists present in his working copy, and " "<command>svn status</command> will group its output according to these " "changelist determinations. Notice that even though Harry hasn't yet " "modified <filename>button.c</filename>, it still shows up in the output of " "<command>svn status</command> as interesting because it has a changelist " "assignment. Changelists can be added to and removed from files at any time, " "regardless of whether they contain local modifications." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3605 msgid "" "Harry now fixes the user interface problem in <filename>button.c</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3608 #, no-wrap msgid "" "\n" "$ svn status\n" "\n" "--- Changelist 'ui-fix':\n" "M button.c\n" "\n" "--- Changelist 'math-fixes':\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:3624 msgid "Changelists As Operation Filters" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3626 msgid "" "The visual grouping that Harry sees in the output of <command>svn status</" "command> as shown in our previous section is nice, but not entirely useful. " "The <command>status</command> command is but one of many operations that he " "might wish to perform on his working copy. Fortunately, many of " "Subversion's other operations understand how to operate on changelists via " "the use of the <option>--changelist</option> option." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3635 msgid "" "When provided with a <option>--changelist</option> option, Subversion " "commands will limit the scope of their operation to only those files to " "which a particular changelist name is assigned. If Harry now wants to see " "the actual changes he's made to the files in his <literal>math-fixes</" "literal> changelist, he <emphasis>could</emphasis> explicitly list only the " "files that make up that changelist on the <command>svn diff</command> " "command line." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3644 #, no-wrap msgid "" "\n" "$ svn diff integer.c mathops.c\n" "Index: integer.c\n" "===================================================================\n" "--- integer.c\t(revision 1157)\n" "+++ integer.c\t(working copy)\n" "…\n" "Index: mathops.c\n" "===================================================================\n" "--- mathops.c\t(revision 1157)\n" "+++ mathops.c\t(working copy)\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3659 msgid "" "That works okay for a few files, but what if Harry's change touched 20 or 30 " "files? That would be an annoyingly long list of explicitly named files. Now " "that he's using changelists, though, Harry can avoid explicitly listing the " "set of files in his changelist from now on, and instead provide just the " "changelist name:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3666 #, no-wrap msgid "" "\n" "$ svn diff --changelist math-fixes\n" "Index: integer.c\n" "===================================================================\n" "--- integer.c\t(revision 1157)\n" "+++ integer.c\t(working copy)\n" "…\n" "Index: mathops.c\n" "===================================================================\n" "--- mathops.c\t(revision 1157)\n" "+++ mathops.c\t(working copy)\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3681 msgid "" "And when it's time to commit, Harry can again use the <option>--changelist</" "option> option to limit the scope of the commit to files in a certain " "changelist. He might commit his user interface fix by doing the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3686 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" #| "Sending button.c\n" #| "Transmitting file data .\n" #| "Committed revision 57.\n" msgid "" "\n" "$ svn ci -m \"Fix a UI bug found while working on math logic.\" \\\n" " --changelist ui-fix\n" "Sending button.c\n" "Transmitting file data .\n" "Committed revision 1158.\n" "$\n" msgstr "" "\n" "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" "Sending button.c\n" "Transmitting file data .\n" "Committed revision 57.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3695 msgid "" "In fact, the <command>svn commit</command> command provides a second " "changelists-related option: <option>--keep-changelists</option>. Normally, " "changelist assignments are removed from files after they are committed. But " "if <option>--keep-changelists</option> is provided, Subversion will leave " "the changelist assignment on the committed (and now unmodified) files. In " "any case, committing files assigned to one changelist leaves other " "changelists undisturbed." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3705 #, no-wrap msgid "" "\n" "$ svn status\n" "\n" "--- Changelist 'math-fixes':\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch03-advanced-topics.xml:3715 msgid "" "The <option>--changelist</option> option acts only as a filter for " "Subversion command targets, and will not add targets to an operation. For " "example, on a commit operation specified as <userinput>svn commit /path/to/" "dir</userinput>, the target is the directory <filename>/path/to/dir</" "filename> and its children (to infinite depth). If you then add a " "changelist specifier to that command, only those files in and under " "<filename>/path/to/dir</filename> that are assigned that changelist name " "will be considered as targets of the commit—the commit will not " "include files located elsewhere (such is in <filename>/path/to/another-dir</" "filename>), regardless of their changelist assignment, even if they are part " "of the same working copy as the operation's target(s)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3731 msgid "" "Even the <command>svn changelist</command> command accepts the <option>--" "changelist</option> option. This allows you to quickly and easily rename or " "remove a changelist:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3735 #, no-wrap msgid "" "\n" "$ svn changelist math-bugs --changelist math-fixes --depth infinity .\n" "svn: warning: Removing 'integer.c' from changelist 'math-fixes'.\n" "Path 'integer.c' is now a member of changelist 'math-bugs'.\n" "svn: warning: Removing 'mathops.c' from changelist 'math-fixes'.\n" "Path 'mathops.c' is now a member of changelist 'math-bugs'.\n" "$ svn changelist --remove --changelist math-bugs --depth infinity .\n" "Path 'integer.c' is no longer a member of a changelist.\n" "Path 'mathops.c' is no longer a member of a changelist.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3747 msgid "" "Finally, you can specify multiple instances of the <option>--changelist</" "option> option on a single command line. Doing so limits the operation you " "are performing to files found in any of the specified changesets." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:3756 msgid "Changelist Limitations" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3758 msgid "" "Subversion's changelist feature is a handy tool for grouping working copy " "files, but it does have a few limitations. Changelists are artifacts of a " "particular working copy, which means that changelist assignments cannot be " "propagated to the repository or otherwise shared with other users. " "Changelists can be assigned only to files—Subversion doesn't currently " "support the use of changelists with directories. Finally, you can have at " "most one changelist assignment on a given working copy file. Here is where " "the blog post category and photo service tag analogies break down—if " "you find yourself needing to assign a file to multiple changelists, you're " "out of luck." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:3778 msgid "Network Model" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3780 msgid "" "At some point, you're going to need to understand how your Subversion client " "communicates with its server. Subversion's networking layer is abstracted, " "meaning that Subversion clients exhibit the same general behaviors no matter " "what sort of server they are operating against. Whether speaking the HTTP " "protocol (<literal>http://</literal>) with the Apache HTTP Server or " "speaking the custom Subversion protocol (<literal>svn://</literal>) with " "<command>svnserve</command>, the basic network model is the same. In this " "section, we'll explain the basics of that network model, including how " "Subversion manages authentication and authorization matters." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:3795 msgid "Requests and Responses" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3797 msgid "" "The Subversion client spends most of its time managing working copies. When " "it needs information from a remote repository, however, it makes a network " "request, and the server responds with an appropriate answer. The details of " "the network protocol are hidden from the user—the client attempts to " "access a URL, and depending on the URL scheme, a particular protocol is used " "to contact the server (see the sidebar <xref linkend=\"svn.basic.in-action." "wc.sb-1\"/>)." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch03-advanced-topics.xml:3806 msgid "" "Run <userinput>svn --version</userinput> to see which URL schemes and " "protocols the client knows how to use." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3811 msgid "" "When the server process receives a client request, it often demands that the " "client identify itself. It issues an authentication challenge to the " "client, and the client responds by providing <firstterm>credentials</" "firstterm> back to the server. Once authentication is complete, the server " "responds with the original information that the client asked for. Notice " "that this system is different from systems such as CVS, where the client " "preemptively offers credentials (<quote>logs in</quote>) to the server " "before ever making a request. In Subversion, the server <quote>pulls</" "quote> credentials by challenging the client at the appropriate moment, " "rather than the client <quote>pushing</quote> them. This makes certain " "operations more elegant. For example, if a server is configured to allow " "anyone in the world to read a repository, the server will never issue an " "authentication challenge when a client attempts to <command>svn checkout</" "command>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3828 msgid "" "If the particular network requests issued by the client result in a new " "revision being created in the repository (e.g., <command>svn commit</" "command>), Subversion uses the authenticated username associated with those " "requests as the author of the revision. That is, the authenticated user's " "name is stored as the value of the <literal>svn:author</literal> property on " "the new revision (see <xref linkend=\"svn.ref.properties\"/>). If the " "client was not authenticated (i.e., if the server never issued an " "authentication challenge), the revision's <literal>svn:author</literal> " "property is empty." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:3845 msgid "Client Credentials Caching" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3847 msgid "" "Many servers are configured to require authentication on every request. " "This would be a big annoyance to users if they were forced to type their " "passwords over and over again. Fortunately, the Subversion client has a " "remedy for this—a built-in system for caching authentication " "credentials on disk. By default, whenever the command-line client " "successfully responds to a server's authentication challenge, it saves the " "credentials in the user's private runtime configuration area (<filename>~/." "subversion/auth/</filename> on Unix-like systems or <filename>%APPDATA%/" "Subversion/auth/</filename> on Windows; see <xref linkend=\"svn.advanced." "confarea\" /> for more details about the runtime configuration system). " "Successful credentials are cached on disk and keyed on a combination of the " "server's hostname, port, and authentication realm." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3863 msgid "" "When the client receives an authentication challenge, it first looks for the " "appropriate credentials in the user's disk cache. If seemingly suitable " "credentials are not present, or if the cached credentials ultimately fail to " "authenticate, the client will, by default, fall back to prompting the user " "for the necessary information." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3870 msgid "" "The security-conscious reader will suspect immediately that there is reason " "for concern here. <quote>Caching passwords on disk? That's terrible! You " "should never do that!</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3875 msgid "" "The Subversion developers recognize the legitimacy of such concerns, and so " "Subversion works with available mechanisms provided by the operating system " "and environment to try to minimize the risk of leaking this information. " "Here's a breakdown of what this means for users on the most common platforms:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3885 msgid "" "On Windows 2000 and later, the Subversion client uses standard Windows " "cryptography services to encrypt the password on disk. Because the " "encryption key is managed by Windows and is tied to the user's own login " "credentials, only the user can decrypt the cached password. (Note that if " "the user's Windows account password is reset by an administrator, all of the " "cached passwords become undecipherable. The Subversion client will behave " "as though they don't exist, prompting for passwords when required.)" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3898 msgid "" "Similarly, on Mac OS X, the Subversion client stores all repository " "passwords in the login keyring (managed by the Keychain service), which is " "protected by the user's account password. User preference settings can " "impose additional policies, such as requiring that the user's account " "password be entered each time the Subversion password is used." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3908 msgid "" "For other Unix-like operating systems, no standard <quote>keychain</quote> " "services exist. However, the <filename>auth/</filename> caching area is " "still permission-protected so that only the user (owner) can read data from " "it, not the world at large. The operating system's own file permissions " "protect the passwords." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3918 msgid "" "Of course, for the truly paranoid, none of these mechanisms meets the test " "of perfection. So for those folks willing to sacrifice convenience for the " "ultimate in security, Subversion provides various ways of disabling its " "credentials caching system altogether." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3924 msgid "" "To disable caching for a single command, pass the <option>--no-auth-cache</" "option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3927 #, no-wrap msgid "" "\n" "$ svn commit -F log_msg.txt --no-auth-cache\n" "Authentication realm: <svn://host.example.com:3690> example realm\n" "Username: joe\n" "Password for 'joe':\n" "\n" "Adding newfile\n" "Transmitting file data .\n" "Committed revision 2324.\n" "\n" "# password was not cached, so a second commit still prompts us\n" "\n" "$ svn delete newfile\n" "$ svn commit -F new_msg.txt\n" "Authentication realm: <svn://host.example.com:3690> example realm\n" "Username: joe\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3946 msgid "" "Or, if you want to disable credential caching permanently, you can edit the " "<filename>config</filename> file in your runtime configuration area and set " "the <option>store-auth-creds</option> option to <literal>no</literal>. This " "will prevent the storing of credentials used in any Subversion interactions " "you perform on the affected computer. This can be extended to cover all " "users on the computer, too, by modifying the system-wide runtime " "configuration area (described in <xref linkend=\"svn.advanced.confarea.layout" "\" />)." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3957 #, no-wrap msgid "" "\n" "[auth]\n" "store-auth-creds = no\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3962 msgid "" "Sometimes users will want to remove specific credentials from the disk " "cache. To do this, you need to navigate into the <filename>auth/</filename> " "area and manually delete the appropriate cache file. Credentials are cached " "in individual files; if you look inside each file, you will see keys and " "values. The <literal>svn:realmstring</literal> key describes the particular " "server realm that the file is associated with:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3971 #, no-wrap msgid "" "\n" "$ ls ~/.subversion/auth/svn.simple/\n" "5671adf2865e267db74f09ba6f872c28\n" "3893ed123b39500bca8a0b382839198e\n" "5c3c22968347b390f349ff340196ed39\n" "\n" "$ cat ~/.subversion/auth/svn.simple/5671adf2865e267db74f09ba6f872c28\n" "\n" "K 8\n" "username\n" "V 3\n" "joe\n" "K 8\n" "password\n" "V 4\n" "blah\n" "K 15\n" "svn:realmstring\n" "V 45\n" "<https://svn.domain.com:443> Joe's repository\n" "END\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3994 msgid "Once you have located the proper cache file, just delete it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3997 msgid "" "One last word about <command>svn</command>'s authentication behavior, " "specifically regarding the <option>--username</option> and <option>--" "password</option> options. Many client subcommands accept these options, " "but it is important to understand that using these options does " "<emphasis>not</emphasis> automatically send credentials to the server. As " "discussed earlier, the server <quote>pulls</quote> credentials from the " "client when it deems necessary; the client cannot <quote>push</quote> them " "at will. If a username and/or password are passed as options, they will be " "presented to the server only if the server requests them. These options are " "typically used to authenticate as a different user than Subversion would " "have chosen by default (such as your system login name) or when trying to " "avoid interactive prompting (such as when calling <command>svn</command> " "from a script)." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch03-advanced-topics.xml:4015 msgid "" "A common mistake is to misconfigure a server so that it never issues an " "authentication challenge. When users pass <option>--username</option> and " "<option>--password</option> options to the client, they're surprised to see " "that they're never used; that is, new revisions still appear to have been " "committed anonymously!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:4024 msgid "" "Here is a final summary that describes how a Subversion client behaves when " "it receives an authentication challenge." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:4030 msgid "" "First, the client checks whether the user specified any credentials as " "command-line options (<option>--username</option> and/or <option>--password</" "option>). If so, the client will try to use those credentials to " "authenticate against the server." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:4038 msgid "" "If no command-line credentials were provided, or the provided ones were " "invalid, the client looks up the server's hostname, port, and realm in the " "runtime configuration's <filename>auth/</filename> area, to see whether " "appropriate credentials are cached there. If so, it attempts to use those " "credentials to authenticate." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:4046 msgid "" "Finally, if the previous mechanisms failed to successfully authenticate the " "user against the server, the client resorts to interactively prompting the " "user for valid credentials (unless instructed not to do so via the <option>--" "non-interactive</option> option or its client-specific equivalents)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:4055 msgid "" "If the client successfully authenticates by any of these methods, it will " "attempt to cache the credentials on disk (unless the user has disabled this " "behavior, as mentioned earlier)." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:4070 msgid "" "After reading this chapter, you should have a firm grasp on some of " "Subversion's features that, while perhaps not used <emphasis>every</" "emphasis> time you interact with your version control system, are certainly " "handy to know about. But don't stop here! Read on to the following chapter, " "where you'll learn about branches, tags, and merging. Then you'll have " "nearly full mastery of the Subversion client. Though our lawyers won't " "allow us to promise you anything, this additional knowledge could make you " "measurably more cool. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:4080 msgid "" "No purchase necessary. Certains terms and conditions apply. No guarantee " "of coolness—implicit or otherwise—exists. Mileage may vary." msgstr "" # type: Content of: <chapter><title> #: ../en/book/ch04-branching-and-merging.xml:2 msgid "Branching and Merging" msgstr "" # type: Content of: <chapter><blockquote><attribution> #: ../en/book/ch04-branching-and-merging.xml:5 msgid "Confucius" msgstr "" # type: Content of: <chapter><blockquote><para> #: ../en/book/ch04-branching-and-merging.xml:6 msgid "<quote>君子务本 (It is upon the Trunk that a gentleman works.)</quote>" msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch04-branching-and-merging.xml:11 msgid "" "Branching, tagging, and merging are concepts common to almost all version " "control systems. If you're not familiar with these ideas, we provide a good " "introduction in this chapter. If you are familiar, hopefully you'll find it " "interesting to see how Subversion implements them." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch04-branching-and-merging.xml:17 msgid "" "Branching is a fundamental part of version control. If you're going to " "allow Subversion to manage your data, this is a feature you'll eventually " "come to depend on. This chapter assumes that you're already familiar with " "Subversion's basic concepts (<xref linkend=\"svn.basic\"/>)." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch04-branching-and-merging.xml:28 #, fuzzy #| msgid "What's in a Name?" msgid "What's a Branch?" msgstr "Was steckt in einem Namen?" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:30 msgid "" "Suppose it's your job to maintain a document for a division in your " "company—a handbook of some sort. One day a different division asks " "you for the same handbook, but with a few parts <quote>tweaked</quote> for " "them, since they do things slightly differently." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:36 msgid "" "What do you do in this situation? You do the obvious: make a second copy of " "your document and begin maintaining the two copies separately. As each " "department asks you to make small changes, you incorporate them into one " "copy or the other." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:41 msgid "" "You often want to make the same change to both copies. For example, if you " "discover a typo in the first copy, it's very likely that the same typo " "exists in the second copy. The two documents are almost the same, after " "all; they differ only in small, specific ways." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:47 msgid "" "This is the basic concept of a <firstterm>branch</firstterm>—namely, a " "line of development that exists independently of another line, yet still " "shares a common history if you look far enough back in time. A branch " "always begins life as a copy of something, and moves on from there, " "generating its own history (see <xref linkend=\"svn.branchmerge.whatis.dia-1" "\"/>)." msgstr "" # type: Content of: <chapter><sect1><figure><title> #: ../en/book/ch04-branching-and-merging.xml:56 msgid "Branches of development" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:60 msgid "" "Subversion has commands to help you maintain parallel branches of your files " "and directories. It allows you to create branches by copying your data, and " "remembers that the copies are related to one another. It also helps you " "duplicate changes from one branch to another. Finally, it can make portions " "of your working copy reflect different branches so that you can <quote>mix " "and match</quote> different lines of development in your daily work." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:75 msgid "Using Branches" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:77 msgid "" "At this point, you should understand how each commit creates an entirely new " "filesystem tree (called a <quote>revision</quote>) in the repository. If " "you don't, go back and read about revisions in <xref linkend=\"svn.basic.in-" "action.revs\"/>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:82 msgid "" "For this chapter, we'll go back to the same example from <xref linkend=\"svn." "basic\"/>. Remember that you and your collaborator, Sally, are sharing a " "repository that contains two projects, <filename>paint</filename> and " "<filename>calc</filename>. Notice that in <xref linkend=\"svn.branchmerge." "using.dia-1\"/>, however, each project directory now contains subdirectories " "named <filename>trunk</filename> and <filename>branches</filename>. The " "reason for this will soon become clear." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:93 #, fuzzy #| msgid "Recommended Repository Layout" msgid "Starting repository layout" msgstr "Empfohlene Repository Aufteilung" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:97 msgid "" "As before, assume that Sally and you both have working copies of the " "<quote>calc</quote> project. Specifically, you each have a working copy of " "<filename>/calc/trunk</filename>. All the files for the project are in this " "subdirectory rather than in <filename>/calc</filename> itself, because your " "team has decided that <filename>/calc/trunk</filename> is where the " "<quote>main line</quote> of development is going to take place." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:106 msgid "" "Let's say that you've been given the task of implementing a large software " "feature. It will take a long time to write, and will affect all the files " "in the project. The immediate problem is that you don't want to interfere " "with Sally, who is in the process of fixing small bugs here and there. " "She's depending on the fact that the latest version of the project (in " "<filename>/calc/trunk</filename>) is always usable. If you start committing " "your changes bit by bit, you'll surely break things for Sally (and other " "team members as well)." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:116 msgid "" "One strategy is to crawl into a hole: you and Sally can stop sharing " "information for a week or two. That is, start gutting and reorganizing all " "the files in your working copy, but don't commit or update until you're " "completely finished with the task. There are a number of problems with " "this, though. First, it's not very safe. Most people like to save their " "work to the repository frequently, should something bad accidentally happen " "to their working copy. Second, it's not very flexible. If you do your work " "on different computers (perhaps you have a working copy of <filename>/calc/" "trunk</filename> on two different machines), you'll need to manually copy " "your changes back and forth or just do all the work on a single computer. " "By that same token, it's difficult to share your changes in progress with " "anyone else. A common software development <quote>best practice</quote> is " "to allow your peers to review your work as you go. If nobody sees your " "intermediate commits, you lose potential feedback and may end up going down " "the wrong path for weeks before another person on your team notices. " "Finally, when you're finished with all your changes, you might find it very " "difficult to remerge your final work with the rest of the company's main " "body of code. Sally (or others) may have made many other changes in the " "repository that are difficult to incorporate into your working copy—" "especially if you run <command>svn update</command> after weeks of isolation." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:142 msgid "" "The better solution is to create your own branch, or line of development, in " "the repository. This allows you to save your half-broken work frequently " "without interfering with others, yet you can still selectively share " "information with your collaborators. You'll see exactly how this works as " "we go." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:151 msgid "Creating a Branch" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:153 msgid "" "Creating a branch is very simple—you make a copy of the project in the " "repository using the <command>svn copy</command> command. Subversion is " "able to copy not only single files, but whole directories as well. In this " "case, you want to make a copy of the <filename>/calc/trunk</filename> " "directory. Where should the new copy live? Wherever you wish—it's a " "matter of project policy. Let's say that your team has a policy of creating " "branches in the <filename>/calc/branches</filename> area of the repository, " "and you want to name your branch <literal>my-calc-branch</literal>. You'll " "want to create a new directory, <filename>/calc/branches/my-calc-branch</" "filename>, which begins its life as a copy of <filename>/calc/trunk</" "filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:169 msgid "" "You may already have seen <command>svn copy</command> used to copy one file " "to another within a working copy. But it can also be used to do a " "<quote>remote</quote> copy entirely within the repository. Just copy one " "URL to another:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:174 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk \\\n" " http://svn.example.com/repos/calc/branches/my-calc-branch \\\n" " -m \"Creating a private branch of /calc/trunk.\"\n" "\n" "Committed revision 341.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:182 msgid "" "This command causes a near-instantaneous commit in the repository, creating " "a new directory in revision 341. The new directory is a copy of <filename>/" "calc/trunk</filename>. This is shown in <xref linkend=\"svn.branchmerge." "using.create.dia-1\"/>. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:188 msgid "" "Subversion does not support copying between different repositories. When " "using URLs with <command>svn copy</command> or <command>svn move</command>, " "you can only copy items within the same repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:192 msgid "" "</footnote> While it's also possible to create a branch by using " "<command>svn copy</command> to duplicate a directory within the working " "copy, this technique isn't recommended. It can be quite slow, in fact! " "Copying a directory on the client side is a linear-time operation, in that " "it actually has to duplicate every file and subdirectory on the local disk. " "Copying a directory on the server, however, is a constant-time operation, " "and it's the way most people create branches." msgstr "" # type: Content of: <chapter><sect1><sect2><figure><title> #: ../en/book/ch04-branching-and-merging.xml:205 msgid "Repository with new copy" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch04-branching-and-merging.xml:210 msgid "Cheap Copies" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:212 msgid "" "Subversion's repository has a special design. When you copy a directory, " "you don't need to worry about the repository growing huge—Subversion " "doesn't actually duplicate any data. Instead, it creates a new directory " "entry that points to an <emphasis>existing</emphasis> tree. If you're an " "experienced Unix user, you'll recognize this as the same concept behind a " "hard link. As further changes are made to files and directories beneath the " "copied directory, Subversion continues to employ this hard link concept " "where it can. It duplicates data only when it is necessary to disambiguate " "different versions of objects." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:224 msgid "" "This is why you'll often hear Subversion users talk about <quote>cheap " "copies.</quote> It doesn't matter how large the directory is—it takes " "a very tiny, constant amount of time and space to make a copy of it. In " "fact, this feature is the basis of how commits work in Subversion: each " "revision is a <quote>cheap copy</quote> of the previous revision, with a few " "items lazily changed within. (To read more about this, visit Subversion's " "web site and read about the <quote>bubble up</quote> method in Subversion's " "design documents.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:235 msgid "" "Of course, these internal mechanics of copying and sharing data are hidden " "from the user, who simply sees copies of trees. The main point here is that " "copies are cheap, both in time and in space. If you create a branch " "entirely within the repository (by running <userinput>svn copy " "<replaceable>URL1</replaceable> <replaceable>URL2</replaceable></" "userinput>), it's a quick, constant-time operation. Make branches as often " "as you want." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:248 msgid "Working with Your Branch" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:250 msgid "" "Now that you've created a branch of the project, you can check out a new " "working copy to start using it:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:253 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.example.com/repos/calc\n" #| "A calc/Makefile\n" #| "A calc/integer.c\n" #| "A calc/button.c\n" #| "Checked out revision 56.\n" #| "\n" #| "$ ls -A calc\n" #| "Makefile button.c integer.c .svn/\n" msgid "" "\n" "$ svn checkout http://svn.example.com/repos/calc/branches/my-calc-branch\n" "A my-calc-branch/Makefile\n" "A my-calc-branch/integer.c\n" "A my-calc-branch/button.c\n" "Checked out revision 341.\n" msgstr "" "\n" "$ svn checkout http://svn.example.com/repos/calc\n" "A calc/Makefile\n" "A calc/integer.c\n" "A calc/button.c\n" "Checked out revision 56.\n" "\n" "$ ls -A calc\n" "Makefile button.c integer.c .svn/\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:261 msgid "" "There's nothing special about this working copy; it simply mirrors a " "different directory in the repository. When you commit changes, however, " "Sally won't see them when she updates, because her working copy is of " "<filename>/calc/trunk</filename>. (Be sure to read <xref linkend=\"svn." "branchmerge.switchwc\"/> later in this chapter: the <command>svn switch</" "command> command is an alternative way of creating a working copy of a " "branch.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:270 msgid "Let's pretend that a week goes by, and the following commits happen:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:275 msgid "" "You make a change to <filename>/calc/branches/my-calc-branch/button.c</" "filename>, which creates revision 342." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:281 msgid "" "You make a change to <filename>/calc/branches/my-calc-branch/integer.c</" "filename>, which creates revision 343." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:287 msgid "" "Sally makes a change to <filename>/calc/trunk/integer.c</filename>, which " "creates revision 344." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:293 msgid "" "Now two independent lines of development (shown in <xref linkend=\"svn." "branchmerge.using.work.dia-1\"/>) are happening on <filename>integer.c</" "filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><figure><title> #: ../en/book/ch04-branching-and-merging.xml:298 msgid "The branching of one file's history" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:302 msgid "" "Things get interesting when you look at the history of changes made to your " "copy of <filename>integer.c</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:306 #, no-wrap msgid "" "\n" "$ pwd\n" "/home/user/my-calc-branch\n" "\n" "$ svn log -v integer.c\n" "------------------------------------------------------------------------\n" "r343 | user | 2002-11-07 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines\n" "Changed paths:\n" " M /calc/branches/my-calc-branch/integer.c\n" "\n" "* integer.c: frozzled the wazjub.\n" "\n" "------------------------------------------------------------------------\n" "r341 | user | 2002-11-03 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines\n" "Changed paths:\n" " A /calc/branches/my-calc-branch (from /calc/trunk:340)\n" "\n" "Creating a private branch of /calc/trunk.\n" "\n" "------------------------------------------------------------------------\n" "r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines\n" "Changed paths:\n" " M /calc/trunk/integer.c\n" "\n" "* integer.c: changed a docstring.\n" "\n" "------------------------------------------------------------------------\n" "r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines\n" "Changed paths:\n" " A /calc/trunk/integer.c\n" "\n" "* integer.c: adding this file to the project.\n" "\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:342 msgid "" "Notice that Subversion is tracing the history of your branch's " "<filename>integer.c</filename> all the way back through time, even " "traversing the point where it was copied. It shows the creation of the " "branch as an event in the history, because <filename>integer.c</filename> " "was implicitly copied when all of <filename>/calc/trunk/</filename> was " "copied. Now look at what happens when Sally runs the same command on her " "copy of the file:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:351 #, no-wrap msgid "" "\n" "$ pwd\n" "/home/sally/calc\n" "\n" "$ svn log -v integer.c\n" "------------------------------------------------------------------------\n" "r344 | sally | 2002-11-07 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines\n" "Changed paths:\n" " M /calc/trunk/integer.c\n" "\n" "* integer.c: fix a bunch of spelling errors.\n" "\n" "------------------------------------------------------------------------\n" "r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines\n" "Changed paths:\n" " M /calc/trunk/integer.c\n" "\n" "* integer.c: changed a docstring.\n" "\n" "------------------------------------------------------------------------\n" "r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines\n" "Changed paths:\n" " A /calc/trunk/integer.c\n" "\n" "* integer.c: adding this file to the project.\n" "\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:380 msgid "" "Sally sees her own revision 344 change, but not the change you made in " "revision 343. As far as Subversion is concerned, these two commits affected " "different files in different repository locations. However, Subversion " "<emphasis>does</emphasis> show that the two files share a common history. " "Before the branch copy was made in revision 341, the files used to be the " "same file. That's why you and Sally both see the changes made in revisions " "303 and 98." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:394 msgid "The Key Concepts Behind Branching" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:396 msgid "" "You should remember two important lessons from this section. First, " "Subversion has no internal concept of a branch—it knows only how to " "make copies. When you copy a directory, the resultant directory is only a " "<quote>branch</quote> because <emphasis>you</emphasis> attach that meaning " "to it. You may think of the directory differently, or treat it differently, " "but to Subversion it's just an ordinary directory that happens to carry some " "extra historical information." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:406 msgid "" "Second, because of this copy mechanism, Subversion's branches exist as " "<emphasis>normal filesystem directories</emphasis> in the repository. This " "is different from other version control systems, where branches are " "typically defined by adding extra-dimensional <quote>labels</quote> to " "collections of files. The location of your branch directory doesn't matter " "to Subversion. Most teams follow a convention of putting all branches into " "a <filename>/branches</filename> directory, but you're free to invent any " "policy you wish." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:426 msgid "Basic Merging" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:428 msgid "" "Now you and Sally are working on parallel branches of the project: you're " "working on a private branch, and Sally is working on the <firstterm>trunk</" "firstterm>, or main line of development." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:433 msgid "" "For projects that have a large number of contributors, it's common for most " "people to have working copies of the trunk. Whenever someone needs to make " "a long-running change that is likely to disrupt the trunk, a standard " "procedure is to create a private branch and commit changes there until all " "the work is complete." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:440 msgid "" "So, the good news is that you and Sally aren't interfering with each other. " "The bad news is that it's very easy to drift <emphasis>too</emphasis> far " "apart. Remember that one of the problems with the <quote>crawl in a hole</" "quote> strategy is that by the time you're finished with your branch, it may " "be near-impossible to merge your changes back into the trunk without a huge " "number of conflicts." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:448 msgid "" "Instead, you and Sally might continue to share changes as you work. It's up " "to you to decide which changes are worth sharing; Subversion gives you the " "ability to selectively <quote>copy</quote> changes between branches. And " "when you're completely finished with your branch, your entire set of branch " "changes can be copied back into the trunk. In Subversion terminology, the " "general act of replicating changes from one branch to another is called " "<firstterm>merging</firstterm>, and it is performed using various " "invocations of the <command>svn merge</command> command." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:459 msgid "" "In the examples that follow, we're assuming that both your Subversion client " "and server are running Subversion 1.5 (or later). If either client or " "server is older than version 1.5, things are more complicated: the system " "won't track changes automatically, and you'll have to use painful manual " "methods to achieve similar results. That is, you'll always need to use the " "detailed merge syntax to specify specific ranges of revisions to replicate " "(see <xref linkend=\"svn.branchmerge.advanced.advancedsyntax\"/> later in " "this chapter), and take special care to keep track of what's already been " "merged and what hasn't. For this reason, we <emphasis>strongly</emphasis> " "recommend that you make sure your client and server are at least at version " "1.5." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:475 msgid "Changesets" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:477 msgid "" "Before we proceed further, we should warn you that there's going to be a lot " "of discussion of <quote>changes</quote> in the pages ahead. A lot of people " "experienced with version control systems use the terms <quote>change</quote> " "and <quote>changeset</quote> interchangeably, and we should clarify what " "Subversion understands as a <firstterm>changeset</firstterm>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:485 msgid "" "Everyone seems to have a slightly different definition of changeset, or at " "least a different expectation of what it means for a version control system " "to have one. For our purposes, let's say that a changeset is just a " "collection of changes with a unique name. The changes might include textual " "edits to file contents, modifications to tree structure, or tweaks to " "metadata. In more common speak, a changeset is just a patch with a name you " "can refer to." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:494 msgid "" "In Subversion, a global revision number N names a tree in the repository: " "it's the way the repository looked after the Nth commit. It's also the name " "of an implicit changeset: if you compare tree N with tree N−1, you can " "derive the exact patch that was committed. For this reason, it's easy to " "think of revision N as not just a tree, but a changeset as well. If you use " "an issue tracker to manage bugs, you can use the revision numbers to refer " "to particular patches that fix bugs—for example, <quote>this issue was " "fixed by r9238.</quote> Somebody can then run <userinput>svn log -r 9238</" "userinput> to read about the exact changeset that fixed the bug, and run " "<userinput>svn diff -c 9238</userinput> to see the patch itself. And (as " "you'll see shortly) Subversion's <command>svn merge</command> command is " "able to use revision numbers. You can merge specific changesets from one " "branch to another by naming them in the merge arguments: passing <userinput>-" "c 9238</userinput> to <command>svn merge</command> would merge changeset " "r9238 into your working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:518 msgid "Keeping a Branch in Sync" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:520 msgid "" "Continuing with our running example, let's suppose that a week has passed " "since you started working on your private branch. Your new feature isn't " "finished yet, but at the same time you know that other people on your team " "have continued to make important changes in the project's <filename>/trunk</" "filename>. It's in your best interest to replicate those changes to your " "own branch, just to make sure they mesh well with your changes. In fact, " "this is a best practice: frequently keeping your branch in sync with the " "main development line helps prevent <quote>surprise</quote> conflicts when " "it comes time for you to fold your changes back into the trunk." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:533 msgid "" "Subversion is aware of the history of your branch and knows when it divided " "away from the trunk. To replicate the latest, greatest trunk changes to " "your branch, first make sure your working copy of the branch is " "<quote>clean</quote>—that it has no local modifications reported by " "<command>svn status</command>. Then simply run:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:541 #, no-wrap msgid "" "\n" "$ pwd\n" "/home/user/my-calc-branch\n" "\n" "$ svn merge http://svn.example.com/repos/calc/trunk\n" "--- Merging r345 through r356 into '.':\n" "U button.c\n" "U integer.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:551 msgid "" "This basic syntax—<userinput>svn merge <replaceable>URL</replaceable></" "userinput>—tells Subversion to merge all recent changes from the URL " "to the current working directory (which is typically the root of your " "working copy). After running the prior example, your branch working copy " "now contains new local modifications, and these edits are duplications of " "all of the changes that have happened on the trunk since you first created " "your branch:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:560 #, no-wrap msgid "" "\n" "$ svn status\n" " M .\n" "M button.c\n" "M integer.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:567 msgid "" "At this point, the wise thing to do is look at the changes carefully with " "<command>svn diff</command>, and then build and test your branch. Notice " "that the current working directory (<quote><filename>.</filename></quote>) " "has also been modified; the <command>svn diff</command> will show that its " "<literal>svn:mergeinfo</literal> property has been either created or " "modified. This is important merge-related metadata that you should " "<emphasis>not</emphasis> touch, since it will be needed by future " "<command>svn merge</command> commands. (We'll learn more about this " "metadata later in the chapter.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:579 msgid "" "After performing the merge, you might also need to resolve some conflicts " "(just as you do with <command>svn update</command>) or possibly make some " "small edits to get things working properly. (Remember, just because there " "are no <emphasis>syntactic</emphasis> conflicts doesn't mean there aren't " "any <emphasis>semantic</emphasis> conflicts!) If you encounter serious " "problems, you can always abort the local changes by running <userinput>svn " "revert . -R</userinput> (which will undo all local modifications) and start " "a long <quote>what's going on?</quote> discussion with your collaborators. " "If things look good, however, you can submit these changes into the " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:592 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" #| "Sending button.c\n" #| "Transmitting file data .\n" #| "Committed revision 57.\n" msgid "" "\n" "$ svn commit -m \"Merged latest trunk changes to my-calc-branch.\"\n" "Sending .\n" "Sending button.c\n" "Sending integer.c\n" "Transmitting file data ..\n" "Committed revision 357.\n" msgstr "" "\n" "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" "Sending button.c\n" "Transmitting file data .\n" "Committed revision 57.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:601 msgid "" "At this point, your private branch is now <quote>in sync</quote> with the " "trunk, so you can rest easier knowing that as you continue to work in " "isolation, you're not drifting too far away from what everyone else is doing." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch04-branching-and-merging.xml:608 msgid "Why Not Use Patches Instead?" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:610 msgid "" "A question may be on your mind, especially if you're a Unix user: why bother " "to use <command>svn merge</command> at all? Why not simply use the operating " "system's <command>patch</command> command to accomplish the same job? For " "example:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch04-branching-and-merging.xml:616 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "$ svn diff -r 341:HEAD http://svn.example.com/repos/calc/trunk > patchfile\n" "$ patch -p0 < patchfile\n" "Patching file integer.c using Plan A...\n" "Hunk #1 succeeded at 147.\n" "Hunk #2 succeeded at 164.\n" "Hunk #3 succeeded at 241.\n" "Hunk #4 succeeded at 249.\n" "done\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:628 msgid "" "In this particular example, there really isn't much difference. But " "<command>svn merge</command> has special abilities that surpass the " "<command>patch</command> program. The file format used by <command>patch</" "command> is quite limited; it's able to tweak file contents only. There's " "no way to represent changes to <emphasis>trees</emphasis>, such as the " "addition, removal, or renaming of files and directories. Nor can the " "<command>patch</command> program notice changes to properties. If Sally's " "change had, say, added a new directory, the output of <command>svn diff</" "command> wouldn't have mentioned it at all. <command>svn diff</command> " "outputs only the limited patch format, so there are some ideas it simply " "can't express." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:643 msgid "" "The <command>svn merge</command> command, however, can express changes in " "tree structure and properties by directly applying them to your working " "copy. Even more important, this command records the changes that have been " "duplicated to your branch so that Subversion is aware of exactly which " "changes exist in each location (see <xref linkend=\"svn.branchmerge." "basicmerging.mergeinfo\"/>.) This is a critical feature that makes branch " "management usable; without it, users would have to manually keep notes on " "which sets of changes have or haven't been merged yet." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:657 msgid "" "Suppose that another week has passed. You've committed more changes to your " "branch, and your comrades have continued to improve the trunk as well. Once " "again, you'd like to replicate the latest trunk changes to your branch and " "bring yourself in sync. Just run the same merge command again!" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:664 #, no-wrap msgid "" "\n" "$ svn merge http://svn.example.com/repos/calc/trunk\n" "--- Merging r357 through r380 into '.':\n" "U integer.c\n" "U Makefile\n" "A README\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:672 msgid "" "Subversion knows which trunk changes you've already replicated to your " "branch, so it carefully replicates only those changes you don't yet have. " "Once again, you'll have to build, test, and <command>svn commit</command> " "the local modifications to your branch." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:678 msgid "" "What happens when you finally finish your work, though? Your new feature is " "done, and you're ready to merge your branch changes back to the trunk (so " "your team can enjoy the bounty of your labor). The process is simple. " "First, bring your branch in sync with the trunk again, just as you've been " "doing all along:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:685 #, no-wrap msgid "" "\n" "$ svn merge http://svn.example.com/repos/calc/trunk\n" "--- Merging r381 through r385 into '.':\n" "U button.c\n" "U README\n" "\n" "$ # build, test, ...\n" "\n" "$ svn commit -m \"Final merge of trunk changes to my-calc-branch.\"\n" "Sending .\n" "Sending button.c\n" "Sending README\n" "Transmitting file data ..\n" "Committed revision 390.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:701 msgid "" "Now, you use <command>svn merge</command> to replicate your branch changes " "back into the trunk. You'll need an up-to-date working copy of <filename>/" "trunk</filename>. You can do this by either doing an <command>svn checkout</" "command>, dredging up an old trunk working copy from somewhere on your disk, " "or using <command>svn switch</command> (see <xref linkend=\"svn.branchmerge." "switchwc\"/>.) However you get a trunk working copy, remember that it's a " "best practice to do your merge into a working copy that has <emphasis>no</" "emphasis> local edits and has been recently updated (i.e., is not a mixture " "of local revisions). If your working copy isn't <quote>clean</quote> in " "these ways, you can run into some unnecessary conflict-related headaches and " "<command>svn merge</command> will likely return an error." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:718 msgid "" "Once you have a clean working copy of the trunk, you're ready to merge your " "branch back into it:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:721 #, no-wrap msgid "" "\n" "$ pwd\n" "/home/user/calc-trunk\n" "\n" "$ svn update # (make sure the working copy is up to date)\n" "At revision 390.\n" "\n" "$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/my-calc-branch\n" "--- Merging differences between repository URLs into '.':\n" "U button.c\n" "U integer.c\n" "U Makefile\n" " U .\n" "\n" "$ # build, test, verify, ...\n" "\n" "$ svn commit -m \"Merge my-calc-branch back into trunk!\"\n" "Sending .\n" "Sending button.c\n" "Sending integer.c\n" "Sending Makefile\n" "Transmitting file data ..\n" "Committed revision 391.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:746 msgid "" "Congratulations, your branch has now been remerged back into the main line " "of development. Notice our use of the <option>--reintegrate</option> option " "this time around. The option is critical for reintegrating changes from a " "branch back into its original line of development—don't forget it! " "It's needed because this sort of <quote>merge back</quote> is a different " "sort of work than what you've been doing up until now. Previously, we had " "been asking <command>svn merge</command> to grab the <quote>next set</quote> " "of changes from one line of development (the trunk) and duplicate them to " "another (your branch). This is fairly straightforward, and each time " "Subversion knows how to pick up where it left off. In our prior examples, " "you can see that first it merges the ranges 345:356 from trunk to branch; " "later on, it continues by merging the next contiguously available range, " "356:380. When doing the final sync, it merges the range 380:385." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:764 msgid "" "When merging your branch back to the trunk, however, the underlying " "mathematics is quite different. Your feature branch is now a mishmosh of " "both duplicated trunk changes and private branch changes, so there's no " "simple contiguous range of revisions to copy over. By specifying the " "<option>--reintegrate</option> option, you're asking Subversion to carefully " "replicate <emphasis>only</emphasis> those changes unique to your branch. " "(And in fact, it does this by comparing the latest trunk tree with the " "latest branch tree: the resulting difference is exactly your branch changes!)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:776 msgid "" "Now that your private branch is merged to trunk, you may wish to remove it " "from the repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:779 #, no-wrap msgid "" "\n" "$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \\\n" " -m \"Remove my-calc-branch.\"\n" "Committed revision 392.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:785 msgid "" "But wait! Isn't the history of that branch valuable? What if somebody wants " "to audit the evolution of your feature someday and look at all of your " "branch changes? No need to worry. Remember that even though your branch is " "no longer visible in the <filename>/branches</filename> directory, its " "existence is still an immutable part of the repository's history. A simple " "<command>svn log</command> command on the <filename>/branches</filename> URL " "will show the entire history of your branch. Your branch can even be " "resurrected at some point, should you desire (see <xref linkend=\"svn." "branchmerge.basicmerging.resurrect\"/>)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:797 msgid "" "In Subversion 1.5, once a <option>--reintegrate</option> merge is done from " "branch to trunk, the branch is no longer usable for further work. It's not " "able to correctly absorb new trunk changes, nor can it be properly " "reintegrated to trunk again. For this reason, if you want to keep working " "on your feature branch, we recommend destroying it and then re-creating it " "from the trunk:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:805 #, no-wrap msgid "" "\n" "$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \\\n" " -m \"Remove my-calc-branch.\"\n" "Committed revision 392.\n" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk \\\n" " http://svn.example.com/repos/calc/branches/new-branch\n" " -m \"Create a new branch from trunk.\"\n" "Committed revision 393.\n" "\n" "$ cd my-calc-branch\n" "\n" "$ svn switch http://svn.example.com/repos/calc/branches/new-branch\n" "Updated to revision 393.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:821 msgid "" "The final command in the prior example—<command>svn switch</" "command>—is a way of updating an existing working copy to reflect a " "different repository directory. We'll discuss this more in <xref linkend=" "\"svn.branchmerge.switchwc\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:830 msgid "Mergeinfo and Previews" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:832 msgid "" "The basic mechanism Subversion uses to track changesets—that is, which " "changes have been merged to which branches—is by recording data in " "properties. Specifically, merge data is tracked in the <literal>svn:" "mergeinfo</literal> property attached to files and directories. (If you're " "not familiar with Subversion properties, now is the time to skim <xref " "linkend=\"svn.advanced.props\"/>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:841 msgid "You can examine the property, just like any other:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:844 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "$ svn propget svn:mergeinfo .\n" "/trunk:341-390\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:850 msgid "" "It is <emphasis>not</emphasis> recommended that you change the value of this " "property yourself, unless you really know what you're doing. This property " "is automatically maintained by Subversion whenever you run <command>svn " "merge</command>. Its value indicates which changes (at a given path) have " "been replicated into the directory in question. In this case, the path is " "<filename>/trunk</filename> and the directory which has received the " "specific changes is <filename>/branches/my-calc-branch</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:860 msgid "" "There's also a subcommand, <command>svn mergeinfo</command>, which can be " "helpful in seeing not only which changesets a directory has absorbed, but " "also which changesets it's still eligible to receive. This gives a sort of " "preview of the next set of changes that <command>svn merge</command> will " "replicate to your branch." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:867 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "\n" "# Which changes have already been merged from trunk to branch?\n" "$ svn mergeinfo http://svn.example.com/repos/calc/trunk\n" "r341\n" "r342\n" "r343\n" "…\n" "r388\n" "r389\n" "r390\n" "\n" "# Which changes are still eligible to merge from trunk to branch?\n" "$ svn mergeinfo http://svn.example.com/repos/calc/trunk --show-revs eligible\n" "r391\n" "r392\n" "r393\n" "r394\n" "r395\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:889 msgid "" "The <command>svn mergeinfo</command> command requires a <quote>source</" "quote> URL (where the changes would be coming from), and takes an optional " "<quote>target</quote> URL (where the changes would be merged to). If no " "target URL is given, it assumes that the current working directory is the " "target. In the prior example, because we're querying our branch working " "copy, the command assumes we're interested in receiving changes to " "<filename>/branches/mybranch</filename> from the specified trunk URL." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:899 msgid "" "Another way to get a more precise preview of a merge operation is to use the " "<option>--dry-run</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:903 #, no-wrap msgid "" "\n" "$ svn merge http://svn.example.com/repos/calc/trunk --dry-run\n" "U integer.c\n" "\n" "$ svn status\n" "# nothing printed, working copy is still unchanged.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:911 msgid "" "The <option>--dry-run</option> option doesn't actually apply any local " "changes to the working copy. It shows only status codes that " "<emphasis>would</emphasis> be printed in a real merge. It's useful for " "getting a <quote>high-level</quote> preview of the potential merge, for " "those times when running <command>svn diff</command> gives too much detail." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch04-branching-and-merging.xml:920 msgid "" "After performing a merge operation, but before committing the results of the " "merge, you can use <userinput>svn diff --depth=empty <replaceable>/path/to/" "merge/target</replaceable></userinput> to see only the changes to the " "immediate target of your merge. If your merge target was a directory, only " "property differences will be displayed. This is a handy way to see the " "changes to the <literal>svn:mergeinfo</literal> property recorded by the " "merge operation, which will remind you about what you've just merged." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:931 msgid "" "Of course, the best way to preview a merge operation is to just do it! " "Remember, running <command>svn merge</command> isn't an inherently risky " "thing (unless you've made local modifications to your working copy—but " "we've already stressed that you shouldn't be merging into such an " "environment). If you don't like the results of the merge, simply run " "<userinput>svn revert . -R</userinput> to revert the changes from your " "working copy and retry the command with different options. The merge isn't " "final until you actually <command>svn commit</command> the results." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch04-branching-and-merging.xml:943 msgid "" "While it's perfectly fine to experiment with merges by running <command>svn " "merge</command> and <command>svn revert</command> over and over, you may run " "into some annoying (but easily bypassed) roadblocks. For example, if the " "merge operation adds a new file (i.e., schedules it for addition), " "<command>svn revert</command> won't actually remove the file; it simply " "unschedules the addition. You're left with an unversioned file. If you " "then attempt to run the merge again, you may get conflicts due to the " "unversioned file <quote>being in the way.</quote> Solution? After performing " "a revert, be sure to clean up the working copy and remove unversioned files " "and directories. The output of <command>svn status</command> should be as " "clean as possible, ideally showing no output." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:963 #, fuzzy #| msgid "Undoing Working Changes" msgid "Undoing Changes" msgstr "Zurücknehmen von Änderungen in der Arbeitskopie" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:965 msgid "" "An extremely common use for <command>svn merge</command> is to roll back a " "change that has already been committed. Suppose you're working away happily " "on a working copy of <filename>/calc/trunk</filename>, and you discover that " "the change made way back in revision 303, which changed <filename>integer.c</" "filename>, is completely wrong. It never should have been committed. You " "can use <command>svn merge</command> to <quote>undo</quote> the change in " "your working copy, and then commit the local modification to the " "repository. All you need to do is to specify a <emphasis>reverse</emphasis> " "difference. (You can do this by specifying <option>--revision 303:302</" "option>, or by an equivalent <option>--change -303</option>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:980 #, no-wrap msgid "" "\n" "$ svn merge -c -303 http://svn.example.com/repos/calc/trunk\n" "--- Reverse-merging r303 into 'integer.c':\n" "U integer.c\n" "\n" "$ svn status\n" " M .\n" "M integer.c\n" "\n" "$ svn diff\n" "…\n" "# verify that the change is removed\n" "…\n" "\n" "$ svn commit -m \"Undoing change committed in r303.\"\n" "Sending integer.c\n" "Transmitting file data .\n" "Committed revision 350.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1000 msgid "" "As we mentioned earlier, one way to think about a repository revision is as " "a specific changeset. By using the <option>-r</option> option, you can ask " "<command>svn merge</command> to apply a changeset, or a whole range of " "changesets, to your working copy. In our case of undoing a change, we're " "asking <command>svn merge</command> to apply changeset #303 to our working " "copy <emphasis>backward</emphasis>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1009 msgid "" "Keep in mind that rolling back a change like this is just like any other " "<command>svn merge</command> operation, so you should use <command>svn " "status</command> and <command>svn diff</command> to confirm that your work " "is in the state you want it to be in, and then use <command>svn commit</" "command> to send the final version to the repository. After committing, " "this particular changeset is no longer reflected in the <literal>HEAD</" "literal> revision." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1018 msgid "" "Again, you may be thinking: well, that really didn't undo the commit, did " "it? The change still exists in revision 303. If somebody checks out a " "version of the <filename>calc</filename> project between revisions 303 and " "349, she'll still see the bad change, right?" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:1024 msgid "" "Yes, that's true. When we talk about <quote>removing</quote> a change, " "we're really talking about removing it from the <literal>HEAD</literal> " "revision. The original change still exists in the repository's history. " "For most situations, this is good enough. Most people are only interested " "in tracking the <literal>HEAD</literal> of a project anyway. There are " "special cases, however, where you really might want to destroy all evidence " "of the commit. (Perhaps somebody accidentally committed a confidential " "document.) This isn't so easy, it turns out, because Subversion was " "deliberately designed to never lose information. Revisions are immutable " "trees that build upon one another. Removing a revision from history would " "cause a domino effect, creating chaos in all subsequent revisions and " "possibly invalidating all working copies. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:1040 msgid "" "The Subversion project has plans, however, to someday implement a command " "that would accomplish the task of permanently deleting information. In the " "meantime, see <xref linkend=\"svn.reposadmin.maint.tk.svndumpfilter\"/> for " "a possible workaround." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1052 msgid "Resurrecting Deleted Items" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1054 msgid "" "The great thing about version control systems is that information is never " "lost. Even when you delete a file or directory, it may be gone from the " "<literal>HEAD</literal> revision, but the object still exists in earlier " "revisions. One of the most common questions new users ask is, <quote>How do " "I get my old file or directory back?</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1061 msgid "" "The first step is to define exactly <emphasis>which</emphasis> item you're " "trying to resurrect. Here's a useful metaphor: you can think of every " "object in the repository as existing in a sort of two-dimensional coordinate " "system. The first coordinate is a particular revision tree, and the second " "coordinate is a path within that tree. So every version of your file or " "directory can be defined by a specific coordinate pair. (Remember the " "<quote>peg revision</quote> syntax—foo.c@224—mentioned back in " "<xref linkend=\"svn.advanced.pegrevs\"/>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1073 msgid "" "First, you might need to use <command>svn log</command> to discover the " "exact coordinate pair you wish to resurrect. A good strategy is to run " "<userinput>svn log --verbose</userinput> in a directory that used to contain " "your deleted item. The <option>--verbose</option> (<option>-v</option>) " "option shows a list of all changed items in each revision; all you need to " "do is find the revision in which you deleted the file or directory. You can " "do this visually, or by using another tool to examine the log output (via " "<command>grep</command>, or perhaps via an incremental search in an editor)." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1084 #, no-wrap msgid "" "\n" "$ cd parent-dir\n" "$ svn log -v\n" "…\n" "------------------------------------------------------------------------\n" "r808 | joe | 2003-12-26 14:29:40 -0600 (Fri, 26 Dec 2003) | 3 lines\n" "Changed paths:\n" " D /calc/trunk/real.c\n" " M /calc/trunk/integer.c\n" "\n" "Added fast fourier transform functions to integer.c.\n" "Removed real.c because code now in double.c.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1099 msgid "" "In the example, we're assuming that you're looking for a deleted file " "<filename>real.c</filename>. By looking through the logs of a parent " "directory, you've spotted that this file was deleted in revision 808. " "Therefore, the last version of the file to exist was in the revision right " "before that. Conclusion: you want to resurrect the path <filename>/calc/" "trunk/real.c</filename> from revision 807." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1108 msgid "" "That was the hard part—the research. Now that you know what you want " "to restore, you have two different choices." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1112 msgid "" "One option is to use <command>svn merge</command> to apply revision 808 " "<quote>in reverse.</quote> (We already discussed how to undo changes in " "<xref linkend=\"svn.branchmerge.basicmerging.undo\"/>.) This would have the " "effect of re-adding <filename>real.c</filename> as a local modification. " "The file would be scheduled for addition, and after a commit, the file would " "again exist in <literal>HEAD</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1121 msgid "" "In this particular example, however, this is probably not the best " "strategy. Reverse-applying revision 808 would not only schedule " "<filename>real.c</filename> for addition, but the log message indicates that " "it would also undo certain changes to <filename>integer.c</filename>, which " "you don't want. Certainly, you could reverse-merge revision 808 and then " "<command>svn revert</command> the local modifications to <filename>integer." "c</filename>, but this technique doesn't scale well. What if 90 files were " "changed in revision 808?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1132 msgid "" "A second, more targeted strategy is not to use <command>svn merge</command> " "at all, but rather to use the <command>svn copy</command> command. Simply " "copy the exact revision and path <quote>coordinate pair</quote> from the " "repository to your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1138 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk/real.c@807 ./real.c\n" "\n" "$ svn status\n" "A + real.c\n" "\n" "$ svn commit -m \"Resurrected real.c from revision 807, /calc/trunk/real.c.\"\n" "Adding real.c\n" "Transmitting file data .\n" "Committed revision 1390.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1150 msgid "" "The plus sign in the status output indicates that the item isn't merely " "scheduled for addition, but scheduled for addition <quote>with history.</" "quote> Subversion remembers where it was copied from. In the future, " "running <command>svn log</command> on this file will traverse back through " "the file's resurrection and through all the history it had prior to revision " "807. In other words, this new <filename>real.c</filename> isn't really new; " "it's a direct descendant of the original, deleted file. This is usually " "considered a good and useful thing. If, however, you wanted to resurrect " "the file <emphasis>without</emphasis> maintaining a historical link to the " "old file, this technique works just as well:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1164 #, no-wrap msgid "" "\n" "$ svn cat http://svn.example.com/repos/calc/trunk/real.c@807 > ./real.c\n" "\n" "$ svn add real.c\n" "A real.c\n" "\n" "$ svn commit -m \"Re-created real.c from revision 807.\"\n" "Adding real.c\n" "Transmitting file data .\n" "Committed revision 1390.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1176 msgid "" "Although our example shows us resurrecting a file, note that these same " "techniques work just as well for resurrecting deleted directories. Also " "note that a resurrection doesn't have to happen in your working copy—" "it can happen entirely in the repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1182 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk/real.c@807 \\\n" " http://svn.example.com/repos/calc/trunk/ \\\n" " -m \"Resurrect real.c from revision 807.\"\n" "Committed revision 1390.\n" "\n" "$ svn update\n" "A real.c\n" "Updated to revision 1390.\n" msgstr "" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:1201 #, fuzzy #| msgid "Advanced users" msgid "Advanced Merging" msgstr "Fortgeschrittene" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:1203 msgid "" "Here ends the automated magic. Sooner or later, once you get the hang of " "branching and merging, you're going to have to ask Subversion to merge " "<emphasis>specific</emphasis> changes from one place to another. To do " "this, you're going to have to start passing more complicated arguments to " "<command>svn merge</command>. The next section describes the fully expanded " "syntax of the command and discusses a number of common scenarios that " "require it." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1215 msgid "Cherrypicking" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1217 msgid "" "Just as the term <quote>changeset</quote> is often used in version control " "systems, so is the term <firstterm>cherrypicking</firstterm>. This word " "refers to the act of choosing <emphasis>one</emphasis> specific changeset " "from a branch and replicating it to another. Cherrypicking may also refer " "to the act of duplicating a particular set of (not necessarily contiguous!) " "changesets from one branch to another. This is in contrast to more typical " "merging scenarios, where the <quote>next</quote> contiguous range of " "revisions is duplicated automatically." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1229 msgid "" "Why would people want to replicate just a single change? It comes up more " "often than you'd think. For example, let's go back in time and imagine that " "you haven't yet merged your private feature branch back to the trunk. At " "the water cooler, you get word that Sally made an interesting change to " "<filename>integer.c</filename> on the trunk. Looking over the history of " "commits to the trunk, you see that in revision 355 she fixed a critical bug " "that directly impacts the feature you're working on. You might not be ready " "to merge all the trunk changes to your branch just yet, but you certainly " "need that particular bug fix in order to continue your work." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1242 #, no-wrap msgid "" "\n" "$ svn diff -c 355 http://svn.example.com/repos/calc/trunk\n" "\n" "Index: integer.c\n" "===================================================================\n" "--- integer.c\t(revision 354)\n" "+++ integer.c\t(revision 355)\n" "@@ -147,7 +147,7 @@\n" " case 6: sprintf(info->operating_system, \"HPFS (OS/2 or NT)\"); break;\n" " case 7: sprintf(info->operating_system, \"Macintosh\"); break;\n" " case 8: sprintf(info->operating_system, \"Z-System\"); break;\n" "- case 9: sprintf(info->operating_system, \"CP/MM\");\n" "+ case 9: sprintf(info->operating_system, \"CP/M\"); break;\n" " case 10: sprintf(info->operating_system, \"TOPS-20\"); break;\n" " case 11: sprintf(info->operating_system, \"NTFS (Windows NT)\"); break;\n" " case 12: sprintf(info->operating_system, \"QDOS\"); break;\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1260 msgid "" "Just as you used <command>svn diff</command> in the prior example to examine " "revision 355, you can pass the same option to <command>svn merge</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1264 #, no-wrap msgid "" "\n" "$ svn merge -c 355 http://svn.example.com/repos/calc/trunk\n" "U integer.c\n" "\n" "$ svn status\n" "M integer.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1272 msgid "" "You can now go through the usual testing procedures before committing this " "change to your branch. After the commit, Subversion marks r355 as having " "been merged to the branch so that future <quote>magic</quote> merges that " "synchronize your branch with the trunk know to skip over r355. (Merging the " "same change to the same branch almost always results in a conflict!)" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1280 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "\n" "$ svn propget svn:mergeinfo .\n" "/trunk:341-349,355\n" "\n" "# Notice that r355 isn't listed as \"eligible\" to merge, because\n" "# it's already been merged.\n" "$ svn mergeinfo http://svn.example.com/repos/calc/trunk --show-revs eligible\n" "r350\n" "r351\n" "r352\n" "r353\n" "r354\n" "r356\n" "r357\n" "r358\n" "r359\n" "r360\n" "\n" "$ svn merge http://svn.example.com/repos/calc/trunk\n" "--- Merging r350 through r354 into '.':\n" " U .\n" "U integer.c\n" "U Makefile\n" "--- Merging r356 through r360 into '.':\n" " U .\n" "U integer.c\n" "U button.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1311 msgid "" "This use case of replicating (or <firstterm>backporting</firstterm>) bug " "fixes from one branch to another is perhaps the most popular reason for " "cherrypicking changes; it comes up all the time, for example, when a team is " "maintaining a <quote>release branch</quote> of software. (We discuss this " "pattern in <xref linkend=\"svn.branchmerge.commonpatterns.release\"/>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:1320 msgid "" "Did you notice how, in the last example, the merge invocation caused two " "distinct ranges of merges to be applied? The <command>svn merge</command> " "command applied two independent patches to your working copy to skip over " "changeset 355, which your branch already contained. There's nothing " "inherently wrong with this, except that it has the potential to make " "conflict resolution trickier. If the first range of changes creates " "conflicts, you <emphasis>must</emphasis> resolve them interactively for the " "merge process to continue and apply the second range of changes. If you " "postpone a conflict from the first wave of changes, the whole merge command " "will bail out with an error message. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:1334 msgid "" "At least, this is true in Subversion 1.5 at the time of this writing. This " "behavior may improve in future versions of Subversion." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1341 msgid "" "A word of warning: while <command>svn diff</command> and <command>svn merge</" "command> are very similar in concept, they do have different syntax in many " "cases. Be sure to read about them in <xref linkend=\"svn.ref\"/> for " "details, or ask <command>svn help</command>. For example, <command>svn " "merge</command> requires a working copy path as a target, that is, a place " "where it should apply the generated patch. If the target isn't specified, " "it assumes you are trying to perform one of the following common operations:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1353 msgid "" "You want to merge directory changes into your current working directory." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1357 msgid "" "You want to merge the changes in a specific file into a file by the same " "name that exists in your current working directory." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1363 msgid "" "If you are merging a directory and haven't specified a target path, " "<command>svn merge</command> assumes the first case and tries to apply the " "changes into your current directory. If you are merging a file, and that " "file (or a file by the same name) exists in your current working directory, " "<command>svn merge</command> assumes the second case and tries to apply the " "changes to a local file with the same name." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1376 msgid "Merge Syntax: Full Disclosure" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1378 msgid "" "You've now seen some examples of the <command>svn merge</command> command, " "and you're about to see several more. If you're feeling confused about " "exactly how merging works, you're not alone. Many users (especially those " "new to version control) are initially perplexed about the proper syntax of " "the command and about how and when the feature should be used. But fear " "not, this command is actually much simpler than you think! There's a very " "easy technique for understanding exactly how <command>svn merge</command> " "behaves." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1389 msgid "" "The main source of confusion is the <emphasis>name</emphasis> of the " "command. The term <quote>merge</quote> somehow denotes that branches are " "combined together, or that some sort of mysterious blending of data is going " "on. That's not the case. A better name for the command might have been " "<command>svn diff-and-apply</command>, because that's all that happens: two " "repository trees are compared, and the differences are applied to a working " "copy." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1399 msgid "" "If you're using <command>svn merge</command> to do basic copying of changes " "between branches, it will generally do the right thing automatically. For " "example, a command such as the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1404 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.example.com:9834/repos\n" #| "…\n" msgid "" "\n" "$ svn merge http://svn.example.com/repos/calc/some-branch\n" msgstr "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1408 msgid "" "will attempt to duplicate any changes made on <filename>some-branch</" "filename> into your current working directory, which is presumably a working " "copy that shares some historical connection to the branch. The command is " "smart enough to only duplicate changes that your working copy doesn't yet " "have. If you repeat this command once a week, it will only duplicate the " "<quote>newest</quote> branch changes that happened since you last merged." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1417 msgid "" "If you choose to use the <command>svn merge</command> command in all its " "full glory by giving it specific revision ranges to duplicate, the command " "takes three main arguments:" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1424 msgid "" "An initial repository tree (often called the <firstterm>left side</" "firstterm> of the comparison)" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1428 msgid "" "A final repository tree (often called the <firstterm>right side</firstterm> " "of the comparison)" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1432 msgid "" "A working copy to accept the differences as local changes (often called the " "<firstterm>target</firstterm> of the merge)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1438 msgid "" "Once these three arguments are specified, the two trees are compared, and " "the differences are applied to the target working copy as local " "modifications. When the command is done, the results are no different than " "if you had hand-edited the files or run various <command>svn add</command> " "or <command>svn delete</command> commands yourself. If you like the " "results, you can commit them. If you don't like the results, you can simply " "<command>svn revert</command> all of the changes." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1448 msgid "" "The syntax of <command>svn merge</command> allows you to specify the three " "necessary arguments rather flexibly. Here are some examples:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1452 #, no-wrap msgid "" "\n" "$ svn merge http://svn.example.com/repos/branch1@150 \\\n" " http://svn.example.com/repos/branch2@212 \\\n" " my-working-copy\n" "\n" "$ svn merge -r 100:200 http://svn.example.com/repos/trunk my-working-copy\n" "\n" "$ svn merge -r 100:200 http://svn.example.com/repos/trunk\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1462 msgid "" "The first syntax lays out all three arguments explicitly, naming each tree " "in the form <emphasis>URL@REV</emphasis> and naming the working copy " "target. The second syntax can be used as a shorthand for situations when " "you're comparing two different revisions of the same URL. The last syntax " "shows how the working copy argument is optional; if omitted, it defaults to " "the current directory." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1470 msgid "" "While the first example shows the <quote>full</quote> syntax of <command>svn " "merge</command>, it needs to be used very carefully; it can result in merges " "which do not record any <literal>svn:mergeinfo</literal> metadata at all. " "The next section talks a bit more about this." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1480 msgid "Merges Without Mergeinfo" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1482 msgid "" "Subversion tries to generate merge metadata whenever it can, to make future " "invocations of <command>svn merge</command> smarter. There are still " "situations, however, where <literal>svn:mergeinfo</literal> data is not " "created or changed. Remember to be a bit wary of these scenarios:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:1490 msgid "Merging unrelated sources" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1492 msgid "" "If you ask <command>svn merge</command> to compare two URLs that aren't " "related to each other, a patch will still be generated and applied to your " "working copy, but no merging metadata will be created. There's no common " "history between the two sources, and future <quote>smart</quote> merges " "depend on that common history." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:1503 msgid "Merging from foreign repositories" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1505 msgid "" "While it's possible to run a command such as <userinput>svn merge -r 100:200 " "<replaceable>http://svn.foreignproject.com/repos/trunk</replaceable></" "userinput>, the resultant patch will also lack any historical merge " "metadata. At time of this writing, Subversion has no way of representing " "different repository URLs within the <literal>svn:mergeinfo</literal> " "property." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:1516 msgid "Using <option>--ignore-ancestry</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1518 msgid "" "If this option is passed to <command>svn merge</command>, it causes the " "merging logic to mindlessly generate differences the same way that " "<command>svn diff</command> does, ignoring any historical relationships. We " "discuss this later in the chapter in <xref linkend=\"svn.branchmerge." "advanced.ancestry\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:1528 msgid "Apply reverse merges to a target's natural history" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:1530 msgid "" "Earlier in this chapter (<xref linkend=\"svn.branchmerge.basicmerging.undo\"/" ">) we discussed how to use <command>svn merge</command> to apply a " "<quote>reverse patch</quote> as a way of rolling back changes. If this " "technique is used to undo a change to an object's personal history (e.g., " "commit r5 to the trunk, then immediately roll back r5 using <userinput>svn " "merge . -c -5</userinput>), this sort of merge doesn't affect the recorded " "mergeinfo. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:1540 msgid "" "Interestingly, after rolling back a revision like this, we wouldn't be able " "to reapply the revision using <userinput>svn merge . -c 5</userinput>, since " "the mergeinfo would already list r5 as being applied. We would have to use " "the <option>--ignore-ancestry</option> option to make the merge command " "ignore the existing mergeinfo!" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1558 msgid "More on Merge Conflicts" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1560 msgid "" "Just like the <command>svn update</command> command, <command>svn merge</" "command> applies changes to your working copy. And therefore it's also " "capable of creating conflicts. The conflicts produced by <command>svn " "merge</command>, however, are sometimes different, and this section explains " "those differences." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1567 msgid "" "To begin with, assume that your working copy has no local edits. When you " "<command>svn update</command> to a particular revision, the changes sent by " "the server will always apply <quote>cleanly</quote> to your working copy. " "The server produces the delta by comparing two trees: a virtual snapshot of " "your working copy, and the revision tree you're interested in. Because the " "left hand side of the comparison is exactly equal to what you already have, " "the delta is guaranteed to correctly convert your working copy into the " "right hand tree." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1578 msgid "" "But <command>svn merge</command> has no such guarantees and can be much more " "chaotic: the advanced user can ask the server to compare <emphasis>any</" "emphasis> two trees at all, even ones that are unrelated to the working " "copy! This means there's large potential for human error. Users will " "sometimes compare the wrong two trees, creating a delta that doesn't apply " "cleanly. <command>svn merge</command> will do its best to apply as much of " "the delta as possible, but some parts may be impossible. Just as the Unix " "<command>patch</command> command sometimes complains about <quote>failed " "hunks,</quote> <command>svn merge</command> will similarly complain about " "<quote>skipped targets</quote>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1592 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn update\n" #| "U INSTALL\n" #| "G README\n" #| "Conflict discovered in 'bar.c'.\n" #| "Select: (p) postpone, (df) diff-full, (e) edit,\n" #| " (h) help for more options:\n" msgid "" "\n" "$ svn merge -r 1288:1351 http://svn.example.com/repos/branch\n" "U foo.c\n" "U bar.c\n" "Skipped missing target: 'baz.c'\n" "U glub.c\n" "U sputter.h\n" "\n" "Conflict discovered in 'glorb.h'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options:\n" msgstr "" "\n" "$ svn update\n" "U INSTALL\n" "G README\n" "Conflict discovered in 'bar.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options:\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1605 msgid "" "In the previous example, it might be the case that <filename>baz.c</" "filename> exists in both snapshots of the branch being compared, and the " "resultant delta wants to change the file's contents, but the file doesn't " "exist in the working copy. Whatever the case, the <quote>skipped</quote> " "message means that the user is most likely comparing the wrong two trees; " "it's the classic sign of user error. When this happens, it's easy to " "recursively revert all the changes created by the merge (<userinput>svn " "revert . --recursive</userinput>), delete any unversioned files or " "directories left behind after the revert, and rerun <command>svn merge</" "command> with different arguments." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1619 msgid "" "Also notice that the preceeding example shows a conflict happening on " "<filename>glorb.h</filename>. We already stated that the working copy has " "no local edits: how can a conflict possibly happen? Again, because the user " "can use <command>svn merge</command> to define and apply any old delta to " "the working copy, that delta may contain textual changes that don't cleanly " "apply to a working file, even if the file has no local modifications." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1628 msgid "" "Another small difference between <command>svn update</command> and " "<command>svn merge</command> is the names of the full-text files created " "when a conflict happens. In <xref linkend=\"svn.tour.cycle.resolve\"/>, we " "saw that an update produces files named <filename>filename.mine</filename>, " "<filename>filename.rOLDREV</filename>, and <filename>filename.rNEWREV</" "filename>. When <command>svn merge</command> produces a conflict, though, " "it creates three files named <filename>filename.working</filename>, " "<filename>filename.left</filename>, and <filename>filename.right</" "filename>. In this case, the terms <quote>left</quote> and <quote>right</" "quote> are describing which side of the double-tree comparison the file came " "from. In any case, these differing names will help you distinguish between " "conflicts that happened as a result of an update and ones that happened as a " "result of a merge." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1651 #, fuzzy #| msgid "Undoing Working Changes" msgid "Blocking Changes" msgstr "Zurücknehmen von Änderungen in der Arbeitskopie" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1653 msgid "" "Sometimes there's a particular changeset that you don't want to be " "automatically merged. For example, perhaps your team's policy is to do new " "development work on <filename>/trunk</filename>, but to be more conservative " "about backporting changes to a stable branch you use for releasing to the " "public. On one extreme, you can manually cherrypick single changesets from " "the trunk to the branch—just the changes that are stable enough to " "pass muster. Maybe things aren't quite that strict, though; perhaps most of " "the time you'd like to just let <command>svn merge</command> automatically " "merge most changes from trunk to branch. In this case, you'd like a way to " "mask a few specific changes out, that is, prevent them from ever being " "automatically merged." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1668 msgid "" "In Subversion 1.5, the only way to block a changeset is to make the system " "believe that the change has <emphasis>already</emphasis> been merged. To do " "this, one can invoke a merge command with the <option>--record-only</option> " "option:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1674 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "\n" "$ svn propget svn:mergeinfo .\n" "/trunk:1680-3305\n" "\n" "# Let's make the metadata list r3328 as already merged.\n" "$ svn merge -c 3328 --record-only http://svn.example.com/repos/calc/trunk\n" "\n" "$ svn status\n" "M .\n" "\n" "$ svn propget svn:mergeinfo .\n" "/trunk:1680-3305,3328\n" "\n" "$ svn commit -m \"Block r3328 from being merged to the branch.\"\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1693 msgid "" "This technique works, but it's also a little bit dangerous. The main " "problem is that we're not clearly differentiating between the ideas of " "<quote>I don't want this change</quote> and <quote>I don't have this change." "</quote> We're effectively lying to the system, making it think that the " "change was previously merged. This puts the responsibility on you—the " "user—to remember that the change wasn't actually merged, it just " "wasn't wanted. There's no way to ask Subversion for a list of " "<quote>blocked changelists.</quote> If you want to track them (so that you " "can unblock them someday). you'll need to record them in a text file " "somewhere, or perhaps in an invented property. In Subversion 1.5, " "unfortunately, this is the only way to manage blocked revisions; the plans " "are to make a better interface for this in future versions." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1713 msgid "Merge-Sensitive Logs and Annotations" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1715 msgid "" "One of the main features of any version control system is to keep track of " "who changed what, and when they did it. The <command>svn log</command> and " "<command>svn blame</command> commands are just the tools for this: when " "invoked on individual files, they show not only the history of changesets " "that affected the file, but also exactly which user wrote which line of " "code, and when she did it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1723 msgid "" "When changes start getting replicated between branches, however, things " "start to get complicated. For example, if you were to ask <command>svn log</" "command> about the history of your feature branch, it would show exactly " "every revision that ever affected the branch:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1729 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "$ svn log -q\n" "------------------------------------------------------------------------\n" "r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line\n" "------------------------------------------------------------------------\n" "r388 | user | 2002-11-21 05:20:00 -0600 (Thu, 21 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r381 | user | 2002-11-20 15:07:06 -0600 (Wed, 20 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r359 | user | 2002-11-19 19:19:20 -0600 (Tue, 19 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r357 | user | 2002-11-15 14:29:52 -0600 (Fri, 15 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r343 | user | 2002-11-07 13:50:10 -0600 (Thu, 07 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r341 | user | 2002-11-03 07:17:16 -0600 (Sun, 03 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1753 msgid "" "But is this really an accurate picture of all the changes that happened on " "the branch? What's being left out here is the fact that revisions 390, 381, " "and 357 were actually the results of merging changes from the trunk. If you " "look at one of these logs in detail, the multiple trunk changesets that " "comprised the branch change are nowhere to be seen:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1760 #, no-wrap msgid "" "\n" "$ svn log -v -r 390\n" "------------------------------------------------------------------------\n" "r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line\n" "Changed paths:\n" " M /branches/my-calc-branch/button.c\n" " M /branches/my-calc-branch/README\n" "\n" "Final merge of trunk changes to my-calc-branch.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1771 msgid "" "We happen to know that this merge to the branch was nothing but a merge of " "trunk changes. How can we see those trunk changes as well? The answer is to " "use the <option>--use-merge-history</option> (<option>-g</option>) option. " "This option expands those <quote>child</quote> changes that were part of the " "merge." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1778 #, no-wrap msgid "" "\n" "$ svn log -v -r 390 -g\n" "------------------------------------------------------------------------\n" "r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line\n" "Changed paths:\n" " M /branches/my-calc-branch/button.c\n" " M /branches/my-calc-branch/README\n" "\n" "Final merge of trunk changes to my-calc-branch.\n" "------------------------------------------------------------------------\n" "r383 | sally | 2002-11-21 03:19:00 -0600 (Thu, 21 Nov 2002) | 2 lines\n" "Changed paths:\n" " M /branches/my-calc-branch/button.c\n" "Merged via: r390\n" "\n" "Fix inverse graphic error on button.\n" "------------------------------------------------------------------------\n" "r382 | sally | 2002-11-20 16:57:06 -0600 (Wed, 20 Nov 2002) | 2 lines\n" "Changed paths:\n" " M /branches/my-calc-branch/README\n" "Merged via: r390\n" "\n" "Document my last fix in README.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1803 msgid "" "By making the log operation use merge history, we see not just the revision " "we queried (r390), but also the two revisions that came along on the ride " "with it—a couple of changes made by Sally to the trunk. This is a " "much more complete picture of history!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1809 msgid "" "The <command>svn blame</command> command also takes the <option>--use-merge-" "history</option> (<option>-g</option>) option. If this option is " "neglected, somebody looking at a line-by-line annotation of <filename>button." "c</filename> may get the mistaken impression that you were responsible for " "the lines that fixed a certain error:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1816 #, no-wrap msgid "" "\n" "$ svn blame button.c\n" "…\n" " 390 user retval = inverse_func(button, path);\n" " 390 user return retval;\n" " 390 user }\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1825 msgid "" "And while it's true that you did actually commit those three lines in " "revision 390, two of them were actually written by Sally back in revision " "383:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1829 #, no-wrap msgid "" "\n" "$ svn blame button.c -g\n" "…\n" "G 383 sally retval = inverse_func(button, path);\n" "G 383 sally return retval;\n" " 390 user }\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1838 msgid "" "Now we know who to <emphasis>really</emphasis> blame for those two lines of " "code!" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1845 msgid "Noticing or Ignoring Ancestry" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1847 msgid "" "When conversing with a Subversion developer, you might very likely hear " "reference to the term <firstterm>ancestry</firstterm>. This word is used to " "describe the relationship between two objects in a repository: if they're " "related to each other, one object is said to be an ancestor of the other." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1854 msgid "" "For example, suppose you commit revision 100, which includes a change to a " "file <filename>foo.c</filename>. Then <filename>foo.c@99</filename> is an " "<quote>ancestor</quote> of <filename>foo.c@100</filename>. On the other " "hand, suppose you commit the deletion of <filename>foo.c</filename> in " "revision 101, and then add a new file by the same name in revision 102. In " "this case, <filename>foo.c@99</filename> and <filename>foo.c@102</filename> " "may appear to be related (they have the same path), but in fact are " "completely different objects in the repository. They share no history or " "<quote>ancestry.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1867 msgid "" "The reason for bringing this up is to point out an important difference " "between <command>svn diff</command> and <command>svn merge</command>. The " "former command ignores ancestry, while the latter command is quite sensitive " "to it. For example, if you asked <command>svn diff</command> to compare " "revisions 99 and 102 of <filename>foo.c</filename>, you would see line-based " "diffs; the <command>diff</command> command is blindly comparing two paths. " "But if you asked <command>svn merge</command> to compare the same two " "objects, it would notice that they're unrelated and first attempt to delete " "the old file, then add the new file; the output would indicate a deletion " "followed by an add:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1880 #, no-wrap msgid "" "\n" "D foo.c\n" "A foo.c\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1885 msgid "" "Most merges involve comparing trees that are ancestrally related to one " "another; therefore, <command>svn merge</command> defaults to this behavior. " "Occasionally, however, you may want the <command>merge</command> command to " "compare two unrelated trees. For example, you may have imported two source-" "code trees representing different vendor releases of a software project (see " "<xref linkend=\"svn.advanced.vendorbr\"/>). If you ask <command>svn merge</" "command> to compare the two trees, you'd see the entire first tree being " "deleted, followed by an add of the entire second tree! In these situations, " "you'll want <command>svn merge</command> to do a path-based comparison only, " "ignoring any relations between files and directories. Add the <option>--" "ignore-ancestry</option> option to your <command>merge</command> command, " "and it will behave just like <command>svn diff</command>. (And conversely, " "the <option>--notice-ancestry</option> option will cause <command>svn diff</" "command> to behave like the <command>svn merge</command> command.)" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1909 msgid "Merges and Moves" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1911 msgid "" "A common desire is to refactor source code, especially in Java-based " "software projects. Files and directories are shuffled around and renamed, " "often causing great disruption to everyone working on the project. Sounds " "like a perfect case to use a branch, doesn't it? Just create a branch, " "shuffle things around, and then merge the branch back to the trunk, right?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1919 msgid "" "Alas, this scenario doesn't work so well right now and is considered one of " "Subversion's current weak spots. The problem is that Subversion's " "<command>svn update</command> command isn't as robust as it should be, " "particularly when dealing with copy and move operations." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1925 msgid "" "When you use <command>svn copy</command> to duplicate a file, the repository " "remembers where the new file came from, but it fails to transmit that " "information to the client which is running <command>svn update</command> or " "<command>svn merge</command>. Instead of telling the client, <quote>Copy " "that file you already have to this new location,</quote> it sends down an " "entirely new file. This can lead to problems, especially because the same " "thing happens with renamed files. A lesser-known fact about Subversion is " "that it lacks <quote>true renames</quote>—the <command>svn move</" "command> command is nothing more than an aggregation of <command>svn copy</" "command> and <command>svn delete</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1939 msgid "" "For example, suppose that while working on your private branch, you rename " "<filename>integer.c</filename> to <filename>whole.c</filename>. Effectively " "you've created a new file in your branch that is a copy of the original " "file, and deleted the original file. Meanwhile, back on <filename>trunk</" "filename>, Sally has committed some improvements to <filename>integer.c</" "filename>. Now you decide to merge your branch to the trunk:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1948 #, no-wrap msgid "" "\n" "$ cd calc/trunk\n" "\n" "$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/my-calc-branch\n" "--- Merging differences between repository URLs into '.':\n" "D integer.c\n" "A whole.c\n" "U .\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1958 msgid "" "This doesn't look so bad at first glance, but it's also probably not what " "you or Sally expected. The merge operation has deleted the latest version " "of the <filename>integer.c</filename> file (the one containing Sally's " "latest changes), and blindly added your new <filename>whole.c</filename> " "file—which is a duplicate of the <emphasis>older</emphasis> version of " "<filename>integer.c</filename>. The net effect is that merging your " "<quote>rename</quote> to the branch has removed Sally's recent changes from " "the latest revision!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1969 msgid "" "This isn't true data loss; Sally's changes are still in the repository's " "history, but it may not be immediately obvious that this has happened. The " "moral of this story is that until Subversion improves, be very careful about " "merging copies and renames from one branch to another." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1980 msgid "Blocking Merge-Unaware Clients" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1982 msgid "" "If you've just upgraded your server to Subversion 1.5 or later, there's a " "significant risk that pre-1.5 Subversion clients can mess up your automated " "merge tracking. Why is this? When a pre-1.5 Subversion client performs " "<command>svn merge</command>, it doesn't modify the value of the " "<literal>svn:mergeinfo</literal> property at all. So the subsequent commit, " "despite being the result of a merge, doesn't tell the repository about the " "duplicated changes—that information is lost. Later on, when " "<quote>merge-aware</quote> clients attempt automatic merging, they're likely " "to run into all sorts of conflicts resulting from repeated merges." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1995 msgid "" "If you and your team are relying on the merge-tracking features of " "Subversion, you may want to configure your repository to prevent older " "clients from committing changes. The easy way to do this is by inspecting " "the <quote>capabilities</quote> parameter in the <literal>start-commit</" "literal> hook script. If the client reports itself as having " "<literal>mergeinfo</literal> capabilities, the hook script can allow the " "commit to start. If the client doesn't report that capability, have the " "hook deny the commit. We'll learn more about hook scripts in the next " "chapter; see <xref linkend=\"svn.reposadmin.create.hooks\"/> and <xref " "linkend=\"svn.ref.reposhooks.start-commit\"/> for details." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2014 msgid "The Final Word on Merge Tracking" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2016 msgid "" "The bottom line is that Subversion's merge-tracking feature has an extremely " "complex internal implementation, and the <literal>svn:mergeinfo</literal> " "property is the only window the user has into the machinery. Because the " "feature is relatively new, a numbers of edge cases and possible unexpected " "behaviors may pop up." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2023 msgid "" "For example, sometimes mergeinfo will be generated when running a simple " "<command>svn copy</command> or <command>svn move</command> command. " "Sometimes mergeinfo will appear on files that you didn't expect to be " "touched by an operation. Sometimes mergeinfo won't be generated at all, " "when you expect it to. Furthermore, the management of mergeinfo metadata " "has a whole set of taxonomies and behaviors around it, such as " "<quote>explicit</quote> versus <quote>implicit</quote> mergeinfo, " "<quote>operative</quote> versus <quote>inoperative</quote> revisions, " "specific mechanisms of mergeinfo <quote>elision,</quote> and even " "<quote>inheritance</quote> from parent to child directories." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2037 msgid "" "We've chosen not to cover these detailed topics in this book for a couple of " "reasons. First, the level of detail is absolutely overwhelming for a " "typical user. Second, as Subversion continues to improve, we feel that a " "typical user <emphasis>shouldn't</emphasis> have to understand these " "concepts; they'll eventually fade into the background as pesky " "implementation details. All that said, if you enjoy this sort of thing, you " "can get a fantastic overview in a paper posted at CollabNet's website: " "<ulink url=\"http://www.collab.net/community/subversion/articles/merge-info." "html\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2049 msgid "" "For now, if you want to steer clear of bugs and odd behaviors in automatic " "merging, the CollabNet article recommends that you stick to these simple " "best practices:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2055 msgid "" "For short-term feature branches, follow the simple procedure described " "throughout <xref linkend=\"svn.branchmerge.basicmerging\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2060 msgid "" "For long-lived release branches (as described in <xref linkend=\"svn." "branchmerge.commonpatterns\"/>), perform merges only on the root of the " "branch, not on subdirectories." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2066 msgid "" "Never merge into working copies with a mixture of working revision numbers, " "or with <quote>switched</quote> subdirectories (as described next in <xref " "linkend=\"svn.branchmerge.switchwc\"/>). A merge target should be a working " "copy which represents a <emphasis>single</emphasis> location in the " "repository at a single point in time." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2075 msgid "" "Don't ever edit the <literal>svn:mergeinfo</literal> property directly; use " "<command>svn merge</command> with the <option>--record-only</option> option " "to effect a desired change to the metadata (as demonstrated in <xref linkend=" "\"svn.branchmerge.advanced.blockchanges\"/>)." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2082 msgid "" "Always make sure you have complete read access to all of your merge sources, " "and that your target working copy has no sparse directories." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:2096 msgid "Traversing Branches" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2098 msgid "" "The <command>svn switch</command> command transforms an existing working " "copy to reflect a different branch. While this command isn't strictly " "necessary for working with branches, it provides a nice shortcut. In our " "earlier example, after creating your private branch, you checked out a fresh " "working copy of the new repository directory. Instead, you can simply ask " "Subversion to change your working copy of <filename>/calc/trunk</filename> " "to mirror the new branch location:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch04-branching-and-merging.xml:2108 #, no-wrap msgid "" "\n" "$ cd calc\n" "\n" "$ svn info | grep URL\n" "URL: http://svn.example.com/repos/calc/trunk\n" "\n" "$ svn switch http://svn.example.com/repos/calc/branches/my-calc-branch\n" "U integer.c\n" "U button.c\n" "U Makefile\n" "Updated to revision 341.\n" "\n" "$ svn info | grep URL\n" "URL: http://svn.example.com/repos/calc/branches/my-calc-branch\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2124 msgid "" "After <quote>switching</quote> to the branch, your working copy is no " "different from what you would get from doing a fresh checkout of the " "directory. And it's usually more efficient to use this command, because " "often branches differ by only a small degree. The server sends only the " "minimal set of changes necessary to make your working copy reflect the " "branch directory." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch04-branching-and-merging.xml:2132 #, fuzzy #| msgid "" #| "<command>svn status</command> also has a <option>--verbose</option> " #| "(<option>-v</option>) option, which will show you the status of " #| "<emphasis>every</emphasis> item in your working copy, even if it has not " #| "been changed:" msgid "" "The <command>svn switch</command> command also takes a <option>--revision</" "option> (<option>-r</option>) option, so you need not always move your " "working copy to the <literal>HEAD</literal> of the branch." msgstr "" "<command>svn status</command> hat auch eine <option>--verbose</option>-" "Option (<option>-v</option>), die Ihnen den Zustand <emphasis>jedes</" "emphasis> Objektes in der Arbeitskopie anzeigt, selbst wenn es sich nicht " "geändert hat:" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2137 msgid "" "Of course, most projects are more complicated than our <filename>calc</" "filename> example, and contain multiple subdirectories. Subversion users " "often follow a specific algorithm when using branches:" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2144 msgid "" "Copy the project's entire <quote>trunk</quote> to a new branch directory." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2148 msgid "" "Switch only <emphasis>part</emphasis> of the trunk working copy to mirror " "the branch." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2153 msgid "" "In other words, if a user knows that the branch work needs to happen on only " "a specific subdirectory, she uses <command>svn switch</command> to move only " "that subdirectory to the branch. (Or sometimes users will switch just a " "single working file to the branch!) That way, the user can continue to " "receive normal <quote>trunk</quote> updates to most of her working copy, but " "the switched portions will remain immune (unless someone commits a change to " "her branch). This feature adds a whole new dimension to the concept of a " "<quote>mixed working copy</quote>—not only can working copies contain " "a mixture of working revisions, but they can also contain a mixture of " "repository locations as well." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2166 msgid "" "If your working copy contains a number of switched subtrees from different " "repository locations, it continues to function as normal. When you update, " "you'll receive patches to each subtree as appropriate. When you commit, " "your local changes will still be applied as a single, atomic change to the " "repository." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:2172 msgid "" "Note that while it's okay for your working copy to reflect a mixture of " "repository locations, these locations must all be within the <emphasis>same</" "emphasis> repository. Subversion repositories aren't yet able to " "communicate with one another; that feature is planned for the future. " "<footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:2178 msgid "" "You <emphasis>can</emphasis>, however, use <command>svn switch</command> " "with the <option>--relocate</option> option if the URL of your server " "changes and you don't want to abandon an existing working copy. See <xref " "linkend=\"svn.ref.svn.c.switch\"/> for more information and an example." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch04-branching-and-merging.xml:2188 msgid "Switches and Updates" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:2190 msgid "" "Have you noticed that the output of <command>svn switch</command> and " "<command>svn update</command> looks the same? The switch command is actually " "a superset of the update command." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:2195 msgid "" "When you run <command>svn update</command>, you're asking the repository to " "compare two trees. The repository does so, and then sends a description of " "the differences back to the client. The only difference between " "<command>svn switch</command> and <command>svn update</command> is that the " "latter command always compares two identical repository paths." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:2203 msgid "" "That is, if your working copy is a mirror of <filename>/calc/trunk</" "filename>, <command>svn update</command> will automatically compare your " "working copy of <filename>/calc/trunk</filename> to <filename>/calc/trunk</" "filename> in the <literal>HEAD</literal> revision. If you're switching your " "working copy to a branch, <command>svn switch</command> will compare your " "working copy of <filename>/calc/trunk</filename> to some <emphasis>other</" "emphasis> branch directory in the <literal>HEAD</literal> revision." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:2215 msgid "" "In other words, an update moves your working copy through time. A switch " "moves your working copy through time <emphasis>and</emphasis> space." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2220 msgid "" "Because <command>svn switch</command> is essentially a variant of " "<command>svn update</command>, it shares the same behaviors; any local " "modifications in your working copy are preserved when new data arrives from " "the repository." msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch04-branching-and-merging.xml:2227 msgid "" "Have you ever found yourself making some complex edits (in your <filename>/" "trunk</filename> working copy) and suddenly realized, <quote>Hey, these " "changes ought to be in their own branch?</quote> A great technique to do " "this can be summarized in two steps:" msgstr "" # type: Content of: <chapter><sect1><tip><screen> #: ../en/book/ch04-branching-and-merging.xml:2233 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk \\\n" " http://svn.example.com/repos/calc/branches/newbranch \\\n" " -m \"Create branch 'newbranch'.\"\n" "Committed revision 353.\n" "$ svn switch http://svn.example.com/repos/calc/branches/newbranch\n" "At revision 353.\n" msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch04-branching-and-merging.xml:2242 msgid "" "The <command>svn switch</command> command, like <command>svn update</" "command>, preserves your local edits. At this point, your working copy is " "now a reflection of the newly created branch, and your next <command>svn " "commit</command> invocation will send your changes there." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:2256 msgid "Tags" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2258 msgid "" "Another common version control concept is a <firstterm>tag</firstterm>. A " "tag is just a <quote>snapshot</quote> of a project in time. In Subversion, " "this idea already seems to be everywhere. Each repository revision is " "exactly that—a snapshot of the filesystem after each commit." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2265 msgid "" "However, people often want to give more human-friendly names to tags, such " "as <literal>release-1.0</literal>. And they want to make snapshots of " "smaller subdirectories of the filesystem. After all, it's not so easy to " "remember that release 1.0 of a piece of software is a particular " "subdirectory of revision 4822." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2274 msgid "Creating a Simple Tag" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2276 msgid "" "Once again, <command>svn copy</command> comes to the rescue. If you want to " "create a snapshot of <filename>/calc/trunk</filename> exactly as it looks in " "the <literal>HEAD</literal> revision, make a copy of it:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2281 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk \\\n" " http://svn.example.com/repos/calc/tags/release-1.0 \\\n" " -m \"Tagging the 1.0 release of the 'calc' project.\"\n" "\n" "Committed revision 902.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2289 msgid "" "This example assumes that a <filename>/calc/tags</filename> directory " "already exists. (If it doesn't, you can create it using <command>svn mkdir</" "command>.) After the copy completes, the new <filename>release-1.0</" "filename> directory is forever a snapshot of how the <filename>/trunk</" "filename> directory looked in the <literal>HEAD</literal> revision at the " "time you made the copy. Of course, you might want to be more precise about " "exactly which revision you copy, in case somebody else may have committed " "changes to the project when you weren't looking. So if you know that " "revision 901 of <filename>/calc/trunk</filename> is exactly the snapshot you " "want, you can specify it by passing <option>-r 901</option> to the " "<command>svn copy</command> command." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2304 msgid "" "But wait a moment: isn't this tag creation procedure the same procedure we " "used to create a branch? Yes, in fact, it is. In Subversion, there's no " "difference between a tag and a branch. Both are just ordinary directories " "that are created by copying. Just as with branches, the only reason a " "copied directory is a <quote>tag</quote> is because <emphasis>humans</" "emphasis> have decided to treat it that way: as long as nobody ever commits " "to the directory, it forever remains a snapshot. If people start committing " "to it, it becomes a branch." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2315 msgid "" "If you are administering a repository, there are two approaches you can take " "to managing tags. The first approach is <quote>hands off</quote>: as a " "matter of project policy, decide where your tags will live, and make sure " "all users know how to treat the directories they copy. (That is, make sure " "they know not to commit to them.) The second approach is more paranoid: you " "can use one of the access control scripts provided with Subversion to " "prevent anyone from doing anything but creating new copies in the tags area " "(see <xref linkend=\"svn.serverconfig\"/>). The paranoid approach, however, " "isn't usually necessary. If a user accidentally commits a change to a tag " "directory, you can simply undo the change as discussed in the previous " "section. This is version control, after all!" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2334 msgid "Creating a Complex Tag" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2336 msgid "" "Sometimes you may want your <quote>snapshot</quote> to be more complicated " "than a single directory at a single revision." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2340 msgid "" "For example, pretend your project is much larger than our <filename>calc</" "filename> example: suppose it contains a number of subdirectories and many " "more files. In the course of your work, you may decide that you need to " "create a working copy that is designed to have specific features and bug " "fixes. You can accomplish this by selectively backdating files or " "directories to particular revisions (using <command>svn update</command> " "with the <option>-r</option> option liberally), by switching files and " "directories to particular branches (making use of <command>svn switch</" "command>), or even just by making a bunch of local changes. When you're " "done, your working copy is a hodgepodge of repository locations from " "different revisions. But after testing, you know it's the precise " "combination of data you need to tag." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2355 msgid "" "Time to make a snapshot. Copying one URL to another won't work here. In " "this case, you want to make a snapshot of your exact working copy " "arrangement and store it in the repository. Luckily, <command>svn copy</" "command> actually has four different uses (which you can read about in <xref " "linkend=\"svn.ref\"/>), including the ability to copy a working copy tree to " "the repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2363 #, no-wrap msgid "" "\n" "$ ls\n" "my-working-copy/\n" "\n" "$ svn copy my-working-copy \\\n" " http://svn.example.com/repos/calc/tags/mytag \\\n" " -m \"Tag my existing working copy state.\"\n" "\n" "Committed revision 940.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2374 msgid "" "Now there is a new directory in the repository, <filename>/calc/tags/mytag</" "filename>, which is an exact snapshot of your working copy—mixed " "revisions, URLs, local changes, and all." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2379 msgid "" "Other users have found interesting uses for this feature. Sometimes there " "are situations where you have a bunch of local changes made to your working " "copy, and you'd like a collaborator to see them. Instead of running " "<command>svn diff</command> and sending a patch file (which won't capture " "directory, symlink, or property changes), you can use <command>svn copy</" "command> to <quote>upload</quote> your working copy to a private area of the " "repository. Your collaborator can then either check out a verbatim copy of " "your working copy or use <command>svn merge</command> to receive your exact " "changes." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2391 msgid "" "While this is a nice method for uploading a quick snapshot of your working " "copy, note that this is <emphasis>not</emphasis> a good way to initially " "create a branch. Branch creation should be an event unto itself, and this " "method conflates the creation of a branch with extra changes to files, all " "within a single revision. This makes it very difficult (later on) to " "identify a single revision number as a branch point." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:2407 msgid "Branch Maintenance" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2409 msgid "" "You may have noticed by now that Subversion is extremely flexible. Because " "it implements branches and tags with the same underlying mechanism " "(directory copies), and because branches and tags appear in normal " "filesystem space, many people find Subversion intimidating. It's almost " "<emphasis>too</emphasis> flexible. In this section, we'll offer some " "suggestions for arranging and managing your data over time." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch04-branching-and-merging.xml:2419 #, fuzzy #| msgid "Repository URLs" msgid "Repository Layout" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2421 #, fuzzy #| msgid "" #| "While Subversion's flexibility allows you to lay out your repository in " #| "any way that you choose, we recommend that you create a <filename>trunk</" #| "filename> directory to hold the <quote>main line</quote> of development, " #| "a <filename>branches</filename> directory to contain branch copies, and a " #| "<filename>tags</filename> directory to contain tag copies. For example:" msgid "" "There are some standard, recommended ways to organize a repository. Most " "people create a <filename>trunk</filename> directory to hold the <quote>main " "line</quote> of development, a <filename>branches</filename> directory to " "contain branch copies, and a <filename>tags</filename> directory to contain " "tag copies. If a repository holds only one project, often people create " "these top-level directories:" msgstr "" "Obwohl die Flexibilität von Subversion es Ihnen erlaubt, Ihr Repository nach " "Belieben aufzuteilen, empfehlen wir, ein Verzeichnis <filename>trunk</" "filename> für die <quote>Hauptlinie</quote> der Entwicklung, ein Verzeichnis " "<filename>branches</filename> für Branch-Kopien und ein Verzeichnis " "<filename>tags</filename> für Tag-Kopien. Zum Beispiel:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2429 #, no-wrap msgid "" "\n" "/trunk\n" "/branches\n" "/tags\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2435 msgid "" "If a repository contains multiple projects, admins typically index their " "layout by project (see <xref linkend=\"svn.reposadmin.projects.chooselayout" "\"/> to read more about <quote>project roots</quote>):" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2440 #, no-wrap msgid "" "\n" "/paint/trunk\n" "/paint/branches\n" "/paint/tags\n" "/calc/trunk\n" "/calc/branches\n" "/calc/tags\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2449 msgid "" "Of course, you're free to ignore these common layouts. You can create any " "sort of variation, whatever works best for you or your team. Remember that " "whatever you choose, it's not a permanent commitment. You can reorganize " "your repository at any time. Because branches and tags are ordinary " "directories, the <command>svn move</command> command can move or rename them " "however you wish. Switching from one layout to another is just a matter of " "issuing a series of server-side moves; if you don't like the way things are " "organized in the repository, just juggle the directories around." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2460 msgid "" "Remember, though, that while moving directories may be easy to do, you need " "to be considerate of your users as well. Your juggling can be disorienting " "to users with existing working copies. If a user has a working copy of a " "particular repository directory, your <command>svn move</command> operation " "might remove the path from the latest revision. When the user next runs " "<command>svn update</command>, she will be told that her working copy " "represents a path that no longer exists, and the user will be forced to " "<command>svn switch</command> to the new location." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2476 msgid "Data Lifetimes" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2478 msgid "" "Another nice feature of Subversion's model is that branches and tags can " "have finite lifetimes, just like any other versioned item. For example, " "suppose you eventually finish all your work on your personal branch of the " "<filename>calc</filename> project. After merging all of your changes back " "into <filename>/calc/trunk</filename>, there's no need for your private " "branch directory to stick around anymore:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2487 #, no-wrap msgid "" "\n" "$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \\\n" " -m \"Removing obsolete branch of calc project.\"\n" "\n" "Committed revision 375.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2494 msgid "" "And now your branch is gone. Of course, it's not really gone: the directory " "is simply missing from the <literal>HEAD</literal> revision, no longer " "distracting anyone. If you use <command>svn checkout</command>, " "<command>svn switch</command>, or <command>svn list</command> to examine an " "earlier revision, you'll still be able to see your old branch." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2502 msgid "" "If browsing your deleted directory isn't enough, you can always bring it " "back. Resurrecting data is very easy in Subversion. If there's a deleted " "directory (or file) that you'd like to bring back into <literal>HEAD</" "literal>, simply use <command>svn copy</command> to copy it from the old " "revision:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2509 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/branches/my-calc-branch@374 \\\n" " http://svn.example.com/repos/calc/branches/my-calc-branch \\\n" " -m \"Restore my-calc-branch.\"\n" "\n" "Committed revision 376.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2517 msgid "" "In our example, your personal branch had a relatively short lifetime: you " "may have created it to fix a bug or implement a new feature. When your task " "is done, so is the branch. In software development, though, it's also " "common to have two <quote>main</quote> branches running side by side for " "very long periods. For example, suppose it's time to release a stable " "version of the <filename>calc</filename> project to the public, and you know " "it's going to take a couple of months to shake bugs out of the software. " "You don't want people to add new features to the project, but you don't want " "to tell all developers to stop programming either. So instead, you create a " "<quote>stable</quote> branch of the software that won't change much:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2531 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk \\\n" " http://svn.example.com/repos/calc/branches/stable-1.0 \\\n" " -m \"Creating stable branch of calc project.\"\n" "\n" "Committed revision 377.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2539 msgid "" "And now developers are free to continue adding cutting-edge (or " "experimental) features to <filename>/calc/trunk</filename>, and you can " "declare a project policy that only bug fixes are to be committed to " "<filename>/calc/branches/stable-1.0</filename>. That is, as people continue " "to work on the trunk, a human selectively ports bug fixes over to the stable " "branch. Even after the stable branch has shipped, you'll probably continue " "to maintain the branch for a long time—that is, as long as you " "continue to support that release for customers. We'll discuss this more in " "the next section." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:2559 msgid "Common Branching Patterns" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2561 msgid "" "There are many different uses for branching and <command>svn merge</" "command>, and this section describes the most common." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2565 msgid "" "Version control is most often used for software development, so here's a " "quick peek at two of the most common branching/merging patterns used by " "teams of programmers. If you're not using Subversion for software " "development, feel free to skip this section. If you're a software developer " "using version control for the first time, pay close attention, as these " "patterns are often considered best practices by experienced folk. These " "processes aren't specific to Subversion; they're applicable to any version " "control system. Still, it may help to see them described in Subversion " "terms." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2579 msgid "Release Branches" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2581 msgid "" "Most software has a typical life cycle: code, test, release, repeat. There " "are two problems with this process. First, developers need to keep writing " "new features while quality assurance teams take time to test supposedly " "stable versions of the software. New work cannot halt while the software is " "tested. Second, the team almost always needs to support older, released " "versions of software; if a bug is discovered in the latest code, it most " "likely exists in released versions as well, and customers will want to get " "that bug fix without having to wait for a major new release." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2593 msgid "" "Here's where version control can help. The typical procedure looks like " "this:" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2599 msgid "" "<emphasis>Developers commit all new work to the trunk.</emphasis> Day-to-day " "changes are committed to <filename>/trunk</filename>: new features, bug " "fixes, and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2608 msgid "" "<emphasis>The trunk is copied to a <quote>release</quote> branch.</emphasis> " "When the team thinks the software is ready for release (say, a 1.0 release), " "<filename>/trunk</filename> might be copied to <filename>/branches/1.0</" "filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2618 msgid "" "<emphasis>Teams continue to work in parallel.</emphasis> One team begins " "rigorous testing of the release branch, while another team continues new " "work (say, for version 2.0) on <filename>/trunk</filename>. If bugs are " "discovered in either location, fixes are ported back and forth as " "necessary. At some point, however, even that process stops. The branch is " "<quote>frozen</quote> for final testing right before a release." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2630 msgid "" "<emphasis>The branch is tagged and released.</emphasis> When testing is " "complete, <filename>/branches/1.0</filename> is copied to <filename>/" "tags/1.0.0</filename> as a reference snapshot. The tag is packaged and " "released to customers." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2640 msgid "" "<emphasis>The branch is maintained over time.</emphasis> While work " "continues on <filename>/trunk</filename> for version 2.0, bug fixes continue " "to be ported from <filename>/trunk</filename> to <filename>/branches/1.0</" "filename>. When enough bug fixes have accumulated, management may decide to " "do a 1.0.1 release: <filename>/branches/1.0</filename> is copied to " "<filename>/tags/1.0.1</filename>, and the tag is packaged and released." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2654 msgid "" "This entire process repeats as the software matures: when the 2.0 work is " "complete, a new 2.0 release branch is created, tested, tagged, and " "eventually released. After some years, the repository ends up with a number " "of release branches in <quote>maintenance</quote> mode, and a number of tags " "representing final shipped versions." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2665 msgid "Feature Branches" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2667 msgid "" "A <firstterm>feature branch</firstterm> is the sort of branch that's been " "the dominant example in this chapter (the one you've been working on while " "Sally continues to work on <filename>/trunk</filename>). It's a temporary " "branch created to work on a complex change without interfering with the " "stability of <filename>/trunk</filename>. Unlike release branches (which " "may need to be supported forever), feature branches are born, used for a " "while, merged back to the trunk, and then ultimately deleted. They have a " "finite span of usefulness." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2678 msgid "" "Again, project policies vary widely concerning exactly when it's appropriate " "to create a feature branch. Some projects never use feature branches at " "all: commits to <filename>/trunk</filename> are a free-for-all. The " "advantage to this system is that it's simple—nobody needs to learn " "about branching or merging. The disadvantage is that the trunk code is " "often unstable or unusable. Other projects use branches to an extreme: no " "change is <emphasis>ever</emphasis> committed to the trunk directly. Even " "the most trivial changes are created on a short-lived branch, carefully " "reviewed, and merged to the trunk. Then the branch is deleted. This system " "guarantees an exceptionally stable and usable trunk at all times, but at the " "cost of tremendous process overhead." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2693 msgid "" "Most projects take a middle-of-the-road approach. They commonly insist that " "<filename>/trunk</filename> compile and pass regression tests at all times. " "A feature branch is required only when a change requires a large number of " "destabilizing commits. A good rule of thumb is to ask this question: if the " "developer worked for days in isolation and then committed the large change " "all at once (so that <filename>/trunk</filename> were never destabilized), " "would it be too large a change to review? If the answer to that question is " "<quote>yes,</quote> the change should be developed on a feature branch. As " "the developer commits incremental changes to the branch, they can be easily " "reviewed by peers." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2707 msgid "" "Finally, there's the issue of how to best keep a feature branch in " "<quote>sync</quote> with the trunk as work progresses. As we mentioned " "earlier, there's a great risk to working on a branch for weeks or months; " "trunk changes may continue to pour in, to the point where the two lines of " "development differ so greatly that it may become a nightmare trying to merge " "the branch back to the trunk." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2715 msgid "" "This situation is best avoided by regularly merging trunk changes to the " "branch. Make up a policy: once a week, merge the last week's worth of trunk " "changes to the branch." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2719 msgid "" "At some point, you'll be ready to merge the <quote>synchronized</quote> " "feature branch back to the trunk. To do this, begin by doing a final merge " "of the latest trunk changes to the branch. When that's done, the latest " "versions of branch and trunk will be absolutely identical except for your " "branch changes. You would then merge back with the <option>--reintegrate</" "option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2727 #, no-wrap msgid "" "\n" "$ cd trunk-working-copy\n" "\n" "$ svn update\n" "At revision 1910.\n" "\n" "$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/mybranch\n" "--- Merging differences between repository URLs into '.':\n" "U real.c\n" "U integer.c\n" "A newdirectory\n" "A newdirectory/newfile\n" " U .\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2743 msgid "" "Another way of thinking about this pattern is that your weekly sync of trunk " "to branch is analogous to running <command>svn update</command> in a working " "copy, while the final merge step is analogous to running <command>svn " "commit</command> from a working copy. After all, what else <emphasis>is</" "emphasis> a working copy but a very shallow private branch? It's a branch " "that's capable of storing only one change at a time." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:2760 msgid "Vendor Branches" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2762 msgid "" "As is especially the case when developing software, the data that you " "maintain under version control is often closely related to, or perhaps " "dependent upon, someone else's data. Generally, the needs of your project " "will dictate that you stay as up to date as possible with the data provided " "by that external entity without sacrificing the stability of your own " "project. This scenario plays itself out all the time—anywhere that " "the information generated by one group of people has a direct effect on that " "which is generated by another group." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2772 msgid "" "For example, software developers might be working on an application that " "makes use of a third-party library. Subversion has just such a relationship " "with the Apache Portable Runtime (APR) library (see <xref linkend=\"svn." "developer.usingapi.apr\" />). The Subversion source code depends on the APR " "library for all its portability needs. In earlier stages of Subversion's " "development, the project closely tracked APR's changing API, always sticking " "to the <quote>bleeding edge</quote> of the library's code churn. Now that " "both APR and Subversion have matured, Subversion attempts to synchronize " "with APR's library API only at well-tested, stable release points." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2784 msgid "" "Now, if your project depends on someone else's information, you could " "attempt to synchronize that information with your own in several ways. Most " "painfully, you could issue oral or written instructions to all the " "contributors of your project, telling them to make sure they have the " "specific versions of that third-party information that your project needs. " "If the third-party information is maintained in a Subversion repository, you " "could also use Subversion's externals definitions to effectively <quote>pin " "down</quote> specific versions of that information to some location in your " "own working copy directory (see <xref linkend=\"svn.advanced.externals\" />)." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2797 msgid "" "But sometimes you want to maintain custom modifications to third-party code " "in your own version control system. Returning to the software development " "example, programmers might need to make modifications to that third-party " "library for their own purposes. These modifications might include new " "functionality or bug fixes, maintained internally only until they become " "part of an official release of the third-party library. Or the changes " "might never be relayed back to the library maintainers, existing solely as " "custom tweaks to make the library further suit the needs of the software " "developers." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2808 msgid "" "Now you face an interesting situation. Your project could house its custom " "modifications to the third-party data in some disjointed fashion, such as " "using patch files or full-fledged alternative versions of files and " "directories. But these quickly become maintenance headaches, requiring some " "mechanism by which to apply your custom changes to the third-party code and " "necessitating regeneration of those changes with each successive version of " "the third-party code that you track." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2817 msgid "" "The solution to this problem is to use <firstterm>vendor branches</" "firstterm>. A vendor branch is a directory tree in your own version control " "system that contains information provided by a third-party entity, or " "vendor. Each version of the vendor's data that you decide to absorb into " "your project is called a <firstterm>vendor drop</firstterm>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2824 msgid "" "Vendor branches provide two benefits. First, by storing the currently " "supported vendor drop in your own version control system, you ensure that " "the members of your project never need to question whether they have the " "right version of the vendor's data. They simply receive that correct " "version as part of their regular working copy updates. Second, because the " "data lives in your own Subversion repository, you can store your custom " "changes to it in-place—you have no more need of an automated (or " "worse, manual) method for swapping in your customizations." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2836 msgid "General Vendor Branch Management Procedure" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2838 msgid "" "Managing vendor branches generally works like this: first, you create a top-" "level directory (such as <filename>/vendor</filename>) to hold the vendor " "branches. Then you import the third-party code into a subdirectory of that " "top-level directory. You then copy that subdirectory into your main " "development branch (e.g., <filename>/trunk</filename>) at the appropriate " "location. You always make your local changes in the main development " "branch. With each new release of the code you are tracking, you bring it " "into the vendor branch and merge the changes into <filename>/trunk</" "filename>, resolving whatever conflicts occur between your local changes and " "the upstream changes." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2852 msgid "" "An example will help to clarify this algorithm. We'll use a scenario where " "your development team is creating a calculator program that links against a " "third-party complex number arithmetic library, libcomplex. We'll begin with " "the initial creation of the vendor branch and the import of the first vendor " "drop. We'll call our vendor branch directory <filename>libcomplex</" "filename>, and our code drops will go into a subdirectory of our vendor " "branch called <filename>current</filename>. And since <command>svn import</" "command> creates all the intermediate parent directories it needs, we can " "actually accomplish both of these steps with a single command:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2865 #, no-wrap msgid "" "\n" "$ svn import /path/to/libcomplex-1.0 \\\n" " http://svn.example.com/repos/vendor/libcomplex/current \\\n" " -m 'importing initial 1.0 vendor drop'\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2872 msgid "" "We now have the current version of the libcomplex source code in <filename>/" "vendor/libcomplex/current</filename>. Now, we tag that version (see <xref " "linkend=\"svn.branchmerge.tags\" />) and then copy it into the main " "development branch. Our copy will create a new directory called " "<filename>libcomplex</filename> in our existing <filename>calc</filename> " "project directory. It is in this copied version of the vendor data that we " "will make our customizations:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2882 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/vendor/libcomplex/current \\\n" " http://svn.example.com/repos/vendor/libcomplex/1.0 \\\n" " -m 'tagging libcomplex-1.0'\n" "…\n" "$ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0 \\\n" " http://svn.example.com/repos/calc/libcomplex \\\n" " -m 'bringing libcomplex-1.0 into the main branch'\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:2893 msgid "" "We check out our project's main branch—which now includes a copy of " "the first vendor drop—and we get to work customizing the libcomplex " "code. Before we know it, our modified version of libcomplex is now " "completely integrated into our calculator program. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:2899 msgid "And is entirely bug-free, of course!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2903 msgid "" "A few weeks later, the developers of libcomplex release a new version of " "their library—version 1.1—which contains some features and " "functionality that we really want. We'd like to upgrade to this new " "version, but without losing the customizations we made to the existing " "version. What we essentially would like to do is to replace our current " "baseline version of libcomplex 1.0 with a copy of libcomplex 1.1, and then " "re-apply the custom modifications we previously made to that library to the " "new version. But we actually approach the problem from the other direction, " "applying the changes made to libcomplex between versions 1.0 and 1.1 to our " "modified copy of it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2916 msgid "" "To perform this upgrade, we check out a copy of our vendor branch and " "replace the code in the <filename>current</filename> directory with the new " "libcomplex 1.1 source code. We quite literally copy new files on top of " "existing files, perhaps exploding the libcomplex 1.1 release tarball atop " "our existing files and directories. The goal here is to make our " "<filename>current</filename> directory contain only the libcomplex 1.1 code " "and to ensure that all that code is under version control. Oh, and we want " "to do this with as little version control history disturbance as possible." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2928 msgid "" "After replacing the 1.0 code with 1.1 code, <command>svn status</command> " "will show files with local modifications as well as, perhaps, some " "unversioned files. If we did what we were supposed to do, the unversioned " "files are only those new files introduced in the 1.1 release of " "libcomplex—we run <command>svn add</command> on those to get them " "under version control. If the 1.1 code no longer has certain files that " "were in the 1.0 tree, it may be hard to notice them; you'd have to compare " "the two trees with some external tool and then <command>svn delete</command> " "any files present in 1.0 but not in 1.1. (Although it might also be just " "fine to let these same files live on in unused obscurity!) Finally, once " "our <filename>current</filename> working copy contains only the libcomplex " "1.1 code, we commit the changes we made to get it looking that way." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2944 msgid "" "Our <filename>current</filename> branch now contains the new vendor drop. " "We tag the new version as 1.1 (in the same way we previously tagged the " "version 1.0 vendor drop), and then merge the differences between the tag of " "the previous version and the new current version into our main development " "branch:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2951 #, no-wrap msgid "" "\n" "$ cd working-copies/calc\n" "$ svn merge http://svn.example.com/repos/vendor/libcomplex/1.0 \\\n" " http://svn.example.com/repos/vendor/libcomplex/current \\\n" " libcomplex\n" "… # resolve all the conflicts between their changes and our changes\n" "$ svn commit -m 'merging libcomplex-1.1 into the main branch'\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2961 msgid "" "In the trivial use case, the new version of our third-party tool would look, " "from a files-and-directories point of view, just like the previous version. " "None of the libcomplex source files would have been deleted, renamed, or " "moved to different locations—the new version would contain only " "textual modifications against the previous one. In a perfect world, our " "modifications would apply cleanly to the new version of the library, with " "absolutely no complications or conflicts." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2971 msgid "" "But things aren't always that simple, and in fact it is quite common for " "source files to get moved around between releases of software. This " "complicates the process of ensuring that our modifications are still valid " "for the new version of code, and things can quickly degrade into a situation " "where we have to manually re-create our customizations in the new version. " "Once Subversion knows about the history of a given source file—" "including all its previous locations—the process of merging in the new " "version of the library is pretty simple. But we are responsible for telling " "Subversion how the source file layout changed from vendor drop to vendor " "drop." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2993 msgid "svn_load_dirs.pl" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2995 msgid "" "Vendor drops that contain more than a few deletes, additions, and moves " "complicate the process of upgrading to each successive version of the third-" "party data. So Subversion supplies the <command>svn_load_dirs.pl</command> " "script to assist with this process. This script automates the importing " "steps we mentioned in the general vendor branch management procedure to make " "sure mistakes are minimized. You will still be responsible for using the " "merge commands to merge the new versions of the third-party data into your " "main development branch, but <command>svn_load_dirs.pl</command> can help " "you more quickly and easily arrive at that stage." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3008 msgid "" "In short, <command>svn_load_dirs.pl</command> is an enhancement to " "<command>svn import</command> that has several important characteristics:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:3014 msgid "" "It can be run at any point in time to bring an existing directory in the " "repository to exactly match an external directory, performing all the " "necessary adds and deletes, and optionally performing moves, too." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:3020 msgid "" "It takes care of complicated series of operations between which Subversion " "requires an intermediate commit—such as before renaming a file or " "directory twice." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:3025 msgid "It will optionally tag the newly imported directory." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:3028 msgid "" "It will optionally add arbitrary properties to files and directories that " "match a regular expression." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3033 msgid "" "<command>svn_load_dirs.pl</command> takes three mandatory arguments. The " "first argument is the URL to the base Subversion directory to work in. This " "argument is followed by the URL—relative to the first argument—" "into which the current vendor drop will be imported. Finally, the third " "argument is the local directory to import. Using our previous example, a " "typical run of <command>svn_load_dirs.pl</command> might look like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:3042 #, no-wrap msgid "" "\n" "$ svn_load_dirs.pl http://svn.example.com/repos/vendor/libcomplex \\\n" " current \\\n" " /path/to/libcomplex-1.1\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3049 msgid "" "You can indicate that you'd like <command>svn_load_dirs.pl</command> to tag " "the new vendor drop by passing the <option>-t</option> command-line option " "and specifying a tag name. This tag is another URL relative to the first " "program argument." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:3055 #, no-wrap msgid "" "\n" "$ svn_load_dirs.pl -t libcomplex-1.1 \\\n" " http://svn.example.com/repos/vendor/libcomplex \\\n" " current \\\n" " /path/to/libcomplex-1.1\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3063 msgid "" "When you run <command>svn_load_dirs.pl</command>, it examines the contents " "of your existing <quote>current</quote> vendor drop and compares them with " "the proposed new vendor drop. In the trivial case, no files will be in one " "version and not the other, and the script will perform the new import " "without incident. If, however, there are discrepancies in the file layouts " "between versions, <command>svn_load_dirs.pl</command> will ask you how to " "resolve those differences. For example, you will have the opportunity to " "tell the script that you know that the file <filename>math.c</filename> in " "version 1.0 of libcomplex was renamed to <filename>arithmetic.c</filename> " "in libcomplex 1.1. Any discrepancies not explained by moves are treated as " "regular additions and deletions." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3078 msgid "" "The script also accepts a separate configuration file for setting properties " "on files and directories matching a regular expression that are " "<emphasis>added</emphasis> to the repository. This configuration file is " "specified to <command>svn_load_dirs.pl</command> using the <option>-p</" "option> command-line option. Each line of the configuration file is a " "whitespace-delimited set of two or four values: a Perl-style regular " "expression against which to match the added path, a control keyword (either " "<literal>break</literal> or <literal>cont</literal>), and then optionally a " "property name and value." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:3090 #, no-wrap msgid "" "\n" "\\.png$ break svn:mime-type image/png\n" "\\.jpe?g$ break svn:mime-type image/jpeg\n" "\\.m3u$ cont svn:mime-type audio/x-mpegurl\n" "\\.m3u$ break svn:eol-style LF\n" ".* break svn:eol-style native\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3098 msgid "" "For each added path, the configured property changes whose regular " "expression matches the path are applied in order, unless the control " "specification is <literal>break</literal> (which means that no more property " "changes should be applied to that path). If the control specification is " "<literal>cont</literal>—an abbreviation for <literal>continue</" "literal>—matching will continue with the next line of the " "configuration file." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3107 msgid "" "Any whitespace in the regular expression, property name, or property value " "must be surrounded by either single or double quotes. You can escape quotes " "that are not used for wrapping whitespace by preceding them with a backslash " "(<literal>\\</literal>) character. The backslash escapes only quotes when " "parsing the configuration file, so do not protect any other characters " "beyond what is necessary for the regular expression." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:3125 msgid "" "We covered a lot of ground in this chapter. We discussed the concepts of " "tags and branches and demonstrated how Subversion implements these concepts " "by copying directories with the <command>svn copy</command> command. We " "showed how to use <command>svn merge</command> to copy changes from one " "branch to another or roll back bad changes. We went over the use of " "<command>svn switch</command> to create mixed-location working copies. And " "we talked about how one might manage the organization and lifetimes of " "branches in a repository." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:3136 msgid "" "Remember the Subversion mantra: branches and tags are cheap. So don't be " "afraid to use them when needed!" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:3139 msgid "" "As a helpful reminder of all the operations we discussed, here is handy " "reference table you can consult as you begin to make use of branches." msgstr "" # type: Content of: <chapter><sect1><table><title> #: ../en/book/ch04-branching-and-merging.xml:3144 msgid "Branching and merging commands" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><thead><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3148 msgid "Action" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><thead><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3149 msgid "Command" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3154 msgid "Create a branch or tag" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3155 msgid "" "<userinput>svn copy <replaceable>URL1</replaceable> <replaceable>URL2</" "replaceable></userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3159 msgid "Switch a working copy to a branch or tag" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3160 #, fuzzy #| msgid "<userinput>svn mkdir blort</userinput>" msgid "<userinput>svn switch <replaceable>URL</replaceable></userinput>" msgstr "<userinput>svn mkdir blort</userinput>" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3164 msgid "Synchronize a branch with trunk" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3165 msgid "" "<userinput>svn merge <replaceable>trunkURL</replaceable>; svn commit</" "userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3169 msgid "See merge history or eligible changesets" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3170 msgid "" "<userinput>svn mergeinfo target --from-source=<replaceable>URL</" "replaceable></userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3174 msgid "Merge a branch back into trunk" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3175 msgid "" "<userinput>svn merge --reintegrate <replaceable>branchURL</replaceable>; svn " "commit</userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3179 msgid "Merge one specific change" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3180 msgid "" "<userinput>svn merge -c <replaceable>REV</replaceable> <replaceable>URL</" "replaceable>; svn commit</userinput>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch04-branching-and-merging.xml:3184 #, fuzzy #| msgid "See an overview of your changes" msgid "Merge a range of changes" msgstr "Verschaffen Sie sich einen Überblick über Ihre Änderungen" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3185 msgid "" "<userinput>svn merge -r <replaceable>REV1</replaceable>:<replaceable>REV2</" "replaceable> <replaceable>URL</replaceable>; svn commit</userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3189 msgid "Block a change from automatic merging" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3190 msgid "" "<userinput>svn merge -c <replaceable>REV</replaceable> --record-only " "<replaceable>URL</replaceable>; svn commit</userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3194 msgid "Preview a merge" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3195 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "" "<userinput>svn merge <replaceable>URL</replaceable> --dry-run</userinput>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3199 msgid "Abandon merge results" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3200 #, fuzzy #| msgid "<userinput>svn delete foo</userinput>" msgid "<userinput>svn revert -R .</userinput>" msgstr "<userinput>svn delete foo</userinput>" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3204 msgid "Resurrect something from history" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3205 msgid "" "<userinput>svn copy <replaceable>URL</replaceable>@<replaceable>REV</" "replaceable> <replaceable>localPATH</replaceable></userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3209 msgid "Undo a committed change" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3210 msgid "" "<userinput>svn merge -c -<replaceable>REV</replaceable> <replaceable>URL</" "replaceable>; svn commit</userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3214 msgid "Examine merge-sensitive history" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3215 #, fuzzy #| msgid "<userinput>svn copy foo bar</userinput>" msgid "<userinput>svn log -g; svn blame -g</userinput>" msgstr "<userinput>svn copy foo bar</userinput>" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:3219 #, fuzzy #| msgid "Update your working copy." msgid "Create a tag from a working copy" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3220 #, fuzzy #| msgid "<userinput>svn copy foo bar</userinput>" msgid "<userinput>svn copy . <replaceable>tagURL</replaceable></userinput>" msgstr "<userinput>svn copy foo bar</userinput>" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3224 msgid "Rearrange a branch or tag" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3225 msgid "" "<userinput>svn mv <replaceable>URL1</replaceable> <replaceable>URL2</" "replaceable></userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3229 msgid "Remove a branch or tag" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3230 #, fuzzy #| msgid "<userinput>svn mkdir blort</userinput>" msgid "<userinput>svn rm <replaceable>URL</replaceable></userinput>" msgstr "<userinput>svn mkdir blort</userinput>" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:2 #, fuzzy #| msgid "Repository URLs" msgid "Repository Administration" msgstr "Repository URLs" # type: Content of: <chapter><para> #: ../en/book/ch05-repository-admin.xml:4 msgid "" "The Subversion repository is the central storehouse of all your versioned " "data. As such, it becomes an obvious candidate for all the love and " "attention an administrator can offer. While the repository is generally a " "low-maintenance item, it is important to understand how to properly " "configure and care for it so that potential problems are avoided, and so " "actual problems are safely resolved." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch05-repository-admin.xml:12 msgid "" "In this chapter, we'll discuss how to create and configure a Subversion " "repository. We'll also talk about repository maintenance, providing " "examples of how and when to use the <command>svnlook</command> and " "<command>svnadmin</command> tools provided with Subversion. We'll address " "some common questions and mistakes and give some suggestions on how to " "arrange the data in the repository." msgstr "" # type: Content of: <chapter><para><footnote> #: ../en/book/ch05-repository-admin.xml:20 msgid "" "If you plan to access a Subversion repository only in the role of a user " "whose data is under version control (i.e., via a Subversion client), you can " "skip this chapter altogether. However, if you are, or wish to become, a " "Subversion repository administrator, <footnote>" msgstr "" # type: Content of: <chapter><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:26 msgid "" "This may sound really prestigious and lofty, but we're just talking about " "anyone who is interested in that mysterious realm beyond the working copy " "where everyone's data hangs out." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch05-repository-admin.xml:30 msgid "</footnote> this chapter is for you." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:38 #, fuzzy #| msgid "Subversion Repository URLs" msgid "The Subversion Repository, Defined" msgstr "Subversion-Repository-URLs" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:40 msgid "" "Before jumping into the broader topic of repository administration, let's " "further define what a repository is. How does it look? How does it feel? " "Does it take its tea hot or iced, sweetened, and with lemon? As an " "administrator, you'll be expected to understand the composition of a " "repository both from a literal, OS-level perspective—how a repository " "looks and acts with respect to non-Subversion tools—and from a logical " "perspective—dealing with how data is represented <emphasis>inside</" "emphasis> the repository." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:50 msgid "" "Seen through the eyes of a typical file browser application (such as Windows " "Explorer) or command-line based filesystem navigation tools, the Subversion " "repository is just another directory full of stuff. There are some " "subdirectories with human-readable configuration files in them, some " "subdirectories with some not-so-human-readable data files, and so on. As in " "other areas of the Subversion design, modularity is given high regard, and " "hierarchical organization is preferred to cluttered chaos. So a shallow " "glance into a typical repository from a nuts-and-bolts perspective is " "sufficient to reveal the basic components of the repository:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch05-repository-admin.xml:62 #, no-wrap msgid "" "\n" "$ ls repos\n" "conf/ dav/ db/ format hooks/ locks/ README.txt\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:67 msgid "" "Here's a quick fly-by overview of what exactly you're seeing in this " "directory listing. (Don't get bogged down in the terminology—detailed " "coverage of these components exists elsewhere in this and other chapters.)" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:74 msgid "conf" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:76 msgid "A directory containing configuration files" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:80 msgid "dav" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:82 msgid "" "A directory provided to <filename>mod_dav_svn</filename> for its private " "housekeeping data" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:88 msgid "db" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:90 msgid "The data store for all of your versioned data" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:94 msgid "format" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:96 msgid "" "A file that contains a single integer that indicates the version number of " "the repository layout" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:101 msgid "hooks" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:103 msgid "" "A directory full of hook script templates (and hook scripts themselves, once " "you've installed some)" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:108 msgid "locks" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:110 msgid "" "A directory for Subversion's repository lock files, used for tracking " "accessors to the repository" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:115 msgid "README.txt" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:117 msgid "" "A file whose contents merely inform its readers that they are looking at a " "Subversion repository" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:123 msgid "" "Of course, when accessed via the Subversion libraries, this otherwise " "unremarkable collection of files and directories suddenly becomes an " "implementation of a virtual, versioned filesystem, complete with " "customizable event triggers. This filesystem has its own notions of " "directories and files, very similar to the notions of such things held by " "real filesystems (such as NTFS, FAT32, ext3, etc.). But this is a special " "filesystem—it hangs these directories and files from revisions, " "keeping all the changes you've ever made to them safely stored and forever " "accessible. This is where the entirety of your versioned data lives." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch05-repository-admin.xml:141 msgid "Strategies for Repository Deployment" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:143 msgid "" "Due largely to the simplicity of the overall design of the Subversion " "repository and the technologies on which it relies, creating and configuring " "a repository are fairly straightforward tasks. There are a few preliminary " "decisions you'll want to make, but the actual work involved in any given " "setup of a Subversion repository is pretty basic, tending toward mindless " "repetition if you find yourself setting up multiples of these things." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:152 msgid "Some things you'll want to consider beforehand, though, are:" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:156 msgid "" "What data do you expect to live in your repository (or repositories), and " "how will that data be organized?" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:160 msgid "Where will your repository live, and how will it be accessed?" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:164 msgid "" "What types of access control and repository event reporting do you need?" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:168 msgid "Which of the available types of data store do you want to use?" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:173 msgid "In this section, we'll try to help you answer those questions." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:178 msgid "Planning Your Repository Organization" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:180 msgid "" "While Subversion allows you to move around versioned files and directories " "without any loss of information, and even provides ways of moving whole sets " "of versioned history from one repository to another, doing so can greatly " "disrupt the workflow of those who access the repository often and come to " "expect things to be at certain locations. So before creating a new " "repository, try to peer into the future a bit; plan ahead before placing " "your data under version control. By conscientiously <quote>laying out</" "quote> your repository or repositories and their versioned contents ahead of " "time, you can prevent many future headaches." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:192 msgid "" "Let's assume that as repository administrator, you will be responsible for " "supporting the version control system for several projects. Your first " "decision is whether to use a single repository for multiple projects, or to " "give each project its own repository, or some compromise of these two." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:199 msgid "" "There are benefits to using a single repository for multiple projects, most " "obviously the lack of duplicated maintenance. A single repository means " "that there is one set of hook programs, one thing to routinely back up, one " "thing to dump and load if Subversion releases an incompatible new version, " "and so on. Also, you can move data between projects easily, without losing " "any historical versioning information." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:208 msgid "" "The downside of using a single repository is that different projects may " "have different requirements in terms of the repository event triggers, such " "as needing to send commit notification emails to different mailing lists, or " "having different definitions about what does and does not constitute a " "legitimate commit. These aren't insurmountable problems, of course—it " "just means that all of your hook scripts have to be sensitive to the layout " "of your repository rather than assuming that the whole repository is " "associated with a single group of people. Also, remember that Subversion " "uses repository-global revision numbers. While those numbers don't have any " "particular magical powers, some folks still don't like the fact that even " "though no changes have been made to their project lately, the youngest " "revision number for the repository keeps climbing because other projects are " "actively adding new revisions. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:225 msgid "" "Whether founded in ignorance or in poorly considered concepts about how to " "derive legitimate software development metrics, global revision numbers are " "a silly thing to fear, and <emphasis>not</emphasis> the kind of thing you " "should weigh when deciding how to arrange your projects and repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:234 msgid "" "A middle-ground approach can be taken, too. For example, projects can be " "grouped by how well they relate to each other. You might have a few " "repositories with a handful of projects in each repository. That way, " "projects that are likely to want to share data can do so easily, and as new " "revisions are added to the repository, at least the developers know that " "those new revisions are at least remotely related to everyone who uses that " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:243 msgid "" "After deciding how to organize your projects with respect to repositories, " "you'll probably want to think about directory hierarchies within the " "repositories themselves. Because Subversion uses regular directory copies " "for branching and tagging (see <xref linkend=\"svn.branchmerge\"/>), the " "Subversion community recommends that you choose a repository location for " "each <firstterm>project root</firstterm>—the <quote>topmost</quote> " "directory that contains data related to that project—and then create " "three subdirectories beneath that root: <filename>trunk</filename>, meaning " "the directory under which the main project development occurs; " "<filename>branches</filename>, which is a directory in which to create " "various named branches of the main development line; and <filename>tags</" "filename>, which is a collection of tree snapshots that are created, and " "perhaps destroyed, but never changed. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:261 msgid "" "The <filename>trunk</filename>, <filename>tags</filename>, and " "<filename>branches</filename> trio is sometimes referred to as <quote>the " "TTB directories.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:267 msgid "For example, your repository might look like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:269 #, no-wrap msgid "" "\n" "/\n" " calc/\n" " trunk/\n" " tags/\n" " branches/\n" " calendar/\n" " trunk/\n" " tags/\n" " branches/\n" " spreadsheet/\n" " trunk/\n" " tags/\n" " branches/\n" " …\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:286 msgid "" "Note that it doesn't matter where in your repository each project root is. " "If you have only one project per repository, the logical place to put each " "project root is at the root of that project's respective repository. If you " "have multiple projects, you might want to arrange them in groups inside the " "repository, perhaps putting projects with similar goals or shared code in " "the same subdirectory, or maybe just grouping them alphabetically. Such an " "arrangement might look like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:296 #, no-wrap msgid "" "\n" "/\n" " utils/\n" " calc/\n" " trunk/\n" " tags/\n" " branches/\n" " calendar/\n" " trunk/\n" " tags/\n" " branches/\n" " …\n" " office/\n" " spreadsheet/\n" " trunk/\n" " tags/\n" " branches/\n" " …\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:316 msgid "" "Lay out your repository in whatever way you see fit. Subversion does not " "expect or enforce a particular layout—in its eyes, a directory is a " "directory is a directory. Ultimately, you should choose the repository " "arrangement that meets the needs of the people who work on the projects that " "live there." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:323 msgid "" "In the name of full disclosure, though, we'll mention another very common " "layout. In this layout, the <filename>trunk</filename>, <filename>tags</" "filename>, and <filename>branches</filename> directories live in the root " "directory of your repository, and your projects are in subdirectories " "beneath those, like so:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:330 #, no-wrap msgid "" "\n" "/\n" " trunk/\n" " calc/\n" " calendar/\n" " spreadsheet/\n" " …\n" " tags/\n" " calc/\n" " calendar/\n" " spreadsheet/\n" " …\n" " branches/\n" " calc/\n" " calendar/\n" " spreadsheet/\n" " …\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:349 msgid "" "There's nothing particularly incorrect about such a layout, but it may or " "may not seem as intuitive for your users. Especially in large, multiproject " "situations with many users, those users may tend to be familiar with only " "one or two of the projects in the repository. But the projects-as-branch-" "siblings approach tends to deemphasize project individuality and focus on " "the entire set of projects as a single entity. That's a social issue, " "though. We like our originally suggested arrangement for purely practical " "reasons—it's easier to ask about (or modify, or migrate elsewhere) the " "entire history of a single project when there's a single repository path " "that holds the entire history—past, present, tagged, and " "branched—for that project and that project alone." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch05-repository-admin.xml:368 #, fuzzy #| msgid "Getting Data into Your Repository" msgid "Deciding Where and How to Host Your Repository" msgstr "Wie Sie Daten in Ihr Repository bekommen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:370 msgid "" "Before creating your Subversion repository, an obvious question you'll need " "to answer is where the thing is going to live. This is strongly connected " "to myriad other questions involving how the repository will be accessed (via " "a Subversion server or directly), by whom (users behind your corporate " "firewall or the whole world out on the open Internet), what other services " "you'll be providing around Subversion (repository browsing interfaces, email-" "based commit notification, etc.), your data backup strategy, and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:381 msgid "" "We cover server choice and configuration in <xref linkend=\"svn.serverconfig" "\" />, but the point we'd like to briefly make here is simply that the " "answers to some of these other questions might have implications that force " "your hand when deciding where your repository will live. For example, " "certain deployment scenarios might require accessing the repository via a " "remote filesystem from multiple computers, in which case (as you'll read in " "the next section) your choice of a repository backend data store turns out " "not to be a choice at all because only one of the available backends will " "work in this scenario." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:393 msgid "" "Addressing each possible way to deploy Subversion is both impossible and " "outside the scope of this book. We simply encourage you to evaluate your " "options using these pages and other sources as your reference material and " "to plan ahead." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:403 msgid "Choosing a Data Store" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:405 msgid "" "As of version 1.1, Subversion provides two options for the type of " "underlying data store—often referred to as <quote>the backend</quote> " "or, somewhat confusingly, <quote>the (versioned) filesystem</quote>—" "that each repository uses. One type of data store keeps everything in a " "Berkeley DB (or BDB) database environment; repositories that use this type " "are often referred to as being <quote>BDB-backed.</quote> The other type " "stores data in ordinary flat files, using a custom format. Subversion " "developers have adopted the habit of referring to this latter data storage " "mechanism as <firstterm>FSFS</firstterm> <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:417 msgid "" "Often pronounced <quote>fuzz-fuzz,</quote> if Jack Repenning has anything to " "say about it. (This book, however, assumes that the reader is thinking " "<quote>eff-ess-eff-ess.</quote>)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:421 msgid "" "</footnote> —a versioned filesystem implementation that uses the " "native OS filesystem directly—rather than via a database library or " "some other abstraction layer—to store data." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:426 msgid "" "<xref linkend=\"svn.reposadmin.basics.backends.tbl-1\" /> gives a " "comparative overview of Berkeley DB and FSFS repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><table><title> #: ../en/book/ch05-repository-admin.xml:431 msgid "Repository data store comparison" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><thead><row><entry> #: ../en/book/ch05-repository-admin.xml:435 msgid "Category" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><thead><row><entry> #: ../en/book/ch05-repository-admin.xml:436 #: ../en/book/ch06-server-configuration.xml:80 msgid "Feature" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:437 #: ../en/book/ch05-repository-admin.xml:542 msgid "Berkeley DB" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:438 #: ../en/book/ch05-repository-admin.xml:675 msgid "FSFS" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:443 msgid "Reliability" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:444 msgid "Data integrity" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:445 msgid "" "When properly deployed, extremely reliable; Berkeley DB 4.4 brings auto-" "recovery" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:447 msgid "Older versions had some rarely demonstrated, but data-destroying bugs" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:451 msgid "Sensitivity to interruptions" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:452 msgid "" "Very; crashes and permission problems can leave the database <quote>wedged,</" "quote> requiring journaled recovery procedures" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:455 msgid "Quite insensitive" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:458 msgid "Accessibility" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:459 msgid "Usable from a read-only mount" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch05-repository-admin.xml:460 #: ../en/book/ch05-repository-admin.xml:465 ../en/book/ch09-reference.xml:754 #: ../en/book/ch09-reference.xml:1078 ../en/book/ch09-reference.xml:1329 #: ../en/book/ch09-reference.xml:2293 ../en/book/ch09-reference.xml:4165 #: ../en/book/ch09-reference.xml:4251 ../en/book/ch09-reference.xml:4340 msgid "No" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch05-repository-admin.xml:461 #: ../en/book/ch05-repository-admin.xml:466 #: ../en/book/ch05-repository-admin.xml:471 ../en/book/ch09-reference.xml:860 #: ../en/book/ch09-reference.xml:995 ../en/book/ch09-reference.xml:1175 #: ../en/book/ch09-reference.xml:1419 ../en/book/ch09-reference.xml:2347 #: ../en/book/ch09-reference.xml:2666 ../en/book/ch09-reference.xml:2781 #: ../en/book/ch09-reference.xml:2895 ../en/book/ch09-reference.xml:3335 #: ../en/book/ch09-reference.xml:4933 ../en/book/ch09-reference.xml:5092 #: ../en/book/ch09-reference.xml:5253 msgid "Yes" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:464 msgid "Platform-independent storage" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:469 msgid "Usable over network filesystems" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:470 msgid "Generally, no" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:474 msgid "Group permissions handling" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:475 msgid "Sensitive to user umask problems; best if accessed by only one user" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:477 msgid "Works around umask problems" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:480 msgid "Scalability" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:481 #, fuzzy #| msgid "Repository URLs" msgid "Repository disk usage" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:482 msgid "Larger (especially if logfiles aren't purged)" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:483 msgid "Smaller" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:486 msgid "Number of revision trees" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:487 msgid "Database; no problems" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:488 msgid "" "Some older native filesystems don't scale well with thousands of entries in " "a single directory" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:492 msgid "Directories with many files" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:493 msgid "Slower" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:494 msgid "Faster" msgstr "" # type: Content of: <preface><title> #: ../en/book/ch05-repository-admin.xml:497 #, fuzzy #| msgid "Preface" msgid "Performance" msgstr "Vorwort" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:498 msgid "Checking out latest revision" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:499 #: ../en/book/ch05-repository-admin.xml:500 msgid "No meaningful difference" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:503 msgid "Large commits" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:504 msgid "Slower overall, but cost is amortized across the lifetime of the commit" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:506 msgid "Faster overall, but finalization delay may cause client timeouts" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:513 msgid "" "There are advantages and disadvantages to each of these two backend types. " "Neither of them is more <quote>official</quote> than the other, though the " "newer FSFS is the default data store as of Subversion 1.2. Both are " "reliable enough to trust with your versioned data. But as you can see in " "<xref linkend=\"svn.reposadmin.basics.backends.tbl-1\" />, the FSFS backend " "provides quite a bit more flexibility in terms of its supported deployment " "scenarios. More flexibility means you have to work a little harder to find " "ways to deploy it incorrectly. Those reasons—plus the fact that not " "using Berkeley DB means there's one fewer component in the system—" "largely explain why today almost everyone uses the FSFS backend when " "creating new repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:528 msgid "" "Fortunately, most programs that access Subversion repositories are " "blissfully ignorant of which backend data store is in use. And you aren't " "even necessarily stuck with your first choice of a data store—in the " "event that you change your mind later, Subversion provides ways of migrating " "your repository's data into another repository that uses a different backend " "data store. We talk more about that later in this chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:537 msgid "" "The following subsections provide a more detailed look at the available " "backend data store types." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:544 msgid "" "When the initial design phase of Subversion was in progress, the developers " "decided to use Berkeley DB for a variety of reasons, including its open " "source license, transaction support, reliability, performance, API " "simplicity, thread safety, support for cursors, and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:551 msgid "" "Berkeley DB provides real transaction support—perhaps its most " "powerful feature. Multiple processes accessing your Subversion repositories " "don't have to worry about accidentally clobbering each other's data. The " "isolation provided by the transaction system is such that for any given " "operation, the Subversion repository code sees a static view of the " "database—not a database that is constantly changing at the hand of " "some other process—and can make decisions based on that view. If the " "decision made happens to conflict with what another process is doing, the " "entire operation is rolled back as though it never happened, and Subversion " "gracefully retries the operation against a new, updated (and yet still " "static) view of the database." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:566 msgid "" "Another great feature of Berkeley DB is <firstterm>hot backups</" "firstterm>—the ability to back up the database environment without " "taking it <quote>offline.</quote> We'll discuss how to back up your " "repository later in this chapter (in <xref linkend=\"svn.reposadmin.maint." "backup\"/>), but the benefits of being able to make fully functional copies " "of your repositories without any downtime should be obvious." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:575 msgid "" "Berkeley DB is also a very reliable database system when properly used. " "Subversion uses Berkeley DB's logging facilities, which means that the " "database first writes to on-disk logfiles a description of any modifications " "it is about to make, and then makes the modification itself. This is to " "ensure that if anything goes wrong, the database system can back up to a " "previous <firstterm>checkpoint</firstterm>—a location in the logfiles " "known not to be corrupt—and replay transactions until the data is " "restored to a usable state. See <xref linkend=\"svn.reposadmin.maint." "diskspace\"/> later in this chapter for more about Berkeley DB logfiles." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:588 msgid "" "But every rose has its thorn, and so we must note some known limitations of " "Berkeley DB. First, Berkeley DB environments are not portable. You cannot " "simply copy a Subversion repository that was created on a Unix system onto a " "Windows system and expect it to work. While much of the Berkeley DB " "database format is architecture-independent, other aspects of the " "environment are not. Second, Subversion uses Berkeley DB in a way that will " "not operate on Windows 95/98 systems—if you need to house a BDB-backed " "repository on a Windows machine, stick with Windows 2000 or later." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch05-repository-admin.xml:600 msgid "" "While Berkeley DB promises to behave correctly on network shares that meet a " "particular set of specifications, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:603 msgid "" "Berkeley DB requires that the underlying filesystem implement strict POSIX " "locking semantics, and more importantly, the ability to map files directly " "into process memory." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:607 msgid "" "</footnote> most networked filesystem types and appliances do <emphasis>not</" "emphasis> actually meet those requirements. And in no case can you allow a " "BDB-backed repository that resides on a network share to be accessed by " "multiple clients of that share at once (which quite often is the whole point " "of having the repository live on a network share in the first place)." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><warning><para> #: ../en/book/ch05-repository-admin.xml:617 msgid "" "If you attempt to use Berkeley DB on a noncompliant remote filesystem, the " "results are unpredictable—you may see mysterious errors right away, or " "it may be months before you discover that your repository database is subtly " "corrupted. You should strongly consider using the FSFS data store for " "repositories that need to live on a network share." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:626 msgid "" "Finally, because Berkeley DB is a library linked directly into Subversion, " "it's more sensitive to interruptions than a typical relational database " "system. Most SQL systems, for example, have a dedicated server process that " "mediates all access to tables. If a program accessing the database crashes " "for some reason, the database daemon notices the lost connection and cleans " "up any mess left behind. And because the database daemon is the only " "process accessing the tables, applications don't need to worry about " "permission conflicts. These things are not the case with Berkeley DB, " "however. Subversion (and programs using Subversion libraries) access the " "database tables directly, which means that a program crash can leave the " "database in a temporarily inconsistent, inaccessible state. When this " "happens, an administrator needs to ask Berkeley DB to restore to a " "checkpoint, which is a bit of an annoyance. Other things can cause a " "repository to <quote>wedge</quote> besides crashed processes, such as " "programs conflicting over ownership and permissions on the database files." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><note><para> #: ../en/book/ch05-repository-admin.xml:647 msgid "" "Berkeley DB 4.4 brings (to Subversion 1.4 and later) the ability for " "Subversion to automatically and transparently recover Berkeley DB " "environments in need of such recovery. When a Subversion process attaches " "to a repository's Berkeley DB environment, it uses some process accounting " "mechanisms to detect any unclean disconnections by previous processes, " "performs any necessary recovery, and then continues on as though nothing " "happened. This doesn't completely eliminate instances of repository " "wedging, but it does drastically reduce the amount of human interaction " "required to recover from them." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:660 msgid "" "So while a Berkeley DB repository is quite fast and scalable, it's best used " "by a single server process running as one user—such as Apache's " "<command>httpd</command> or <command>svnserve</command> (see <xref linkend=" "\"svn.serverconfig\"/>)—rather than accessing it as many different " "users via <literal>file://</literal> or <literal>svn+ssh://</literal> URLs. " "If you're accessing a Berkeley DB repository directly as multiple users, be " "sure to read <xref linkend=\"svn.serverconfig.multimethod\"/> later in this " "chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:677 msgid "" "In mid-2004, a second type of repository storage system—one that " "doesn't use a database at all—came into being. An FSFS repository " "stores the changes associated with a revision in a single file, and so all " "of a repository's revisions can be found in a single subdirectory full of " "numbered files. Transactions are created in separate subdirectories as " "individual files. When complete, the transaction file is renamed and moved " "into the revisions directory, thus guaranteeing that commits are atomic. " "And because a revision file is permanent and unchanging, the repository also " "can be backed up while <quote>hot,</quote> just like a BDB-backed repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:691 msgid "" "The FSFS revision files describe a revision's directory structure, file " "contents, and deltas against files in other revision trees. Unlike a " "Berkeley DB database, this storage format is portable across different " "operating systems and isn't sensitive to CPU architecture. Because no " "journaling or shared-memory files are being used, the repository can be " "safely accessed over a network filesystem and examined in a read-only " "environment. The lack of database overhead also means the overall " "repository size is a bit smaller." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:702 msgid "" "FSFS has different performance characteristics, too. When committing a " "directory with a huge number of files, FSFS is able to more quickly append " "directory entries. On the other hand, FSFS writes the latest version of a " "file as a delta against an earlier version, which means that checking out " "the latest tree is a bit slower than fetching the full-texts stored in a " "Berkeley DB HEAD revision. FSFS also has a longer delay when finalizing a " "commit, which could in extreme cases cause clients to time out while waiting " "for a response." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:713 msgid "" "The most important distinction, however, is FSFS's imperviousness to wedging " "when something goes wrong. If a process using a Berkeley DB database runs " "into a permissions problem or suddenly crashes, the database can be left in " "an unusable state until an administrator recovers it. If the same scenarios " "happen to a process using an FSFS repository, the repository isn't affected " "at all. At worst, some transaction data is left behind." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch05-repository-admin.xml:722 msgid "" "The only real argument against FSFS is its relative immaturity compared to " "Berkeley DB. Unlike Berkeley DB, which has years of history, its own " "dedicated development team, and, now, Oracle's mighty name attached to it, " "<footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:727 msgid "" "Oracle bought Sleepycat and its flagship software, Berkeley DB, on " "Valentine's Day in 2006." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:729 msgid "" "</footnote> FSFS is a newer bit of engineering. Prior to Subversion 1.4, it " "was still shaking out some pretty serious data integrity bugs, which, while " "triggered in only very rare cases, nonetheless did occur. That said, FSFS " "has quickly become the backend of choice for some of the largest public and " "private Subversion repositories, and it promises a lower barrier to entry " "for Subversion across the board." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch05-repository-admin.xml:747 #, fuzzy #| msgid "Getting Data into Your Repository" msgid "Creating and Configuring Your Repository" msgstr "Wie Sie Daten in Ihr Repository bekommen" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:749 msgid "" "Earlier in this chapter (in <xref linkend=\"svn.reposadmin.planning\" />), " "we looked at some of the important decisions that should be made before " "creating and configuring your Subversion repository. Now, we finally get to " "get our hands dirty! In this section, we'll see how to actually create a " "Subversion repository and configure it to perform custom actions when " "special repository events occur." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch05-repository-admin.xml:759 #, fuzzy #| msgid "The Repository" msgid "Creating the Repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:761 msgid "" "Subversion repository creation is an incredibly simple task. The " "<command>svnadmin</command> utility that comes with Subversion provides a " "subcommand (<command>svnadmin create</command>) for doing just that." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:766 #, no-wrap msgid "" "\n" "$ # Create a repository\n" "$ svnadmin create /var/svn/repos\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:772 msgid "" "This creates a new repository in the directory <filename>/var/svn/repos</" "filename>, and with the default filesystem data store. Prior to Subversion " "1.2, the default was to use Berkeley DB; the default is now FSFS. You can " "explicitly choose the filesystem type using the <option>--fs-type</option> " "argument, which accepts as a parameter either <literal>fsfs</literal> or " "<literal>bdb</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:781 #, no-wrap msgid "" "\n" "$ # Create an FSFS-backed repository\n" "$ svnadmin create --fs-type fsfs /var/svn/repos\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:787 #, no-wrap msgid "" "\n" "# Create a Berkeley-DB-backed repository\n" "$ svnadmin create --fs-type bdb /var/svn/repos\n" "$\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:793 #, fuzzy #| msgid "A tool for creating, tweaking, or repairing a Subversion repository" msgid "After running this simple command, you have a Subversion repository." msgstr "" "Ein Werkzeug zum Erstellen, Verändern oder Reparieren eines Repositorys" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch05-repository-admin.xml:797 msgid "" "The path argument to <command>svnadmin</command> is just a regular " "filesystem path and not a URL like the <command>svn</command> client program " "uses when referring to repositories. Both <command>svnadmin</command> and " "<command>svnlook</command> are considered server-side utilities—they " "are used on the machine where the repository resides to examine or modify " "aspects of the repository, and are in fact unable to perform tasks across a " "network. A common mistake made by Subversion newcomers is trying to pass " "URLs (even <quote>local</quote> <literal>file://</literal> ones) to these " "two programs." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:810 msgid "" "Present in the <filename>db/</filename> subdirectory of your repository is " "the implementation of the versioned filesystem. Your new repository's " "versioned filesystem begins life at revision 0, which is defined to consist " "of nothing but the top-level root (<filename>/</filename>) directory. " "Initially, revision 0 also has a single revision property, <literal>svn:" "date</literal>, set to the time at which the repository was created." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:819 msgid "Now that you have a repository, it's time to customize it." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:823 msgid "" "While some parts of a Subversion repository—such as the configuration " "files and hook scripts—are meant to be examined and modified manually, " "you shouldn't (and shouldn't need to) tamper with the other parts of the " "repository <quote>by hand.</quote> The <command>svnadmin</command> tool " "should be sufficient for any changes necessary to your repository, or you " "can look to third-party tools (such as Berkeley DB's tool suite) for " "tweaking relevant subsections of the repository. Do <emphasis>not</" "emphasis> attempt manual manipulation of your version control history by " "poking and prodding around in your repository's data store files!" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:841 msgid "Implementing Repository Hooks" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:843 msgid "" "A <firstterm>hook</firstterm> is a program triggered by some repository " "event, such as the creation of a new revision or the modification of an " "unversioned property. Some hooks (the so-called <quote>pre hooks</quote>) " "run in advance of a repository operation and provide a means by which to " "both report what is about to happen and prevent it from happening at all. " "Other hooks (the <quote>post hooks</quote>) run after the completion of a " "repository event and are useful for performing tasks that examine—but " "don't modify—the repository. Each hook is handed enough information " "to tell what that event is (or was), the specific repository changes " "proposed (or completed), and the username of the person who triggered the " "event." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:857 msgid "" "The <filename>hooks</filename> subdirectory is, by default, filled with " "templates for various repository hooks:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:861 #, no-wrap msgid "" "\n" "$ ls repos/hooks/\n" "post-commit.tmpl post-unlock.tmpl pre-revprop-change.tmpl\n" "post-lock.tmpl pre-commit.tmpl pre-unlock.tmpl\n" "post-revprop-change.tmpl pre-lock.tmpl start-commit.tmpl\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:869 msgid "" "There is one template for each hook that the Subversion repository supports; " "by examining the contents of those template scripts, you can see what " "triggers each script to run and what data is passed to that script. Also " "present in many of these templates are examples of how one might use that " "script, in conjunction with other Subversion-supplied programs, to perform " "common useful tasks. To actually install a working hook, you need only " "place some executable program or script into the <filename>repos/hooks</" "filename> directory, which can be executed as the name (such as " "<command>start-commit</command> or <command>post-commit</command>) of the " "hook." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:882 msgid "" "On Unix platforms, this means supplying a script or program (which could be " "a shell script, a Python program, a compiled C binary, or any number of " "other things) named exactly like the name of the hook. Of course, the " "template files are present for more than just informational purposes—" "the easiest way to install a hook on Unix platforms is to simply copy the " "appropriate template file to a new file that lacks the <filename>.tmpl</" "filename> extension, customize the hook's contents, and ensure that the " "script is executable. Windows, however, uses file extensions to determine " "whether a program is executable, so you would need to supply a program whose " "basename is the name of the hook and whose extension is one of the special " "extensions recognized by Windows for executable programs, such as <filename>." "exe</filename> for programs and <filename>.bat</filename> for batch files." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch05-repository-admin.xml:900 msgid "" "For security reasons, the Subversion repository executes hook programs with " "an empty environment—that is, no environment variables are set at all, " "not even <literal>$PATH</literal> (or <literal>%PATH%</literal>, under " "Windows). Because of this, many administrators are baffled when their hook " "program runs fine by hand, but doesn't work when run by Subversion. Be sure " "to explicitly set any necessary environment variables in your hook program " "and/or use absolute paths to programs." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:911 msgid "" "Subversion executes hooks as the same user who owns the process that is " "accessing the Subversion repository. In most cases, the repository is being " "accessed via a Subversion server, so this user is the same user as whom the " "server runs on the system. The hooks themselves will need to be configured " "with OS-level permissions that allow that user to execute them. Also, this " "means that any programs or files (including the Subversion repository) " "accessed directly or indirectly by the hook will be accessed as the same " "user. In other words, be alert to potential permission-related problems " "that could prevent the hook from performing the tasks it is designed to " "perform." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:924 msgid "" "There are nine hooks implemented by the Subversion repository, and you can " "get details about each of them in <xref linkend=\"svn.ref.reposhooks\" />. " "As a repository administrator, you'll need to decide which hooks you wish to " "implement (by way of providing an appropriately named and permissioned hook " "program), and how. When you make this decision, keep in mind the big " "picture of how your repository is deployed. For example, if you are using " "server configuration to determine which users are permitted to commit " "changes to your repository, you don't need to do this sort of access control " "via the hook system." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:937 msgid "" "There is no shortage of Subversion hook programs and scripts that are freely " "available either from the Subversion community itself or elsewhere. These " "scripts cover a wide range of utility—basic access control, policy " "adherence checking, issue tracker integration, email- or syndication-based " "commit notification, and beyond. Or, if you wish to write your own, see " "<xref linkend=\"svn.developer\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:946 msgid "" "While hook scripts can do almost anything, there is one dimension in which " "hook script authors should show restraint: do <emphasis>not</emphasis> " "modify a commit transaction using hook scripts. While it might be tempting " "to use hook scripts to automatically correct errors, shortcomings, or policy " "violations present in the files being committed, doing so can cause " "problems. Subversion keeps client-side caches of certain bits of repository " "data, and if you change a commit transaction in this way, those caches " "become indetectably stale. This inconsistency can lead to surprising and " "unexpected behavior. Instead of modifying the transaction, you should " "simply <emphasis>validate</emphasis> the transaction in the <filename>pre-" "commit</filename> hook and reject the commit if it does not meet the desired " "requirements. As a bonus, your users will learn the value of careful, " "compliance-minded work habits." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:969 msgid "Berkeley DB Configuration" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:971 msgid "" "A Berkeley DB environment is an encapsulation of one or more databases, " "logfiles, region files, and configuration files. The Berkeley DB " "environment has its own set of default configuration values for things such " "as the number of database locks allowed to be taken out at any given time, " "the maximum size of the journaling logfiles, and so on. Subversion's " "filesystem logic additionally chooses default values for some of the " "Berkeley DB configuration options. However, sometimes your particular " "repository, with its unique collection of data and access patterns, might " "require a different set of configuration option values." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:983 msgid "" "The producers of Berkeley DB understand that different applications and " "database environments have different requirements, so they have provided a " "mechanism for overriding at runtime many of the configuration values for the " "Berkeley DB environment. BDB checks for the presence of a file named " "<filename>DB_CONFIG</filename> in the environment directory (namely, the " "repository's <filename>db</filename> subdirectory), and parses the options " "found in that file. Subversion itself creates this file when it creates the " "rest of the repository. The file initially contains some default options, " "as well as pointers to the Berkeley DB online documentation so that you can " "read about what those options do. Of course, you are free to add any of the " "supported Berkeley DB options to your <filename>DB_CONFIG</filename> file. " "Just be aware that while Subversion never attempts to read or interpret the " "contents of the file and makes no direct use of the option settings in it, " "you'll want to avoid any configuration changes that may cause Berkeley DB to " "behave in a fashion that is at odds with what Subversion might expect. " "Also, changes made to <filename>DB_CONFIG</filename> won't take effect until " "you recover the database environment (using <command>svnadmin recover</" "command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><title> #: ../en/book/ch05-repository-admin.xml:1014 #, fuzzy #| msgid "Repository access URLs" msgid "Repository Maintenance" msgstr "Repository-Zugriffs-URLs" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:1016 msgid "" "Maintaining a Subversion repository can be daunting, mostly due to the " "complexities inherent in systems that have a database backend. Doing the " "task well is all about knowing the tools—what they are, when to use " "them, and how. This section will introduce you to the repository " "administration tools provided by Subversion and discuss how to wield them to " "accomplish tasks such as repository data migration, upgrades, backups, and " "cleanups." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:1027 msgid "An Administrator's Toolkit" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1029 msgid "" "Subversion provides a handful of utilities useful for creating, inspecting, " "modifying, and repairing your repository. Let's look more closely at each " "of those tools. Afterward, we'll briefly examine some of the utilities " "included in the Berkeley DB distribution that provide functionality specific " "to your repository's database backend not otherwise provided by Subversion's " "own tools." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1041 msgid "" "The <command>svnadmin</command> program is the repository administrator's " "best friend. Besides providing the ability to create Subversion " "repositories, this program allows you to perform several maintenance " "operations on those repositories. The syntax of <command>svnadmin</command> " "is similar to that of other Subversion command-line programs:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1049 #, no-wrap msgid "" "\n" "$ svnadmin help\n" "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n" "Type 'svnadmin --version' to see the program version and FS modules.\n" "\n" "Available subcommands:\n" " crashtest\n" " create\n" " deltify\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1062 msgid "" "Previously in this chapter (in <xref linkend=\"svn.reposadmin.basics.creating" "\"/>), we were introduced to the <command>svnadmin create</command> " "subcommand. Most of the other <command>svnadmin</command> subcommands we " "will cover later in this chapter. And you can consult <xref linkend=\"svn." "ref.svnadmin\" /> for a full rundown of subcommands and what each of them " "offers." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1076 msgid "" "<command>svnlook</command> is a tool provided by Subversion for examining " "the various revisions and <firstterm>transactions</firstterm> (which are " "revisions in the making) in a repository. No part of this program attempts " "to change the repository. <command>svnlook</command> is typically used by " "the repository hooks for reporting the changes that are about to be " "committed (in the case of the <command>pre-commit</command> hook) or that " "were just committed (in the case of the <command>post-commit</command> hook) " "to the repository. A repository administrator may use this tool for " "diagnostic purposes." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1088 msgid "<command>svnlook</command> has a straightforward syntax:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1091 #, no-wrap msgid "" "\n" "$ svnlook help\n" "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Note: any subcommand which takes the '--revision' and '--transaction'\n" " options will, if invoked without one of those options, act on\n" " the repository's youngest revision.\n" "Type 'svnlook help <subcommand>' for help on a specific subcommand.\n" "Type 'svnlook --version' to see the program version and FS modules.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1102 msgid "" "Most of <command>svnlook</command>'s subcommands can operate on either a " "revision or a transaction tree, printing information about the tree itself, " "or how it differs from the previous revision of the repository. You use the " "<option>--revision</option> (<option>-r</option>) and <option>--transaction</" "option> (<option>-t</option>) options to specify which revision or " "transaction, respectively, to examine. In the absence of both the <option>--" "revision</option> (<option>-r</option>) and <option>--transaction</option> " "(<option>-t</option>) options, <command>svnlook</command> will examine the " "youngest (or <literal>HEAD</literal>) revision in the repository. So the " "following two commands do exactly the same thing when 19 is the youngest " "revision in the repository located at <filename>/var/svn/repos</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1119 #, no-wrap msgid "" "\n" "$ svnlook info /var/svn/repos\n" "$ svnlook info /var/svn/repos -r 19\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1124 msgid "" "One exception to these rules about subcommands is the <command>svnlook " "youngest</command> subcommand, which takes no options and simply prints out " "the repository's youngest revision number:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1129 #, no-wrap msgid "" "\n" "$ svnlook youngest /var/svn/repos\n" "19\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><note><para> #: ../en/book/ch05-repository-admin.xml:1136 msgid "" "Keep in mind that the only transactions you can browse are uncommitted " "ones. Most repositories will have no such transactions because transactions " "are usually either committed (in which case, you should access them as " "revision with the <option>--revision</option> (<option>-r</option>) option) " "or aborted and removed." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1145 msgid "" "Output from <command>svnlook</command> is designed to be both human- and " "machine-parsable. Take, as an example, the output of the <command>svnlook " "info</command> subcommand:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1149 #, no-wrap msgid "" "\n" "$ svnlook info /var/svn/repos\n" "sally\n" "2002-11-04 09:29:13 -0600 (Mon, 04 Nov 2002)\n" "27\n" "Added the usual\n" "Greek tree.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1159 msgid "" "The output of <command>svnlook info</command> consists of the following, in " "the order given:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1164 msgid "The author, followed by a newline" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1167 msgid "The date, followed by a newline" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1170 msgid "The number of characters in the log message, followed by a newline" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1174 msgid "The log message itself, followed by a newline" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1178 msgid "" "This output is human-readable, meaning items such as the datestamp are " "displayed using a textual representation instead of something more obscure " "(such as the number of nanoseconds since the Tasty Freeze guy drove by). " "But the output is also machine-parsable—because the log message can " "contain multiple lines and be unbounded in length, <command>svnlook</" "command> provides the length of that message before the message itself. " "This allows scripts and other wrappers around this command to make " "intelligent decisions about the log message, such as how much memory to " "allocate for the message, or at least how many bytes to skip in the event " "that this output is not the last bit of data in the stream." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1192 msgid "" "<command>svnlook</command> can perform a variety of other queries: " "displaying subsets of bits of information we've mentioned previously, " "recursively listing versioned directory trees, reporting which paths were " "modified in a given revision or transaction, showing textual and property " "differences made to files and directories, and so on. See <xref linkend=" "\"svn.ref.svnlook\" /> for a full reference of <command>svnlook</command>'s " "features." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1207 msgid "" "While it won't be the most commonly used tool at the administrator's " "disposal, <command>svndumpfilter</command> provides a very particular brand " "of useful functionality—the ability to quickly and easily modify " "streams of Subversion repository history data by acting as a path-based " "filter." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1214 msgid "The syntax of <command>svndumpfilter</command> is as follows:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1217 #, no-wrap msgid "" "\n" "$ svndumpfilter help\n" "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" "Type \"svndumpfilter help <subcommand>\" for help on a specific subcommand.\n" "Type 'svndumpfilter --version' to see the program version.\n" " \n" "Available subcommands:\n" " exclude\n" " include\n" " help (?, h)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1229 msgid "" "There are only two interesting subcommands: <command>svndumpfilter exclude</" "command> and <command>svndumpfilter include</command>. They allow you to " "make the choice between implicit or explicit inclusion of paths in the " "stream. You can learn more about these subcommands and " "<command>svndumpfilter</command>'s unique purpose later in this chapter, in " "<xref linkend=\"svn.reposadmin.maint.filtering\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch05-repository-admin.xml:1244 msgid "" "The <command>svnsync</command> program, which is new to the 1.4 release of " "Subversion, provides all the functionality required for maintaining a read-" "only mirror of a Subversion repository. The program really has one " "job—to transfer one repository's versioned history into another " "repository. And while there are few ways to do that, its primary strength " "is that it can operate remotely—the <quote>source</quote> and " "<quote>sink</quote> <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:1254 msgid "Or is that, the <quote>sync</quote>?" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1255 msgid "" "</footnote> repositories may be on different computers from each other and " "from <command>svnsync</command> itself." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1259 msgid "" "As you might expect, <command>svnsync</command> has a syntax that looks very " "much like every other program we've mentioned in this chapter:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1263 #, no-wrap msgid "" "\n" "$ svnsync help\n" "general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n" "Type 'svnsync help <subcommand>' for help on a specific subcommand.\n" "Type 'svnsync --version' to see the program version and RA modules.\n" "\n" "Available subcommands:\n" " initialize (init)\n" " synchronize (sync)\n" " copy-revprops\n" " help (?, h)\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1277 msgid "" "We talk more about replicating repositories with <command>svnsync</command> " "later in this chapter (see <xref linkend=\"svn.reposadmin.maint.replication" "\" />)." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:1285 msgid "fsfs-reshard.py" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1287 msgid "" "While not an official member of the Subversion toolchain, the <command>fsfs-" "reshard.py</command> script (found in the <filename>tools/server-side</" "filename> directory of the Subversion source distribution) is a useful " "performance tuning tool for administrators of FSFS-backed Subversion " "repositories. FSFS repositories contain files that describe the changes " "made in a single revision, and files that contain the revision properties " "associated with a single revision. Repositories created in versions of " "Subversion prior to 1.5 keep these files in two directories—one for " "each type of file. As new revisions are committed to the repository, " "Subversion drops more files into these two directories—over time, the " "number of these files in each directory can grow to be quite large. This " "has been observed to cause performance problems on certain network-based " "filesystems." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1304 msgid "" "Subversion 1.5 creates FSFS-backed repositories using a slightly modified " "layout in which the contents of these two directories are " "<firstterm>sharded</firstterm>, or scattered across several subdirectories. " "This can greatly reduce the time it takes the system to locate any one of " "these files, and therefore increases the overall performance of Subversion " "when reading from the repository. The number of subdirectories used to " "house these files is configurable, though, and that's where <command>fsfs-" "reshard.py</command> comes in. This script reshuffles the repository's file " "structure into a new arrangement that reflects the requested number of " "sharding subdirectories. This is especially useful for converting an older " "Subversion repository into the new Subversion 1.5 sharded layout (which " "Subversion will not automatically do for you) or for fine-tuning an already " "sharded repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:1326 msgid "Berkeley DB utilities" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1328 msgid "" "If you're using a Berkeley DB repository, all of your versioned filesystem's " "structure and data live in a set of database tables within the <filename>db/" "</filename> subdirectory of your repository. This subdirectory is a regular " "Berkeley DB environment directory and can therefore be used in conjunction " "with any of the Berkeley database tools, typically provided as part of the " "Berkeley DB distribution." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1337 msgid "" "For day-to-day Subversion use, these tools are unnecessary. Most of the " "functionality typically needed for Subversion repositories has been " "duplicated in the <command>svnadmin</command> tool. For example, " "<command>svnadmin list-unused-dblogs</command> and <command>svnadmin list-" "dblogs</command> perform a subset of what is provided by the Berkeley " "<command>db_archive</command> utility, and <command>svnadmin recover</" "command> reflects the common use cases of the <command>db_recover</command> " "utility." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1348 msgid "" "However, there are still a few Berkeley DB utilities that you might find " "useful. The <command>db_dump</command> and <command>db_load</command> " "programs write and read, respectively, a custom file format that describes " "the keys and values in a Berkeley DB database. Since Berkeley databases are " "not portable across machine architectures, this format is a useful way to " "transfer those databases from machine to machine, irrespective of " "architecture or operating system. As we describe later in this chapter, you " "can also use <command>svnadmin dump</command> and <command>svnadmin load</" "command> for similar purposes, but <command>db_dump</command> and " "<command>db_load</command> can do certain jobs just as well and much " "faster. They can also be useful if the experienced Berkeley DB hacker needs " "to do in-place tweaking of the data in a BDB-backed repository for some " "reason, which is something Subversion's utilities won't allow. Also, the " "<command>db_stat</command> utility can provide useful information about the " "status of your Berkeley DB environment, including detailed statistics about " "the locking and storage subsystems." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1369 msgid "" "For more information on the Berkeley DB tool chain, visit the documentation " "section of the Berkeley DB section of Oracle's web site, located at <ulink " "url=\"http://www.oracle.com/technology/documentation/berkeley-db/db/\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:1380 msgid "Commit Log Message Correction" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1382 msgid "" "Sometimes a user will have an error in her log message (a misspelling or " "some misinformation, perhaps). If the repository is configured (using the " "<literal>pre-revprop-change</literal> hook; see <xref linkend=\"svn." "reposadmin.create.hooks\"/>) to accept changes to this log message after the " "commit is finished, the user can <quote>fix</quote> her log message remotely " "using <command>svn propset</command> (see <xref linkend=\"svn.ref.svn.c." "propset\"/>). However, because of the potential to lose information " "forever, Subversion repositories are not, by default, configured to allow " "changes to unversioned properties—except by an administrator." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1396 msgid "" "If a log message needs to be changed by an administrator, this can be done " "using <command>svnadmin setlog</command>. This command changes the log " "message (the <literal>svn:log</literal> property) on a given revision of a " "repository, reading the new value from a provided file." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:1402 #, no-wrap msgid "" "\n" "$ echo \"Here is the new, correct log message\" > newlog.txt\n" "$ svnadmin setlog myrepos newlog.txt -r 388\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1407 msgid "" "The <command>svnadmin setlog</command> command, by default, is still bound " "by the same protections against modifying unversioned properties as a remote " "client is—the <literal>pre-</literal> and <literal>post-revprop-" "change</literal> hooks are still triggered, and therefore must be set up to " "accept changes of this nature. But an administrator can get around these " "protections by passing the <option>--bypass-hooks</option> option to the " "<command>svnadmin setlog</command> command." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:1419 msgid "" "Remember, though, that by bypassing the hooks, you are likely avoiding such " "things as email notifications of property changes, backup systems that track " "unversioned property changes, and so on. In other words, be very careful " "about what you are changing, and how you change it." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:1432 msgid "Managing Disk Space" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1434 msgid "" "While the cost of storage has dropped incredibly in the past few years, disk " "usage is still a valid concern for administrators seeking to version large " "amounts of data. Every bit of version history information stored in the " "live repository needs to be backed up elsewhere, perhaps multiple times as " "part of rotating backup schedules. It is useful to know what pieces of " "Subversion's repository data need to remain on the live site, which need to " "be backed up, and which can be safely removed." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:1446 msgid "How Subversion saves disk space" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1448 msgid "" "To keep the repository small, Subversion uses <firstterm>deltification</" "firstterm> (or deltified storage) within the repository itself. " "Deltification involves encoding the representation of a chunk of data as a " "collection of differences against some other chunk of data. If the two " "pieces of data are very similar, this deltification results in storage " "savings for the deltified chunk—rather than taking up space equal to " "the size of the original data, it takes up only enough space to say, " "<quote>I look just like this other piece of data over here, except for the " "following couple of changes.</quote> The result is that most of the " "repository data that tends to be bulky—namely, the contents of " "versioned files—is stored at a much smaller size than the original " "full-text representation of that data. And for repositories created with " "Subversion 1.4 or later, the space savings are even better—now those " "full-text representations of file contents are themselves compressed." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><note><para> #: ../en/book/ch05-repository-admin.xml:1469 msgid "" "Because all of the data that is subject to deltification in a BDB-backed " "repository is stored in a single Berkeley DB database file, reducing the " "size of the stored values will not immediately reduce the size of the " "database file itself. Berkeley DB will, however, keep internal records of " "unused areas of the database file and consume those areas first before " "growing the size of the database file. So while deltification doesn't " "produce immediate space savings, it can drastically slow future growth of " "the database." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:1485 msgid "Removing dead transactions" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1487 msgid "" "Though they are uncommon, there are circumstances in which a Subversion " "commit process might fail, leaving behind in the repository the remnants of " "the revision-to-be that wasn't—an uncommitted transaction and all the " "file and directory changes associated with it. This could happen for " "several reasons: perhaps the client operation was inelegantly terminated by " "the user, or a network failure occurred in the middle of an operation. " "Regardless of the reason, dead transactions can happen. They don't do any " "real harm, other than consuming disk space. A fastidious administrator may " "nonetheless wish to remove them." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1500 msgid "" "You can use the <command>svnadmin lstxns</command> command to list the names " "of the currently outstanding transactions:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1504 #, no-wrap msgid "" "\n" "$ svnadmin lstxns myrepos\n" "19\n" "3a1\n" "a45\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1512 msgid "" "Each item in the resultant output can then be used with <command>svnlook</" "command> (and its <option>--transaction</option> (<option>-t</option>) " "option) to determine who created the transaction, when it was created, what " "types of changes were made in the transaction—information that is " "helpful in determining whether the transaction is a safe candidate for " "removal! If you do indeed want to remove a transaction, its name can be " "passed to <command>svnadmin rmtxns</command>, which will perform the cleanup " "of the transaction. In fact, <command>svnadmin rmtxns</command> can take " "its input directly from the output of <command>svnadmin lstxns</command>!" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1526 #, no-wrap msgid "" "\n" "$ svnadmin rmtxns myrepos `svnadmin lstxns myrepos`\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1531 msgid "" "If you use these two subcommands like this, you should consider making your " "repository temporarily inaccessible to clients. That way, no one can begin " "a legitimate transaction before you start your cleanup. <xref linkend=\"svn." "reposadmin.maint.diskspace.deadtxns.ex-1\" /> contains a bit of shell-" "scripting that can quickly generate information about each outstanding " "transaction in your repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><title> #: ../en/book/ch05-repository-admin.xml:1541 msgid "txn-info.sh (reporting outstanding transactions)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><programlisting> #: ../en/book/ch05-repository-admin.xml:1543 #, no-wrap msgid "" "\n" "#!/bin/sh\n" "\n" "### Generate informational output for all outstanding transactions in\n" "### a Subversion repository.\n" "\n" "REPOS=\"${1}\"\n" "if [ \"x$REPOS\" = x ] ; then\n" " echo \"usage: $0 REPOS_PATH\"\n" " exit\n" "fi\n" "\n" "for TXN in `svnadmin lstxns ${REPOS}`; do \n" " echo \"---[ Transaction ${TXN} ]-------------------------------------------\"\n" " svnlook info \"${REPOS}\" -t \"${TXN}\"\n" "done\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1562 msgid "" "The output of the script is basically a concatenation of several chunks of " "<command>svnlook info</command> output (see <xref linkend=\"svn.reposadmin." "maint.tk.svnlook\"/>) and will look something like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1567 #, no-wrap msgid "" "\n" "$ txn-info.sh myrepos\n" "---[ Transaction 19 ]-------------------------------------------\n" "sally\n" "2001-09-04 11:57:19 -0500 (Tue, 04 Sep 2001)\n" "0\n" "---[ Transaction 3a1 ]-------------------------------------------\n" "harry\n" "2001-09-10 16:50:30 -0500 (Mon, 10 Sep 2001)\n" "39\n" "Trying to commit over a faulty network.\n" "---[ Transaction a45 ]-------------------------------------------\n" "sally\n" "2001-09-12 11:09:28 -0500 (Wed, 12 Sep 2001)\n" "0\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1585 msgid "" "A long-abandoned transaction usually represents some sort of failed or " "interrupted commit. A transaction's datestamp can provide interesting " "information—for example, how likely is it that an operation begun nine " "months ago is still active?" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1591 msgid "" "In short, transaction cleanup decisions need not be made unwisely. Various " "sources of information—including Apache's error and access logs, " "Subversion's operational logs, Subversion revision history, and so on—" "can be employed in the decision-making process. And of course, an " "administrator can often simply communicate with a seemingly dead " "transaction's owner (via email, e.g.) to verify that the transaction is, in " "fact, in a zombie state." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:1604 msgid "Purging unused Berkeley DB logfiles" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1606 msgid "" "Until recently, the largest offender of disk space usage with respect to BDB-" "backed Subversion repositories were the logfiles in which Berkeley DB " "performs its prewrites before modifying the actual database files. These " "files capture all the actions taken along the route of changing the database " "from one state to another—while the database files, at any given time, " "reflect a particular state, the logfiles contain all of the many changes " "along the way <emphasis>between</emphasis> states. Thus, they can grow and " "accumulate quite rapidly." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1617 msgid "" "Fortunately, beginning with the 4.2 release of Berkeley DB, the database " "environment has the ability to remove its own unused logfiles " "automatically. Any repositories created using <command>svnadmin</command> " "when compiled against Berkeley DB version 4.2 or later will be configured " "for this automatic logfile removal. If you don't want this feature enabled, " "simply pass the <option>--bdb-log-keep</option> option to the " "<command>svnadmin create</command> command. If you forget to do this or " "change your mind at a later time, simply edit the <filename>DB_CONFIG</" "filename> file found in your repository's <filename>db</filename> directory, " "comment out the line that contains the <literal>set_flags DB_LOG_AUTOREMOVE</" "literal> directive, and then run <command>svnadmin recover</command> on your " "repository to force the configuration changes to take effect. See <xref " "linkend=\"svn.reposadmin.create.bdb\"/> for more information about database " "configuration." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1636 msgid "" "Without some sort of automatic logfile removal in place, logfiles will " "accumulate as you use your repository. This is actually somewhat of a " "feature of the database system—you should be able to recreate your " "entire database using nothing but the logfiles, so these files can be useful " "for catastrophic database recovery. But typically, you'll want to archive " "the logfiles that are no longer in use by Berkeley DB, and then remove them " "from disk to conserve space. Use the <command>svnadmin list-unused-dblogs</" "command> command to list the unused logfiles:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1648 #, no-wrap msgid "" "\n" "$ svnadmin list-unused-dblogs /var/svn/repos\n" "/var/svn/repos/log.0000000031\n" "/var/svn/repos/log.0000000032\n" "/var/svn/repos/log.0000000033\n" "…\n" "$ rm `svnadmin list-unused-dblogs /var/svn/repos`\n" "## disk space reclaimed!\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><warning><para> #: ../en/book/ch05-repository-admin.xml:1659 msgid "" "BDB-backed repositories whose logfiles are used as part of a backup or " "disaster recovery plan should <emphasis>not</emphasis> make use of the " "logfile autoremoval feature. Reconstruction of a repository's data from " "logfiles can only be accomplished only when <emphasis>all</emphasis> the " "logfiles are available. If some of the logfiles are removed from disk " "before the backup system has a chance to copy them elsewhere, the incomplete " "set of backed-up logfiles is essentially useless." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:1676 msgid "Berkeley DB Recovery" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1678 msgid "" "As mentioned in <xref linkend=\"svn.reposadmin.basics.backends.bdb\"/>, a " "Berkeley DB repository can sometimes be left in a frozen state if not closed " "properly. When this happens, an administrator needs to rewind the database " "back into a consistent state. This is unique to BDB-backed repositories, " "though—if you are using FSFS-backed ones instead, this won't apply to " "you. And for those of you using Subversion 1.4 with Berkeley DB 4.4 or " "later, you should find that Subversion has become much more resilient in " "these types of situations. Still, wedged Berkeley DB repositories do occur, " "and an administrator needs to know how to safely deal with this circumstance." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1691 msgid "" "To protect the data in your repository, Berkeley DB uses a locking " "mechanism. This mechanism ensures that portions of the database are not " "simultaneously modified by multiple database accessors, and that each " "process sees the data in the correct state when that data is being read from " "the database. When a process needs to change something in the database, it " "first checks for the existence of a lock on the target data. If the data is " "not locked, the process locks the data, makes the change it wants to make, " "and then unlocks the data. Other processes are forced to wait until that " "lock is removed before they are permitted to continue accessing that section " "of the database. (This has nothing to do with the locks that you, as a " "user, can apply to versioned files within the repository; we try to clear up " "the confusion caused by this terminology collision in the sidebar <xref " "linkend=\"svn.advanced.locking.meanings\" />.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1708 msgid "" "In the course of using your Subversion repository, fatal errors or " "interruptions can prevent a process from having the chance to remove the " "locks it has placed in the database. The result is that the backend " "database system gets <quote>wedged.</quote> When this happens, any attempts " "to access the repository hang indefinitely (since each new accessor is " "waiting for a lock to go away—which isn't going to happen)." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:1717 msgid "" "If this happens to your repository, don't panic. The Berkeley DB filesystem " "takes advantage of database transactions, checkpoints, and prewrite " "journaling to ensure that only the most catastrophic of events <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:1722 msgid "For example, hard drive + huge electromagnet = disaster." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1723 msgid "" "</footnote> can permanently destroy a database environment. A sufficiently " "paranoid repository administrator will have made off-site backups of the " "repository data in some fashion, but don't head off to the tape backup " "storage closet just yet." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1729 msgid "" "Instead, use the following recipe to attempt to <quote>unwedge</quote> your " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1734 msgid "" "Make sure no processes are accessing (or attempting to access) the " "repository. For networked repositories, this also means shutting down the " "Apache HTTP Server or svnserve daemon." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1740 msgid "" "Become the user who owns and manages the repository. This is important, as " "recovering a repository while running as the wrong user can tweak the " "permissions of the repository's files in such a way that your repository " "will still be inaccessible even after it is <quote>unwedged.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1748 msgid "" "Run the command <userinput>svnadmin recover /var/svn/repos</userinput>. You " "should see output such as this:" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><screen> #: ../en/book/ch05-repository-admin.xml:1752 #, no-wrap msgid "" "\n" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" "\n" "Recovery completed.\n" "The latest repos revision is 19.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1759 msgid "This command may take many minutes to complete." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1762 msgid "Restart the server process." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1766 msgid "" "This procedure fixes almost every case of repository wedging. Make sure " "that you run this command as the user that owns and manages the database, " "not just as <literal>root</literal>. Part of the recovery process might " "involve re-creating from scratch various database files (shared memory " "regions, e.g.). Recovering as <literal>root</literal> will create those " "files such that they are owned by <literal>root</literal>, which means that " "even after you restore connectivity to your repository, regular users will " "be unable to access it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1777 msgid "" "If the previous procedure, for some reason, does not successfully unwedge " "your repository, you should do two things. First, move your broken " "repository directory aside (perhaps by renaming it to something like " "<filename>repos.BROKEN</filename>) and then restore your latest backup of " "it. Then, send an email to the Subversion users mailing list (at " "<email>users@subversion.tigris.org</email>) describing your problem in " "detail. Data integrity is an extremely high priority to the Subversion " "developers." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:1791 msgid "Migrating Repository Data Elsewhere" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1793 msgid "" "A Subversion filesystem has its data spread throughout files in the " "repository, in a fashion generally understood by (and of interest to) only " "the Subversion developers themselves. However, circumstances may arise that " "call for all, or some subset, of that data to be copied or moved into " "another repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1800 msgid "" "Subversion provides such functionality by way of <firstterm>repository dump " "streams</firstterm>. A repository dump stream (often referred to as a " "<quote>dump file</quote> when stored as a file on disk) is a portable, flat " "file format that describes the various revisions in your repository—" "what was changed, by whom, when, and so on. This dump stream is the primary " "mechanism used to marshal versioned history—in whole or in part, with " "or without modification—between repositories. And Subversion provides " "the tools necessary for creating and loading these dump streams: the " "<command>svnadmin dump</command> and <command>svnadmin load</command> " "subcommands, respectively." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:1815 msgid "" "While the Subversion repository dump format contains human-readable portions " "and a familiar structure (it resembles an RFC 822 format, the same type of " "format used for most email), it is <emphasis>not</emphasis> a plain-text " "file format. It is a binary file format, highly sensitive to meddling. For " "example, many text editors will corrupt the file by automatically converting " "line endings." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1824 msgid "" "There are many reasons for dumping and loading Subversion repository data. " "Early in Subversion's life, the most common reason was due to the evolution " "of Subversion itself. As Subversion matured, there were times when changes " "made to the backend database schema caused compatibility issues with " "previous versions of the repository, so users had to dump their repository " "data using the previous version of Subversion and load it into a freshly " "created repository with the new version of Subversion. Now, these types of " "schema changes haven't occurred since Subversion's 1.0 release, and the " "Subversion developers promise not to force users to dump and load their " "repositories when upgrading between minor versions (such as from 1.3 to 1.4) " "of Subversion. But there are still other reasons for dumping and loading, " "including re-deploying a Berkeley DB repository on a new OS or CPU " "architecture, switching between the Berkeley DB and FSFS backends, or (as " "we'll cover later in this chapter in <xref linkend=\"svn.reposadmin.maint." "filtering\" />) purging versioned data from repository history." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch05-repository-admin.xml:1845 msgid "" "The Subversion repository dump format describes versioned repository changes " "only. It will not carry any information about uncommitted transactions, " "user locks on filesystem paths, repository or server configuration " "customizations (including hook scripts), and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1852 msgid "" "Whatever your reason for migrating repository history, using the " "<command>svnadmin dump</command> and <command>svnadmin load</command> " "subcommands is straightforward. <command>svnadmin dump</command> will " "output a range of repository revisions that are formatted using Subversion's " "custom filesystem dump format. The dump format is printed to the standard " "output stream, while informative messages are printed to the standard error " "stream. This allows you to redirect the output stream to a file while " "watching the status output in your terminal window. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:1864 #, no-wrap msgid "" "\n" "$ svnlook youngest myrepos\n" "26\n" "$ svnadmin dump myrepos > dumpfile\n" "* Dumped revision 0.\n" "* Dumped revision 1.\n" "* Dumped revision 2.\n" "…\n" "* Dumped revision 25.\n" "* Dumped revision 26.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1876 msgid "" "At the end of the process, you will have a single file (<filename>dumpfile</" "filename> in the previous example) that contains all the data stored in your " "repository in the requested range of revisions. Note that <command>svnadmin " "dump</command> is reading revision trees from the repository just like any " "other <quote>reader</quote> process would (e.g., <command>svn checkout</" "command>), so it's safe to run this command at any time." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1885 msgid "" "The other subcommand in the pair, <command>svnadmin load</command>, parses " "the standard input stream as a Subversion repository dump file and " "effectively replays those dumped revisions into the target repository for " "that operation. It also gives informative feedback, this time using the " "standard output stream:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:1892 #, no-wrap msgid "" "\n" "$ svnadmin load newrepos < dumpfile\n" "<<< Started new txn, based on original revision 1\n" " * adding path : A ... done.\n" " * adding path : A/B ... done.\n" " …\n" "------- Committed new rev 1 (loaded from original rev 1) >>>\n" "\n" "<<< Started new txn, based on original revision 2\n" " * editing path : A/mu ... done.\n" " * editing path : A/D/G/rho ... done.\n" "\n" "------- Committed new rev 2 (loaded from original rev 2) >>>\n" "\n" "…\n" "\n" "<<< Started new txn, based on original revision 25\n" " * editing path : A/D/gamma ... done.\n" "\n" "------- Committed new rev 25 (loaded from original rev 25) >>>\n" "\n" "<<< Started new txn, based on original revision 26\n" " * adding path : A/Z/zeta ... done.\n" " * editing path : A/mu ... done.\n" "\n" "------- Committed new rev 26 (loaded from original rev 26) >>>\n" "\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1921 msgid "" "The result of a load is new revisions added to a repository—the same " "thing you get by making commits against that repository from a regular " "Subversion client. Just as in a commit, you can use hook programs to " "perform actions before and after each of the commits made during a load " "process. By passing the <option>--use-pre-commit-hook</option> and " "<option>--use-post-commit-hook</option> options to <command>svnadmin load</" "command>, you can instruct Subversion to execute the pre-commit and post-" "commit hook programs, respectively, for each loaded revision. You might use " "these, for example, to ensure that loaded revisions pass through the same " "validation steps that regular commits pass through. Of course, you should " "use these options with care—if your post-commit hook sends emails to a " "mailing list for each new commit, you might not want to spew hundreds or " "thousands of commit emails in rapid succession at that list! You can read " "more about the use of hook scripts in <xref linkend=\"svn.reposadmin.create." "hooks\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1941 msgid "" "Note that because <command>svnadmin</command> uses standard input and output " "streams for the repository dump and load processes, people who are feeling " "especially saucy can try things such as this (perhaps even using different " "versions of <command>svnadmin</command> on each side of the pipe):" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:1947 #, no-wrap msgid "" "\n" "$ svnadmin create newrepos\n" "$ svnadmin dump oldrepos | svnadmin load newrepos\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1952 msgid "" "By default, the dump file will be quite large—much larger than the " "repository itself. That's because by default every version of every file is " "expressed as a full text in the dump file. This is the fastest and simplest " "behavior, and it's nice if you're piping the dump data directly into some " "other process (such as a compression program, filtering program, or loading " "process). But if you're creating a dump file for longer-term storage, " "you'll likely want to save disk space by using the <option>--deltas</option> " "option. With this option, successive revisions of files will be output as " "compressed, binary differences—just as file revisions are stored in a " "repository. This option is slower, but it results in a dump file much " "closer in size to the original repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1967 msgid "" "We mentioned previously that <command>svnadmin dump</command> outputs a " "range of revisions. Use the <option>--revision</option> (<option>-r</" "option>) option to specify a single revision, or a range of revisions, to " "dump. If you omit this option, all the existing repository revisions will " "be dumped." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:1974 #, no-wrap msgid "" "\n" "$ svnadmin dump myrepos -r 23 > rev-23.dumpfile\n" "$ svnadmin dump myrepos -r 100:200 > revs-100-200.dumpfile\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1979 msgid "" "As Subversion dumps each new revision, it outputs only enough information to " "allow a future loader to re-create that revision based on the previous one. " "In other words, for any given revision in the dump file, only the items that " "were changed in that revision will appear in the dump. The only exception " "to this rule is the first revision that is dumped with the current " "<command>svnadmin dump</command> command." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1988 msgid "" "By default, Subversion will not express the first dumped revision as merely " "differences to be applied to the previous revision. For one thing, there is " "no previous revision in the dump file! And second, Subversion cannot know " "the state of the repository into which the dump data will be loaded (if it " "ever is). To ensure that the output of each execution of <command>svnadmin " "dump</command> is self-sufficient, the first dumped revision is, by default, " "a full representation of every directory, file, and property in that " "revision of the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1999 msgid "" "However, you can change this default behavior. If you add the <option>--" "incremental</option> option when you dump your repository, " "<command>svnadmin</command> will compare the first dumped revision against " "the previous revision in the repository—the same way it treats every " "other revision that gets dumped. It will then output the first revision " "exactly as it does the rest of the revisions in the dump range—" "mentioning only the changes that occurred in that revision. The benefit of " "this is that you can create several small dump files that can be loaded in " "succession, instead of one large one, like so:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2011 #, no-wrap msgid "" "\n" "$ svnadmin dump myrepos -r 0:1000 > dumpfile1\n" "$ svnadmin dump myrepos -r 1001:2000 --incremental > dumpfile2\n" "$ svnadmin dump myrepos -r 2001:3000 --incremental > dumpfile3\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2017 msgid "" "These dump files could be loaded into a new repository with the following " "command sequence:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2020 #, no-wrap msgid "" "\n" "$ svnadmin load newrepos < dumpfile1\n" "$ svnadmin load newrepos < dumpfile2\n" "$ svnadmin load newrepos < dumpfile3\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2026 msgid "" "Another neat trick you can perform with this <option>--incremental</option> " "option involves appending to an existing dump file a new range of dumped " "revisions. For example, you might have a <literal>post-commit</literal> " "hook that simply appends the repository dump of the single revision that " "triggered the hook. Or you might have a script that runs nightly to append " "dump file data for all the revisions that were added to the repository since " "the last time the script ran. Used like this, <command>svnadmin dump</" "command> can be one way to back up changes to your repository over time in " "case of a system crash or some other catastrophic event." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2038 msgid "" "The dump format can also be used to merge the contents of several different " "repositories into a single repository. By using the <option>--parent-dir</" "option> option of <command>svnadmin load</command>, you can specify a new " "virtual root directory for the load process. That means if you have dump " "files for three repositories—say <filename>calc-dumpfile</filename>, " "<filename>cal-dumpfile</filename>, and <filename>ss-dumpfile</" "filename>—you can first create a new repository to hold them all:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2049 #, no-wrap msgid "" "\n" "$ svnadmin create /var/svn/projects\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2054 msgid "" "Then, make new directories in the repository that will encapsulate the " "contents of each of the three previous repositories:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2058 #, no-wrap msgid "" "\n" "$ svn mkdir -m \"Initial project roots\" \\\n" " file:///var/svn/projects/calc \\\n" " file:///var/svn/projects/calendar \\\n" " file:///var/svn/projects/spreadsheet\n" "Committed revision 1.\n" "$ \n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2067 msgid "" "Lastly, load the individual dump files into their respective locations in " "the new repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2070 #, no-wrap msgid "" "\n" "$ svnadmin load /var/svn/projects --parent-dir calc < calc-dumpfile\n" "…\n" "$ svnadmin load /var/svn/projects --parent-dir calendar < cal-dumpfile\n" "…\n" "$ svnadmin load /var/svn/projects --parent-dir spreadsheet < ss-dumpfile\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2080 msgid "" "We'll mention one final way to use the Subversion repository dump " "format—conversion from a different storage mechanism or version " "control system altogether. Because the dump file format is, for the most " "part, human-readable, it should be relatively easy to describe generic sets " "of changes—each of which should be treated as a new revision—" "using this file format. In fact, the <command>cvs2svn</command> utility " "(see <xref linkend=\"svn.forcvs.convert\"/>) uses the dump format to " "represent the contents of a CVS repository so that those contents can be " "copied into a Subversion repository." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:2096 #, fuzzy #| msgid "Subversion Repository URLs" msgid "Filtering Repository History" msgstr "Subversion-Repository-URLs" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:2098 msgid "" "Since Subversion stores your versioned history using, at the very least, " "binary differencing algorithms and data compression (optionally in a " "completely opaque database system), attempting manual tweaks is unwise if " "not quite difficult, and at any rate strongly discouraged. And once data " "has been stored in your repository, Subversion generally doesn't provide an " "easy way to remove that data. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:2106 msgid "That's rather the reason you use version control at all, right?" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:2108 msgid "" "</footnote> But inevitably, there will be times when you would like to " "manipulate the history of your repository. You might need to strip out all " "instances of a file that was accidentally added to the repository (and " "shouldn't be there for whatever reason). <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:2115 msgid "" "Conscious, cautious removal of certain bits of versioned data is actually " "supported by real use cases. That's why an <quote>obliterate</quote> " "feature has been one of the most highly requested Subversion features, and " "one which the Subversion developers hope to soon provide." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2121 msgid "" "</footnote> Or, perhaps you have multiple projects sharing a single " "repository, and you decide to split them up into their own repositories. To " "accomplish tasks such as these, administrators need a more manageable and " "malleable representation of the data in their repositories—the " "Subversion repository dump format." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2129 msgid "" "As we described earlier in <xref linkend=\"svn.reposadmin.maint.migrate\" /" ">, the Subversion repository dump format is a human-readable representation " "of the changes that you've made to your versioned data over time. Use the " "<command>svnadmin dump</command> command to generate the dump data, and " "<command>svnadmin load</command> to populate a new repository with it. The " "great thing about the human-readability aspect of the dump format is that, " "if you aren't careless about it, you can manually inspect and modify it. Of " "course, the downside is that if you have three years' worth of repository " "activity encapsulated in what is likely to be a very large dump file, it " "could take you a long, long time to manually inspect and modify it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2143 msgid "" "That's where <command>svndumpfilter</command> becomes useful. This program " "acts as a path-based filter for repository dump streams. Simply give it " "either a list of paths you wish to keep or a list of paths you wish to not " "keep, and then pipe your repository dump data through this filter. The " "result will be a modified stream of dump data that contains only the " "versioned paths you (explicitly or implicitly) requested." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2152 msgid "" "Let's look at a realistic example of how you might use this program. " "Earlier in this chapter (see <xref linkend=\"svn.reposadmin.projects." "chooselayout\"/>), we discussed the process of deciding how to choose a " "layout for the data in your repositories—using one repository per " "project or combining them, arranging stuff within your repository, and so " "on. But sometimes after new revisions start flying in, you rethink your " "layout and would like to make some changes. A common change is the decision " "to move multiple projects that are sharing a single repository into separate " "repositories for each project." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2164 msgid "" "Our imaginary repository contains three projects: <literal>calc</literal>, " "<literal>calendar</literal>, and <literal>spreadsheet</literal>. They have " "been living side-by-side in a layout like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2169 #, no-wrap msgid "" "\n" "/\n" " calc/\n" " trunk/\n" " branches/\n" " tags/\n" " calendar/\n" " trunk/\n" " branches/\n" " tags/\n" " spreadsheet/\n" " trunk/\n" " branches/\n" " tags/\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2185 msgid "" "To get these three projects into their own repositories, we first dump the " "whole repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2188 #, no-wrap msgid "" "\n" "$ svnadmin dump /var/svn/repos > repos-dumpfile\n" "* Dumped revision 0.\n" "* Dumped revision 1.\n" "* Dumped revision 2.\n" "* Dumped revision 3.\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2198 msgid "" "Next, run that dump file through the filter, each time including only one of " "our top-level directories. This results in three new dump files:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2202 #, no-wrap msgid "" "\n" "$ svndumpfilter include calc < repos-dumpfile > calc-dumpfile\n" "…\n" "$ svndumpfilter include calendar < repos-dumpfile > cal-dumpfile\n" "…\n" "$ svndumpfilter include spreadsheet < repos-dumpfile > ss-dumpfile\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2212 msgid "" "At this point, you have to make a decision. Each of your dump files will " "create a valid repository, but will preserve the paths exactly as they were " "in the original repository. This means that even though you would have a " "repository solely for your <literal>calc</literal> project, that repository " "would still have a top-level directory named <filename>calc</filename>. If " "you want your <filename>trunk</filename>, <filename>tags</filename>, and " "<filename>branches</filename> directories to live in the root of your " "repository, you might wish to edit your dump files, tweaking the " "<literal>Node-path</literal> and <literal>Node-copyfrom-path</literal> " "headers so that they no longer have that first <filename>calc/</filename> " "path component. Also, you'll want to remove the section of dump data that " "creates the <filename>calc</filename> directory. It will look something " "like the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2229 #, no-wrap msgid "" "\n" "Node-path: calc\n" "Node-action: add\n" "Node-kind: dir\n" "Content-length: 0\n" " \n" msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:2238 msgid "" "If you do plan on manually editing the dump file to remove a top-level " "directory, make sure your editor is not set to automatically convert end-of-" "line characters to the native format (e.g., <literal>\\r\\n</literal> to " "<literal>\\n</literal>), as the content will then not agree with the " "metadata. This will render the dump file useless." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2247 msgid "" "All that remains now is to create your three new repositories, and load each " "dump file into the right repository, ignoring the UUID found in the dump " "stream:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2251 #, no-wrap msgid "" "\n" "$ svnadmin create calc\n" "$ svnadmin load --ignore-uuid calc < calc-dumpfile\n" "<<< Started new transaction, based on original revision 1\n" " * adding path : Makefile ... done.\n" " * adding path : button.c ... done.\n" "…\n" "$ svnadmin create calendar\n" "$ svnadmin load --ignore-uuid calendar < cal-dumpfile\n" "<<< Started new transaction, based on original revision 1\n" " * adding path : Makefile ... done.\n" " * adding path : cal.c ... done.\n" "…\n" "$ svnadmin create spreadsheet\n" "$ svnadmin load --ignore-uuid spreadsheet < ss-dumpfile\n" "<<< Started new transaction, based on original revision 1\n" " * adding path : Makefile ... done.\n" " * adding path : ss.c ... done.\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2273 msgid "" "Both of <command>svndumpfilter</command>'s subcommands accept options for " "deciding how to deal with <quote>empty</quote> revisions. If a given " "revision contains only changes to paths that were filtered out, that now-" "empty revision could be considered uninteresting or even unwanted. So to " "give the user control over what to do with those revisions, " "<command>svndumpfilter</command> provides the following command-line options:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:2284 #: ../en/book/ch09-reference.xml:8226 msgid "<option>--drop-empty-revs</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:2286 msgid "Do not generate empty revisions at all—just omit them." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:2291 #: ../en/book/ch09-reference.xml:8235 msgid "<option>--renumber-revs</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:2293 msgid "" "If empty revisions are dropped (using the <option>--drop-empty-revs</option> " "option), change the revision numbers of the remaining revisions so that " "there are no gaps in the numeric sequence." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:2300 #: ../en/book/ch09-reference.xml:8254 msgid "<option>--preserve-revprops</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:2302 msgid "" "If empty revisions are not dropped, preserve the revision properties (log " "message, author, date, custom properties, etc.) for those empty revisions. " "Otherwise, empty revisions will contain only the original datestamp, and a " "generated log message that indicates that this revision was emptied by " "<command>svndumpfilter</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2313 msgid "" "While <command>svndumpfilter</command> can be very useful and a huge " "timesaver, there are unfortunately a couple of gotchas. First, this utility " "is overly sensitive to path semantics. Pay attention to whether paths in " "your dump file are specified with or without leading slashes. You'll want " "to look at the <literal>Node-path</literal> and <literal>Node-copyfrom-path</" "literal> headers." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2321 #, no-wrap msgid "" "\n" "…\n" "Node-path: spreadsheet/Makefile\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:2327 msgid "" "If the paths have leading slashes, you should include leading slashes in the " "paths you pass to <command>svndumpfilter include</command> and " "<command>svndumpfilter exclude</command> (and if they don't, you " "shouldn't). Further, if your dump file has an inconsistent usage of leading " "slashes for some reason, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:2334 msgid "" "While <command>svnadmin dump</command> has a consistent leading slash policy " "(to not include them), other programs that generate dump data might not be " "so consistent." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2338 msgid "" "</footnote> you should probably normalize those paths so that they all have, " "or all lack, leading slashes." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2342 msgid "" "Also, copied paths can give you some trouble. Subversion supports copy " "operations in the repository, where a new path is created by copying some " "already existing path. It is possible that at some point in the lifetime of " "your repository, you might have copied a file or directory from some " "location that <command>svndumpfilter</command> is excluding, to a location " "that it is including. To make the dump data self-sufficient, " "<command>svndumpfilter</command> needs to still show the addition of the new " "path—including the contents of any files created by the copy—and " "not represent that addition as a copy from a source that won't exist in your " "filtered dump data stream. But because the Subversion repository dump " "format shows only what was changed in each revision, the contents of the " "copy source might not be readily available. If you suspect that you have " "any copies of this sort in your repository, you might want to rethink your " "set of included/excluded paths, perhaps including the paths that served as " "sources of your troublesome copy operations, too." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2363 msgid "" "Finally, <command>svndumpfilter</command> takes path filtering quite " "literally. If you are trying to copy the history of a project rooted at " "<filename>trunk/my-project</filename> and move it into a repository of its " "own, you would, of course, use the <command>svndumpfilter include</command> " "command to keep all the changes in and under <filename>trunk/my-project</" "filename>. But the resultant dump file makes no assumptions about the " "repository into which you plan to load this data. Specifically, the dump " "data might begin with the revision that added the <filename>trunk/my-" "project</filename> directory, but it will <emphasis>not</emphasis> contain " "directives that would create the <filename>trunk</filename> directory itself " "(because <filename>trunk</filename> doesn't match the include filter). " "You'll need to make sure that any directories that the new dump stream " "expects to exist actually do exist in the target repository before trying to " "load the stream into that repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:2387 #, fuzzy #| msgid "Repository URLs" msgid "Repository Replication" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2389 msgid "" "There are several scenarios in which it is quite handy to have a Subversion " "repository whose version history is exactly the same as some other " "repository's. Perhaps the most obvious one is the maintenance of a simple " "backup repository, used when the primary repository has become inaccessible " "due to a hardware failure, network outage, or other such annoyance. Other " "scenarios include deploying mirror repositories to distribute heavy " "Subversion load across multiple servers, use as a soft-upgrade mechanism, " "and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2399 msgid "" "As of version 1.4, Subversion provides a program for managing scenarios such " "as these—<command>svnsync</command>. This works by essentially asking " "the Subversion server to <quote>replay</quote> revisions, one at a time. It " "then uses that revision information to mimic a commit of the same to another " "repository. Neither repository needs to be locally accessible to the " "machine on which <command>svnsync</command> is running—its parameters " "are repository URLs, and it does all its work through Subversion's " "Repository Access (RA) interfaces. All it requires is read access to the " "source repository and read/write access to the destination repository." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch05-repository-admin.xml:2414 msgid "" "When using <command>svnsync</command> against a remote source repository, " "the Subversion server for that repository must be running Subversion version " "1.4 or later." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:2419 msgid "" "Assuming you already have a source repository that you'd like to mirror, the " "next thing you need is an empty target repository that will actually serve " "as that mirror. This target repository can use either of the available " "filesystem data-store backends (see <xref linkend=\"svn.reposadmin.basics." "backends\" />), but it must not yet have any version history in it. The " "protocol that <command>svnsync</command> uses to communicate revision " "information is highly sensitive to mismatches between the versioned " "histories contained in the source and target repositories. For this reason, " "while <command>svnsync</command> cannot <emphasis>demand</emphasis> that the " "target repository be read-only, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:2433 msgid "" "In fact, it can't truly be read-only, or <command>svnsync</command> itself " "would have a tough time copying revision history into it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2436 msgid "" "</footnote> allowing the revision history in the target repository to change " "by any mechanism other than the mirroring process is a recipe for disaster." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:2442 msgid "" "Do <emphasis>not</emphasis> modify a mirror repository in such a way as to " "cause its version history to deviate from that of the repository it " "mirrors. The only commits and revision property modifications that ever " "occur on that mirror repository should be those performed by the " "<command>svnsync</command> tool." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2450 msgid "" "Another requirement of the target repository is that the <command>svnsync</" "command> process be allowed to modify revision properties. Because " "<command>svnsync</command> works within the framework of that repository's " "hook system, the default state of the repository (which is to disallow " "revision property changes; see <xref linkend=\"svn.ref.reposhooks.pre-" "revprop-change\" />) is insufficient. You'll need to explicitly implement " "the pre-revprop-change hook, and your script must allow <command>svnsync</" "command> to set and change revision properties. With those provisions in " "place, you are ready to start mirroring repository revisions." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch05-repository-admin.xml:2464 msgid "" "It's a good idea to implement authorization measures that allow your " "repository replication process to perform its tasks while preventing other " "users from modifying the contents of your mirror repository at all." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2470 msgid "" "Let's walk through the use of <command>svnsync</command> in a somewhat " "typical mirroring scenario. We'll pepper this discourse with practical " "recommendations, which you are free to disregard if they aren't required by " "or suitable for your environment." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2476 msgid "" "As a service to the fine developers of our favorite version control system, " "we will be mirroring the public Subversion source code repository and " "exposing that mirror publicly on the Internet, hosted on a different machine " "than the one on which the original Subversion source code repository lives. " "This remote host has a global configuration that permits anonymous users to " "read the contents of repositories on the host, but requires users to " "authenticate to modify those repositories. (Please forgive us for glossing " "over the details of Subversion server configuration for the moment—" "those are covered thoroughly in <xref linkend=\"svn.serverconfig\" />.) And " "for no other reason than that it makes for a more interesting example, we'll " "be driving the replication process from a third machine—the one that " "we currently find ourselves using." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2492 msgid "" "First, we'll create the repository which will be our mirror. This and the " "next couple of steps do require shell access to the machine on which the " "mirror repository will live. Once the repository is all configured, though, " "we shouldn't need to touch it directly again." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2498 #, no-wrap msgid "" "\n" "$ ssh admin@svn.example.com \\\n" " \"svnadmin create /var/svn/svn-mirror\"\n" "admin@svn.example.com's password: ********\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2505 msgid "" "At this point, we have our repository, and due to our server's " "configuration, that repository is now <quote>live</quote> on the Internet. " "Now, because we don't want anything modifying the repository except our " "replication process, we need a way to distinguish that process from other " "would-be committers. To do so, we use a dedicated username for our " "process. Only commits and revision property modifications performed by the " "special username <literal>syncuser</literal> will be allowed." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2515 msgid "" "We'll use the repository's hook system both to allow the replication process " "to do what it needs to do and to enforce that only it is doing those " "things. We accomplish this by implementing two of the repository event " "hooks—pre-revprop-change and start-commit. Our <filename>pre-revprop-" "change</filename> hook script is found in <xref linkend=\"svn.reposadmin." "maint.replication.pre-revprop-change\" />, and basically verifies that the " "user attempting the property changes is our <literal>syncuser</literal> " "user. If so, the change is allowed; otherwise, it is denied." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch05-repository-admin.xml:2528 msgid "Mirror repository's pre-revprop-change hook script" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch05-repository-admin.xml:2530 #, no-wrap msgid "" "\n" "#!/bin/sh \n" "\n" "USER=\"$3\"\n" "\n" "if [ \"$USER\" = \"syncuser\" ]; then exit 0; fi\n" "\n" "echo \"Only the syncuser user may change revision properties\" >&2\n" "exit 1\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2542 msgid "" "That covers revision property changes. Now we need to ensure that only the " "<literal>syncuser</literal> user is permitted to commit new revisions to the " "repository. We do this using a <filename>start-commit</filename> hook " "scripts such as the one in <xref linkend=\"svn.reposadmin.maint.replication." "start-commit\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch05-repository-admin.xml:2551 msgid "Mirror repository's start-commit hook script" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch05-repository-admin.xml:2553 #, no-wrap msgid "" "\n" "#!/bin/sh \n" "\n" "USER=\"$2\"\n" "\n" "if [ \"$USER\" = \"syncuser\" ]; then exit 0; fi\n" "\n" "echo \"Only the syncuser user may commit new revisions\" >&2\n" "exit 1\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2565 msgid "" "After installing our hook scripts and ensuring that they are executable by " "the Subversion server, we're finished with the setup of the mirror " "repository. Now, we get to actually do the mirroring." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2570 msgid "" "The first thing we need to do with <command>svnsync</command> is to register " "in our target repository the fact that it will be a mirror of the source " "repository. We do this using the <command>svnsync initialize</command> " "subcommand. The URLs we provide point to the root directories of the target " "and source repositories, respectively. In Subversion 1.4, this is " "required—only full mirroring of repositories is permitted. In " "Subversion 1.5, though, you can use <command>svnsync</command> to mirror " "only some subtree of the repository, too." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2581 #, no-wrap msgid "" "\n" "$ svnsync help init\n" "initialize (init): usage: svnsync initialize DEST_URL SOURCE_URL\n" "\n" "Initialize a destination repository for synchronization from\n" "another repository.\n" "…\n" "$ svnsync initialize http://svn.example.com/svn-mirror \\\n" " http://svn.collab.net/repos/svn \\\n" " --sync-username syncuser --sync-password syncpass\n" "Copied properties for revision 0.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2595 msgid "" "Our target repository will now remember that it is a mirror of the public " "Subversion source code repository. Notice that we provided a username and " "password as arguments to <command>svnsync</command>—that was required " "by the pre-revprop-change hook on our mirror repository." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch05-repository-admin.xml:2602 msgid "" "In Subversion 1.4, the values given to <command>svnsync</command>'s " "<option>--username</option> and <option>--password</option> command-line " "options were used for authentication against both the source and destination " "repositories. This caused problems when a user's credentials weren't " "exactly the same for both repositories, especially when running in " "noninteractive mode (with the <option>--non-interactive</option> option)." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch05-repository-admin.xml:2611 msgid "" "This has been fixed in Subversion 1.5 with the introduction of two new pairs " "of options. Use <option>--source-username</option> and <option>--source-" "password</option> to provide authentication credentials for the source " "repository; use <option>--sync-username</option> and <option>--sync-" "password</option> to provide credentials for the destination repository. " "(The old <option>--username</option> and <option>--password</option> options " "still exist for compatibility, but we advise against using them.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:2625 msgid "" "And now comes the fun part. With a single subcommand, we can tell " "<command>svnsync</command> to copy all the as-yet-unmirrored revisions from " "the source repository to the target. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:2630 msgid "" "Be forewarned that while it will take only a few seconds for the average " "reader to parse this paragraph and the sample output that follows it, the " "actual time required to complete such a mirroring operation is, shall we " "say, quite a bit longer." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2635 msgid "" "</footnote> The <command>svnsync synchronize</command> subcommand will peek " "into the special revision properties previously stored on the target " "repository, and determine both what repository it is mirroring as well as " "that the most recently mirrored revision was revision 0. Then it will query " "the source repository and determine what the latest revision in that " "repository is. Finally, it asks the source repository's server to start " "replaying all the revisions between 0 and that latest revision. As " "<command>svnsync</command> get the resultant response from the source " "repository's server, it begins forwarding those revisions to the target " "repository's server as new commits." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2649 #, no-wrap msgid "" "\n" "$ svnsync help synchronize\n" "synchronize (sync): usage: svnsync synchronize DEST_URL\n" "\n" "Transfer all pending revisions to the destination from the source\n" "with which it was initialized.\n" "…\n" "$ svnsync synchronize http://svn.example.com/svn-mirror\n" "Transmitting file data ........................................\n" "Committed revision 1.\n" "Copied properties for revision 1.\n" "Transmitting file data ..\n" "Committed revision 2.\n" "Copied properties for revision 2.\n" "Transmitting file data .....\n" "Committed revision 3.\n" "Copied properties for revision 3.\n" "…\n" "Transmitting file data ..\n" "Committed revision 23406.\n" "Copied properties for revision 23406.\n" "Transmitting file data .\n" "Committed revision 23407.\n" "Copied properties for revision 23407.\n" "Transmitting file data ....\n" "Committed revision 23408.\n" "Copied properties for revision 23408.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2679 msgid "" "Of particular interest here is that for each mirrored revision, there is " "first a commit of that revision to the target repository, and then property " "changes follow. This is because the initial commit is performed by (and " "attributed to) the user <literal>syncuser</literal>, and it is datestamped " "with the time as of that revision's creation. Also, Subversion's underlying " "repository access interfaces don't provide a mechanism for setting arbitrary " "revision properties as part of a commit. So <command>svnsync</command> " "follows up with an immediate series of property modifications that copy into " "the target repository all the revision properties found for that revision in " "the source repository. This also has the effect of fixing the author and " "datestamp of the revision to match that of the source repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2694 msgid "" "Also noteworthy is that <command>svnsync</command> performs careful " "bookkeeping that allows it to be safely interrupted and restarted without " "ruining the integrity of the mirrored data. If a network glitch occurs " "while mirroring a repository, simply repeat the <command>svnsync " "synchronize</command> command, and it will happily pick up right where it " "left off. In fact, as new revisions appear in the source repository, this " "is exactly what you to do to keep your mirror up to date." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:2705 msgid "svnsync Bookkeeping" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch05-repository-admin.xml:2707 msgid "" "<command>svnsync</command> needs to be able to set and modify revision " "properties on the mirror repository because those properties are part of the " "data it is tasked with mirroring. As those properties change in the source " "repository, those changes need to be reflected in the mirror repository, " "too. But <command>svnsync</command> also uses a set of custom revision " "properties—stored in revision 0 of the mirror repository—for its " "own internal bookkeeping. These properties contain information such as the " "URL and UUID of the source repository, plus some additional state-tracking " "information." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch05-repository-admin.xml:2719 msgid "" "One of those pieces of state-tracking information is a flag that essentially " "just means <quote>there's a synchronization in progress right now.</quote> " "This is used to prevent multiple <command>svnsync</command> processes from " "colliding with each other while trying to mirror data to the same " "destination repository. Now, generally you won't need to pay any attention " "whatsoever to <emphasis>any</emphasis> of these special properties (all of " "which begin with the prefix <literal>svn:sync-</literal>). Occasionally, " "though, if a synchronization fails unexpectedly, Subversion never has a " "chance to remove this particular state flag. This causes all future " "synchronization attempts to fail because it appears that a synchronization " "is still in progress when, in fact, none is. Fortunately, recovering from " "this situation is as simple as removing the <literal>svn:sync-lock</literal> " "property which serves as this flag from revision 0 of the mirror repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch05-repository-admin.xml:2738 #, no-wrap msgid "" "\n" "$ svn propdel --revprop -r0 svn:sync-lock http://svn.example.com/svn-mirror\n" "property 'svn:sync-lock' deleted from repository revision 0\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch05-repository-admin.xml:2744 msgid "" "That <command>svnsync</command> stores the source repository URL in a " "bookkeeping property on the mirror repository is the reason why you have to " "specify that URL only once, during <command>svnsync init</command>. Future " "synchronization operations against that mirror simply consult the special " "<literal>svn:sync-from-url</literal> property stored on the mirror itself to " "know where to synchronize from. This value is used literally by the " "synchronization process, though. So while from within CollabNet's network " "you can perhaps access our example source URL as <literal>http://svn/repos/" "svn</literal> (because that first <literal>svn</literal> magically gets " "<literal>.collab.net</literal> appended to it by DNS voodoo), if you later " "need to update that mirror from another machine outside CollabNet's network, " "the synchronization might fail (because the hostname <literal>svn</literal> " "is ambiguous). For this reason, it's best to use fully qualified source " "repository URLs when initializing a mirror repository rather than those that " "refer to only hostnames or IP addresses (which can change over time). But " "here again, if you need an existing mirror to start referring to a different " "URL for the same source repository, you can change the bookkeeping property " "which houses that information:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch05-repository-admin.xml:2769 #, no-wrap msgid "" "\n" "$ svn propset --revprop -r0 svn:sync-from-url <replaceable>NEW-SOURCE-URL</replaceable> \\\n" " http://svn.example.com/svn-mirror\n" "property 'svn:sync-from-url' set on repository revision 0\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch05-repository-admin.xml:2776 msgid "" "Another interesting thing about these special bookkeeping properties is that " "<command>svnsync</command> will not attempt to mirror any of those " "properties when they are found in the source repository. The reason is " "probably obvious, but basically boils down to <command>svnsync</command> not " "being able to distinguish the special properties it has merely copied from " "the source repository from those it needs to consult and maintain for its " "own bookkeeping needs. This situation could occur if, for example, you were " "maintaining a mirror of a mirror of a third repository. When " "<command>svnsync</command> sees its own special properties in revision 0 of " "the source repository, it simply ignores them." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2792 msgid "" "There is, however, one bit of inelegance in the process. Because Subversion " "revision properties can be changed at any time throughout the lifetime of " "the repository, and because they don't leave an audit trail that indicates " "when they were changed, replication processes have to pay special attention " "to them. If you've already mirrored the first 15 revisions of a repository " "and someone then changes a revision property on revision 12, " "<command>svnsync</command> won't know to go back and patch up its copy of " "revision 12. You'll need to tell it to do so manually by using (or with " "some additional tooling around) the <command>svnsync copy-revprops</command> " "subcommand, which simply rereplicates all the revision properties for a " "particular revision or range thereof." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2806 #, no-wrap msgid "" "\n" "$ svnsync help copy-revprops\n" "copy-revprops: usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n" "\n" "Copy the revision properties in a given range of revisions to the\n" "destination from the source with which it was initialized.\n" "…\n" "$ svnsync copy-revprops http://svn.example.com/svn-mirror 12\n" "Copied properties for revision 12.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2818 msgid "" "That's repository replication in a nutshell. You'll likely want some " "automation around such a process. For example, while our example was a pull-" "and-push setup, you might wish to have your primary repository push changes " "to one or more blessed mirrors as part of its post-commit and post-revprop-" "change hook implementations. This would enable the mirror to be up to date " "in as near to real time as is likely possible." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2827 msgid "" "Also, while it isn't very commonplace to do so, <command>svnsync</command> " "does gracefully mirror repositories in which the user as whom it " "authenticates has only partial read access. It simply copies only the bits " "of the repository that it is permitted to see. Obviously, such a mirror is " "not useful as a backup solution." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2834 msgid "" "In Subversion 1.5, <command>svnsync</command> grew the ability to also " "mirror a subset of a repository rather than the whole thing. The process of " "setting up and maintaining such a mirror is exactly the same as when " "mirroring a whole repository, except that instead of specifying the source " "repository's root URL when running <command>svnsync init</command>, you " "specify the URL of some subdirectory within that repository. " "Synchronization to that mirror will now copy only the bits that changed " "under that source repository subdirectory. There are some limitations to " "this support, though. First, you can't mirror multiple disjoint " "subdirectories of the source repository into a single mirror " "repository—you'd need to instead mirror some parent directory that is " "common to both. Second, the filtering logic is entirely path-based, so if " "the subdirectory you are mirroring was renamed at some point in the past, " "your mirror would contain only the revisions since the directory appeared at " "the URL you specified. And likewise, if the source subdirectory is renamed " "in the future, your synchronization processes will stop mirroring data at " "the point that the source URL you specified is no longer valid." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2856 msgid "" "As far as user interaction with repositories and mirrors goes, it " "<emphasis>is</emphasis> possible to have a single working copy that " "interacts with both, but you'll have to jump through some hoops to make it " "happen. First, you need to ensure that both the primary and mirror " "repositories have the same repository UUID (which is not the case by " "default). See <xref linkend=\"svn.reposadmin.maint.uuids\" /> later in this " "chapter for more about this." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2865 msgid "" "Once the two repositories have the same UUID, you can use <command>svn " "switch</command> with the <option>--relocate</option> option to point your " "working copy to whichever of the repositories you wish to operate against, a " "process that is described in <xref linkend=\"svn.ref.svn.c.switch\" />. " "There is a possible danger here, though, in that if the primary and mirror " "repositories aren't in close synchronization, a working copy up to date " "with, and pointing to, the primary repository will, if relocated to point to " "an out-of-date mirror, become confused about the apparent sudden loss of " "revisions it fully expects to be present, and it will throw errors to that " "effect. If this occurs, you can relocate your working copy back to the " "primary repository and then either wait until the mirror repository is up to " "date, or backdate your working copy to a revision you know is present in the " "sync repository, and then retry the relocation." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2882 msgid "" "Finally, be aware that the revision-based replication provided by " "<command>svnsync</command> is only that—replication of revisions. " "Only information carried by the Subversion repository dump file format is " "available for replication. As such, <command>svnsync</command> has the same " "sorts of limitations that the repository dump stream has, and does not " "include such things as the hook implementations, repository or server " "configuration data, uncommitted transactions, or information about user " "locks on repository paths." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:2897 #, fuzzy #| msgid "Repository URLs" msgid "Repository Backup" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2899 msgid "" "Despite numerous advances in technology since the birth of the modern " "computer, one thing unfortunately rings true with crystalline clarity—" "sometimes things go very, very awry. Power outages, network connectivity " "dropouts, corrupt RAM, and crashed hard drives are but a taste of the evil " "that Fate is poised to unleash on even the most conscientious " "administrator. And so we arrive at a very important topic—how to make " "backup copies of your repository data." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2909 msgid "" "There are two types of backup methods available for Subversion repository " "administrators—full and incremental. A full backup of the repository " "involves squirreling away in one sweeping action all the information " "required to fully reconstruct that repository in the event of a " "catastrophe. Usually, it means, quite literally, the duplication of the " "entire repository directory (which includes either a Berkeley DB or FSFS " "environment). Incremental backups are lesser things: backups of only the " "portion of the repository data that has changed since the previous backup." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2921 msgid "" "As far as full backups go, the naïve approach might seem like a sane one, " "but unless you temporarily disable all other access to your repository, " "simply doing a recursive directory copy runs the risk of generating a faulty " "backup. In the case of Berkeley DB, the documentation describes a certain " "order in which database files can be copied that will guarantee a valid " "backup copy. A similar ordering exists for FSFS data. But you don't have " "to implement these algorithms yourself, because the Subversion development " "team has already done so. The <command>svnadmin hotcopy</command> command " "takes care of the minutia involved in making a hot backup of your " "repository. And its invocation is as trivial as the Unix <command>cp</" "command> or Windows <command>copy</command> operations:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2936 #, no-wrap msgid "" "\n" "$ svnadmin hotcopy /var/svn/repos /var/svn/repos-backup\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2940 msgid "" "The resultant backup is a fully functional Subversion repository, able to be " "dropped in as a replacement for your live repository should something go " "horribly wrong." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2944 msgid "" "When making copies of a Berkeley DB repository, you can even instruct " "<command>svnadmin hotcopy</command> to purge any unused Berkeley DB logfiles " "(see <xref linkend=\"svn.reposadmin.maint.diskspace.bdblogs\" />) from the " "original repository upon completion of the copy. Simply provide the " "<option>--clean-logs</option> option on the command line." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2952 #, no-wrap msgid "" "\n" "$ svnadmin hotcopy --clean-logs /var/svn/bdb-repos /var/svn/bdb-repos-backup\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2956 msgid "" "Additional tooling around this command is available, too. The " "<filename>tools/backup/</filename> directory of the Subversion source " "distribution holds the <command>hot-backup.py</command> script. This script " "adds a bit of backup management atop <command>svnadmin hotcopy</command>, " "allowing you to keep only the most recent configured number of backups of " "each repository. It will automatically manage the names of the backed-up " "repository directories to avoid collisions with previous backups and will " "<quote>rotate off</quote> older backups, deleting them so that only the most " "recent ones remain. Even if you also have an incremental backup, you might " "want to run this program on a regular basis. For example, you might " "consider using <command>hot-backup.py</command> from a program scheduler " "(such as <command>cron</command> on Unix systems), which can cause it to run " "nightly (or at whatever granularity of time you deem safe)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2974 msgid "" "Some administrators use a different backup mechanism built around generating " "and storing repository dump data. We described in <xref linkend=\"svn." "reposadmin.maint.migrate\" /> how to use <command>svnadmin dump</command> " "with the <option>--incremental</option> option to perform an incremental " "backup of a given revision or range of revisions. And of course, you can " "achieve a full backup variation of this by omitting the <option>--" "incremental</option> option to that command. There is some value in these " "methods, in that the format of your backed-up information is flexible—" "it's not tied to a particular platform, versioned filesystem type, or " "release of Subversion or Berkeley DB. But that flexibility comes at a cost, " "namely that restoring that data can take a long time—longer with each " "new revision committed to your repository. Also, as is the case with so " "many of the various backup methods, revision property changes that are made " "to already backed-up revisions won't get picked up by a nonoverlapping, " "incremental dump generation. For these reasons, we recommend against " "relying solely on dump-based backup approaches." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2994 msgid "" "As you can see, each of the various backup types and methods has its " "advantages and disadvantages. The easiest is by far the full hot backup, " "which will always result in a perfect working replica of your repository. " "Should something bad happen to your live repository, you can restore from " "the backup with a simple recursive directory copy. Unfortunately, if you " "are maintaining multiple backups of your repository, these full copies will " "each eat up just as much disk space as your live repository. Incremental " "backups, by contrast, tend to be quicker to generate and smaller to store. " "But the restoration process can be a pain, often involving applying multiple " "incremental backups. And other methods have their own peculiarities. " "Administrators need to find the balance between the cost of making the " "backup and the cost of restoring it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3010 msgid "" "The <command>svnsync</command> program (see <xref linkend=\"svn.reposadmin." "maint.replication\" />) actually provides a rather handy middle-ground " "approach. If you are regularly synchronizing a read-only mirror with your " "main repository, in a pinch your read-only mirror is probably a good " "candidate for replacing that main repository if it falls over. The primary " "disadvantage of this method is that only the versioned repository data gets " "synchronized—repository configuration files, user-specified repository " "path locks, and other items that might live in the physical repository " "directory but not <emphasis>inside</emphasis> the repository's virtual " "versioned filesystem are not handled by <command>svnsync</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:3024 msgid "" "In any backup scenario, repository administrators need to be aware of how " "modifications to unversioned revision properties affect their backups. " "Since these changes do not themselves generate new revisions, they will not " "trigger post-commit hooks, and may not even trigger the pre-revprop-change " "and post-revprop-change hooks. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:3031 msgid "" "<command>svnadmin setlog</command> can be called in a way that bypasses the " "hook interface altogether." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3033 msgid "" "</footnote> And since you can change revision properties without respect to " "chronological order—you can change any revision's properties at any " "time—an incremental backup of the latest few revisions might not catch " "a property modification to a revision that was included as part of a " "previous backup." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3041 msgid "" "Generally speaking, only the truly paranoid would need to back up their " "entire repository, say, every time a commit occurred. However, assuming " "that a given repository has some other redundancy mechanism in place with " "relatively fine granularity (such as per-commit emails or incremental " "dumps), a hot backup of the database might be something that a repository " "administrator would want to include as part of a system-wide nightly " "backup. It's your data—protect it as much as you'd like." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:3051 msgid "" "Often, the best approach to repository backups is a diversified one that " "leverages combinations of the methods described here. The Subversion " "developers, for example, back up the Subversion source code repository " "nightly using <command>hot-backup.py</command> and an off-site " "<command>rsync</command> of those full backups; keep multiple archives of " "all the commit and property change notification emails; and have repository " "mirrors maintained by various volunteers using <command>svnsync</command>. " "Your solution might be similar, but should be catered to your needs and that " "delicate balance of convenience with paranoia. And whatever you do, " "validate your backups from time to time—what good is a spare tire that " "has a hole in it? While all of this might not save your hardware from the " "iron fist of Fate, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:3066 msgid "" "You know—the collective term for all of her <quote>fickle fingers.</" "quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3068 msgid "" "</footnote> it should certainly help you recover from those trying times." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:3076 #, fuzzy #| msgid "Repository URLs" msgid "Managing Repository UUIDs" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3078 msgid "" "Subversion repositories have a universally unique identifier (UUID) " "associated with them. This is used by Subversion clients to verify the " "identity of a repository when other forms of verification aren't good enough " "(such as checking the repository URL, which can change over time). Most " "Subversion repository administrators rarely, if ever, need to think about " "repository UUIDs as anything more than a trivial implementation detail of " "Subversion. Sometimes, however, there is cause for attention to this detail." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3088 msgid "" "As a general rule, you want the UUIDs of your live repositories to be " "unique. That is, after all, the point of having UUIDs. But there are times " "when you want the repository UUIDs of two repositories to be exactly the " "same. For example, if you make a copy of a repository for backup purposes, " "you want the backup to be a perfect replica of the original so that, in the " "event that you have to restore that backup and replace the live repository, " "users don't suddenly see what looks like a different repository. When " "dumping and loading repository history (as described earlier in <xref " "linkend=\"svn.reposadmin.maint.migrate\" />), you get to decide whether to " "apply the UUID encapsulated in the data dump stream to the repository in " "which you are loading the data. The particular circumstance will dictate " "the correct behavior." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3104 msgid "" "There are a couple of ways to set (or reset) a repository's UUID, should you " "need to. As of Subversion 1.5, this is as simple as using the " "<command>svnadmin setuuid</command> command. If you provide this subcommand " "with an explicit UUID, it will validate that the UUID is well-formed and " "then set the repository UUID to that value. If you omit the UUID, a brand-" "new UUID will be generated for your repository." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:3113 #, no-wrap msgid "" "\n" "$ svnlook uuid /var/svn/repos\n" "cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec\n" "$ svnadmin setuuid /var/svn/repos # generate a new UUID\n" "$ svnlook uuid /var/svn/repos\n" "3c3c38fe-acc0-11dc-acbc-1b37ff1c8e7c\n" "$ svnadmin setuuid /var/svn/repos \\\n" " cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec # restore the old UUID\n" "$ svnlook uuid /var/svn/repos\n" "cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3126 msgid "" "For folks using versions of Subversion earlier than 1.5, these tasks are a " "little more complicated. You can explicitly set a repository's UUID by " "piping a repository dump file stub that carries the new UUID specification " "through <userinput>svnadmin load --force-uuid <replaceable>REPOS-PATH</" "replaceable></userinput>." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:3132 #, no-wrap msgid "" "\n" "$ svnadmin load --force-uuid /var/svn/repos <<EOF\n" "SVN-fs-dump-format-version: 2\n" "\n" "UUID: cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec\n" "EOF\n" "$ svnlook uuid /var/svn/repos\n" "cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3143 msgid "" "Having older versions of Subversion generate a brand-new UUID is not quite " "as simple to do, though. Your best bet here is to find some other way to " "generate a UUID, and then explicitly set the repository's UUID to that value." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch05-repository-admin.xml:3156 msgid "Moving and Removing Repositories" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:3158 msgid "" "Subversion repository data is wholly contained within the repository " "directory. As such, you can move a Subversion repository to some other " "location on disk, rename a repository, copy a repository, or delete a " "repository altogether using the tools provided by your operating system for " "manipulating directories—<command>mv</command>, <command>cp -a</" "command>, and <command>rm -r</command> on Unix platforms; <command>copy</" "command>, <command>move</command>, and <command>rmdir /s /q</command> on " "Windows; vast numbers of mouse and menu gyrations in various graphical file " "explorer applications, and so on." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:3170 msgid "" "Of course, there's often still more to be done when trying to cleanly affect " "changes such as this. For example, you might need to update your Subversion " "server configuration to point to the new location of a relocated repository " "or to remove configuration bits for a now-deleted repository. If you have " "automated processes that publish information from or about your " "repositories, they may need to be updated. Hook scripts might need to be " "reconfigured. Users may need to be notified. The list can go on " "indefinitely, or at least to the extent that you've built processes and " "procedures around your Subversion repository." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:3182 msgid "" "In the case of a copied repository, you should also consider the fact that " "Subversion uses repository UUIDs to distinguish repositories. If you copy a " "Subversion repository using a typical shell recursive copy command, you'll " "wind up with two repositories that are identical in every way—" "including their UUIDs. In some circumstances, this might be desirable. But " "in the instances where it is not, you'll need to generate a new UUID for one " "of these identical repositories. See <xref linkend=\"svn.reposadmin.maint." "uuids\" /> for more about managing repository UUIDs." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:3201 msgid "" "By now you should have a basic understanding of how to create, configure, " "and maintain Subversion repositories. We introduced you to the various " "tools that will assist you with this task. Throughout the chapter, we noted " "common administration pitfalls and offered suggestions for avoiding them." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:3208 msgid "" "All that remains is for you to decide what exciting data to store in your " "repository, and finally, how to make it available over a network. The next " "chapter is all about networking." msgstr "" # type: Content of: <chapter><title> #: ../en/book/ch06-server-configuration.xml:2 msgid "Server Configuration" msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch06-server-configuration.xml:4 msgid "" "A Subversion repository can be accessed simultaneously by clients running on " "the same machine on which the repository resides using the <literal>file://</" "literal> method. But the typical Subversion setup involves a single server " "machine being accessed from clients on computers all over the office—" "or, perhaps, all over the world." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch06-server-configuration.xml:11 msgid "" "This chapter describes how to get your Subversion repository exposed outside " "its host machine for use by remote clients. We will cover Subversion's " "currently available server mechanisms, discussing the configuration and use " "of each. After reading this chapter, you should be able to decide which " "networking setup is right for your needs, as well as understand how to " "enable such a setup on your host computer." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:25 #, fuzzy #| msgid "svnserve" msgid "Overview" msgstr "svnserve" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:27 msgid "" "Subversion was designed with an abstract network layer. This means that a " "repository can be programmatically accessed by any sort of server process, " "and the client <quote>repository access</quote> API allows programmers to " "write plug-ins that speak relevant network protocols. In theory, Subversion " "can use an infinite number of network implementations. In practice, there " "are only two servers at the time of this writing." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:35 msgid "" "Apache is an extremely popular web server; using the <command>mod_dav_svn</" "command> module, Apache can access a repository and make it available to " "clients via the WebDAV/DeltaV protocol, which is an extension of HTTP. " "Because Apache is an extremely extensible server, it provides a number of " "features <quote>for free,</quote> such as encrypted SSL communication, " "logging, integration with a number of third-party authentication systems, " "and limited built-in web browsing of repositories." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:45 msgid "" "In the other corner is <command>svnserve</command>: a small, lightweight " "server program that speaks a custom protocol with clients. Because its " "protocol is explicitly designed for Subversion and is stateful (unlike " "HTTP), it provides significantly faster network operations—but at the " "cost of some features as well. While it can use SASL to provide a variety " "of authentication and encryption options, it has no logging or built-in web " "browsing. It is, however, extremely easy to set up and is often the best " "option for small teams just starting out with Subversion." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:56 msgid "" "A third option is to use <command>svnserve</command> tunneled over an SSH " "connection. Even though this scenario still uses <command>svnserve</" "command>, it differs quite a bit in features from a traditional " "<command>svnserve</command> deployment. SSH is used to encrypt all " "communication. SSH is also used exclusively to authenticate, so real system " "accounts are required on the server host (unlike vanilla <command>svnserve</" "command>, which has its own private user accounts). Finally, because this " "setup requires that each user spawn a private, temporary <command>svnserve</" "command> process, it's equivalent (from a permissions point of view) to " "allowing a group of local users to all access the repository via " "<literal>file://</literal> URLs. Path-based access control has no meaning, " "since each user is accessing the repository database files directly." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:72 msgid "" "<xref linkend=\"svn.serverconfig.overview.tbl-1\"/> provides a quick summary " "of the three typical server deployments." msgstr "" # type: Content of: <chapter><sect1><table><title> #: ../en/book/ch06-server-configuration.xml:76 msgid "Comparison of subversion server options" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:81 #, fuzzy #| msgid "mod_dav_svn" msgid "Apache + mod_dav_svn" msgstr "mod_dav_svn" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:83 #: ../en/book/ch06-server-configuration.xml:244 #, fuzzy #| msgid "svnserve" msgid "svnserve over SSH" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:88 #, fuzzy #| msgid "Authenticating As a Different User" msgid "Authentication options" msgstr "Authentifizierung als ein anderer Anwender" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:89 msgid "" "HTTP(S) basic auth, X.509 certificates, LDAP, NTLM, or any other mechanism " "available to Apache httpd" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:91 msgid "" "CRAM-MD5 by default; LDAP, NTLM, or any other mechanism available to SASL" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:93 msgid "SSH" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:97 msgid "User account options" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:98 msgid "" "Private 'users' file, or other mechanisms available to Apache httpd (LDAP, " "SQL, etc.)" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:100 msgid "" "Private 'users' file, or other mechanisms available to SASL (LDAP, SQL, etc.)" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:102 msgid "System accounts" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:106 msgid "Authorization options" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:107 #: ../en/book/ch06-server-configuration.xml:109 msgid "" "Read/write access can be granted over the whole repository, or specified per " "path" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:111 msgid "Read/write access only grantable over the whole repository" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:116 msgid "Encryption" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:117 msgid "Available via optional SSL" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:118 msgid "Available via optional SASL features" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:119 msgid "Inherent in SSH connection" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:123 msgid "Logging" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:124 msgid "" "Full Apache logs of each HTTP request, with optional <quote>high-level</" "quote> logging of general client operations" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:127 #: ../en/book/ch06-server-configuration.xml:128 msgid "No logging" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:132 msgid "Interoperability" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:133 msgid "Accessible by other WebDAV clients" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:134 #: ../en/book/ch06-server-configuration.xml:135 msgid "Talks only to svn clients" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:139 msgid "Web viewing" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:140 msgid "Limited built-in support, or via third-party tools such as ViewVC" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:142 #: ../en/book/ch06-server-configuration.xml:143 msgid "Only via third-party tools such as ViewVC" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:147 msgid "Master-slave server replication" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:148 msgid "Transparent write-proxying available from slave to master" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:149 #: ../en/book/ch06-server-configuration.xml:150 msgid "Can only create read-only slave servers" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:155 msgid "Speed" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:156 msgid "Somewhat slower" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:157 #: ../en/book/ch06-server-configuration.xml:158 msgid "Somewhat faster" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:162 #: ../en/book/ch06-server-configuration.xml:1261 #, fuzzy #| msgid "Initial Checkout" msgid "Initial setup" msgstr "Anfänglicher Checkout" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:163 msgid "Somewhat complex" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:164 msgid "Extremely simple" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:165 msgid "Moderately simple" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:176 msgid "Choosing a Server Configuration" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:178 msgid "So, which server should you use? Which is best?" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:180 msgid "" "Obviously, there's no right answer to that question. Every team has " "different needs, and the different servers all represent different sets of " "trade-offs. The Subversion project itself doesn't endorse one server or " "another, or consider either server more <quote>official</quote> than another." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:186 msgid "" "Here are some reasons why you might choose one deployment over another, as " "well as reasons you might <emphasis>not</emphasis> choose one." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:192 msgid "The svnserve Server" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:196 #: ../en/book/ch06-server-configuration.xml:248 #: ../en/book/ch06-server-configuration.xml:296 msgid "Why you might want to use it:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:200 msgid "Quick and easy to set up." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:203 msgid "Network protocol is stateful and noticeably faster than WebDAV." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:206 msgid "No need to create system accounts on server." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:209 msgid "Password is not passed over the network." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:217 #: ../en/book/ch06-server-configuration.xml:266 #: ../en/book/ch06-server-configuration.xml:328 msgid "Why you might want to avoid it:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:221 msgid "" "By default, only one authentication method is available, the network " "protocol is not encrypted, and the server stores clear text passwords. (All " "these things can be changed by configuring SASL, but it's a bit more work to " "do.)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:227 msgid "No logging of any kind, not even errors." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:230 msgid "" "No built-in web browsing. (You'd have to install a separate web server and " "repository browsing software to add this.)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:252 msgid "The network protocol is stateful and noticeably faster than WebDAV." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:255 msgid "" "You can take advantage of existing SSH accounts and user infrastructure." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:258 msgid "All network traffic is encrypted." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:270 msgid "Only one choice of authentication method is available." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:273 msgid "There is no logging of any kind, not even errors." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:276 msgid "" "It requires users to be in the same system group, or use a shared SSH key." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:279 msgid "If used improperly, it can lead to file permission problems." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:292 msgid "The Apache HTTP Server" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:300 msgid "" "It allows Subversion to use any of the numerous authentication systems " "already integrated with Apache." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:304 msgid "There is no need to create system accounts on the server." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:307 msgid "Full Apache logging is available." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:309 msgid "Network traffic can be encrypted via SSL." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:312 msgid "HTTP(S) can usually go through corporate firewalls." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:315 msgid "Built-in repository browsing is available via web browser." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:318 msgid "" "The repository can be mounted as a network drive for transparent version " "control (see <xref linkend=\"svn.webdav.autoversioning\"/>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:332 msgid "" "Noticeably slower than <command>svnserve</command>, because HTTP is a " "stateless protocol and requires more network turnarounds." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:337 msgid "Initial setup can be complex." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:349 msgid "Recommendations" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:351 msgid "" "In general, the authors of this book recommend a vanilla <command>svnserve</" "command> installation for small teams just trying to get started with a " "Subversion server; it's the simplest to set up and has the fewest " "maintenance issues. You can always switch to a more complex server " "deployment as your needs change." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:358 msgid "" "Here are some general recommendations and tips, based on years of supporting " "users:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:363 msgid "" "If you're trying to set up the simplest possible server for your group, a " "vanilla <command>svnserve</command> installation is the easiest, fastest " "route. Note, however, that your repository data will be transmitted in the " "clear over the network. If your deployment is entirely within your " "company's LAN or VPN, this isn't an issue. If the repository is exposed to " "the wide-open Internet, you might want to make sure that either the " "repository's contents aren't sensitive (e.g., it contains only open source " "code), or that you go the extra mile in configuring SASL to encrypt network " "communications." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:378 msgid "" "If you need to integrate with existing legacy identity systems (LDAP, Active " "Directory, NTLM, X.509, etc.), you must use either the Apache-based server " "or <command>svnserve</command> configured with SASL. If you absolutely need " "server-side logs of either server errors or client activities, an Apache-" "based server is your only option." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:388 msgid "" "If you've decided to use either Apache or stock <command>svnserve</command>, " "create a single <command>svn</command> user on your system and run the " "server process as that user. Be sure to make the repository directory " "wholly owned by the <command>svn</command> user as well. From a security " "point of view, this keeps the repository data nicely siloed and protected by " "operating system filesystem permissions, changeable by only the Subversion " "server process itself." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:400 msgid "" "If you have an existing infrastructure that is heavily based on SSH " "accounts, and if your users already have system accounts on your server " "machine, it makes sense to deploy an <command>svnserve</command>-over-SSH " "solution. Otherwise, we don't widely recommend this option to the public. " "It's generally considered safer to have your users access the repository via " "(imaginary) accounts managed by <command>svnserve</command> or Apache, " "rather than by full-blown system accounts. If your deep desire for " "encrypted communication still draws you to this option, we recommend using " "Apache with SSL or <command>svnserve</command> with SASL encryption instead." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:415 msgid "" "Do <emphasis>not</emphasis> be seduced by the simple idea of having all of " "your users access a repository directly via <literal>file://</literal> " "URLs. Even if the repository is readily available to everyone via a network " "share, this is a bad idea. It removes any layers of protection between the " "users and the repository: users can accidentally (or intentionally) corrupt " "the repository database, it becomes hard to take the repository offline for " "inspection or upgrade, and it can lead to a mess of file permission problems " "(see <xref linkend=\"svn.serverconfig.multimethod\"/>). Note that this is " "also one of the reasons we warn against accessing repositories via " "<literal>svn+ssh://</literal> URLs—from a security standpoint, it's " "effectively the same as local users accessing via <literal>file://</" "literal>, and it can entail all the same problems if the administrator isn't " "careful." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:443 msgid "svnserve, a Custom Server" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:445 msgid "" "The <command>svnserve</command> program is a lightweight server, capable of " "speaking to clients over TCP/IP using a custom, stateful protocol. Clients " "contact an <command>svnserve</command> server by using URLs that begin with " "the <literal>svn://</literal> or <literal>svn+ssh://</literal> scheme. This " "section will explain the different ways of running <command>svnserve</" "command>, how clients authenticate themselves to the server, and how to " "configure appropriate access control to your repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:457 msgid "Invoking the Server" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:459 #, fuzzy #| msgid "This is a perfect opportunity to use <command>svn revert</command>:" msgid "" "There are a few different ways to run the <command>svnserve</command> " "program:" msgstr "" "Dies ist die perfekte Gelegenheit, <command>svn revert</command> zu benutzen:" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:463 msgid "" "Run <command>svnserve</command> as a standalone daemon, listening for " "requests." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:466 msgid "" "Have the Unix <command>inetd</command> daemon temporarily spawn " "<command>svnserve</command> whenever a request comes in on a certain port." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:469 msgid "" "Have SSH invoke a temporary <command>svnserve</command> over an encrypted " "tunnel." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:472 msgid "Run <command>svnserve</command> as a Microsoft Windows service." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:478 #, fuzzy #| msgid "svnserve" msgid "svnserve as daemon" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:480 msgid "" "The easiest option is to run <command>svnserve</command> as a standalone " "<quote>daemon</quote> process. Use the <option>-d</option> option for this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:484 #, no-wrap msgid "" "\n" "$ svnserve -d\n" "$ # svnserve is now running, listening on port 3690\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:489 msgid "" "When running <command>svnserve</command> in daemon mode, you can use the " "<option>--listen-port=</option> and <option>--listen-host=</option> options " "to customize the exact port and hostname to <quote>bind</quote> to." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:494 msgid "" "Once we successfully start <command>svnserve</command> as explained " "previously, it makes every repository on your system available to the " "network. A client needs to specify an <emphasis>absolute</emphasis> path in " "the repository URL. For example, if a repository is located at <filename>/" "var/svn/project1</filename>, a client would reach it via" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:501 msgid "" ". To increase security, you can pass the <option>-r</option> option to " "<command>svnserve</command>, which restricts it to exporting only " "repositories below that path. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:507 #, no-wrap msgid "" "\n" "$ svnserve -d -r /var/svn\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:512 msgid "" "Using the <option>-r</option> option effectively modifies the location that " "the program treats as the root of the remote filesystem space. Clients then " "use URLs that have that path portion removed from them, leaving much shorter " "(and much less revealing) URLs:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:518 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.example.com:9834/repos\n" #| "…\n" msgid "" "\n" "$ svn checkout svn://host.example.com/project1\n" "…\n" msgstr "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:527 #, fuzzy #| msgid "svnserve" msgid "svnserve via inetd" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:529 msgid "" "If you want <command>inetd</command> to launch the process, you need to pass " "the <option>-i</option> (<option>--inetd</option>) option. In the following " "example, we've shown the output from running <literal>svnserve -i</literal> " "at the command line, but note that this isn't how you actually start the " "daemon; see the paragraphs following the example for how to configure " "<command>inetd</command> to start <command>svnserve</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:539 #, no-wrap msgid "" "\n" "$ svnserve -i\n" "( success ( 1 2 ( ANONYMOUS ) ( edit-pipeline ) ) )\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:544 msgid "" "When invoked with the <option>--inetd</option> option, <command>svnserve</" "command> attempts to speak with a Subversion client via <filename>stdin</" "filename> and <filename>stdout</filename> using a custom protocol. This is " "the standard behavior for a program being run via <command>inetd</command>. " "The IANA has reserved port 3690 for the Subversion protocol, so on a Unix-" "like system you can add lines to <filename>/etc/services</filename> such as " "these (if they don't already exist):" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:554 #, no-wrap msgid "" "\n" "svn 3690/tcp # Subversion\n" "svn 3690/udp # Subversion\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:559 msgid "" "If your system is using a classic Unix-like <command>inetd</command> daemon, " "you can add this line to <filename>/etc/inetd.conf</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:563 #, no-wrap msgid "" "\n" "svn stream tcp nowait svnowner /usr/bin/svnserve svnserve -i\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:567 msgid "" "Make sure <quote>svnowner</quote> is a user that has appropriate permissions " "to access your repositories. Now, when a client connection comes into your " "server on port 3690, <command>inetd</command> will spawn an " "<command>svnserve</command> process to service it. Of course, you may also " "want to add <option>-r</option> to the configuration line as well, to " "restrict which repositories are exported." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:580 msgid "svnserve over a tunnel" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:582 msgid "" "A third way to invoke <command>svnserve</command> is in tunnel mode, using " "the <option>-t</option> option. This mode assumes that a remote-service " "program such as <command>rsh</command> or <command>ssh</command> has " "successfully authenticated a user and is now invoking a private " "<command>svnserve</command> process <emphasis>as that user</emphasis>. " "(Note that you, the user, will rarely, if ever, have reason to invoke " "<command>svnserve</command> with the <option>-t</option> at the command " "line; instead, the SSH daemon does so for you.) The <command>svnserve</" "command> program behaves normally (communicating via <filename>stdin</" "filename> and <filename>stdout</filename>) and assumes that the traffic is " "being automatically redirected over some sort of tunnel back to the client. " "When <command>svnserve</command> is invoked by a tunnel agent like this, be " "sure that the authenticated user has full read and write access to the " "repository database files. It's essentially the same as a local user " "accessing the repository via <literal>file://</literal> URLs." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:603 msgid "" "This option is described in much more detail later in this chapter in <xref " "linkend=\"svn.serverconfig.svnserve.sshauth\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:611 msgid "svnserve as Windows service" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:613 msgid "" "If your Windows system is a descendant of Windows NT (2000, 2003, XP, or " "Vista), you can run <command>svnserve</command> as a standard Windows " "service. This is typically a much nicer experience than running it as a " "standalone daemon with the <option>--daemon (-d)</option> option. Using " "daemon mode requires launching a console, typing a command, and then leaving " "the console window running indefinitely. A Windows service, however, runs " "in the background, can start at boot time automatically, and can be started " "and stopped using the same consistent administration interface as other " "Windows services." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:626 msgid "" "You'll need to define the new service using the command-line tool " "<command>SC.EXE</command>. Much like the <command>inetd</command> " "configuration line, you must specify an exact invocation of " "<command>svnserve</command> for Windows to run at startup time:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:632 #, no-wrap msgid "" "\n" "C:\\> sc create svn\n" " binpath= \"C:\\svn\\bin\\svnserve.exe --service -r C:\\repos\"\n" " displayname= \"Subversion Server\"\n" " depend= Tcpip\n" " start= auto\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:640 msgid "" "This defines a new Windows service named <quote>svn,</quote> which executes " "a particular <command>svnserve.exe</command> command when started (in this " "case, rooted at <filename>C:\\repos</filename>). There are a number of " "caveats in the prior example, however." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:647 msgid "" "First, notice that the <command>svnserve.exe</command> program must always " "be invoked with the <option>--service</option> option. Any other options to " "<command>svnserve</command> must then be specified on the same line, but you " "cannot add conflicting options such as <option>--daemon (-d)</option>, " "<option>--tunnel</option>, or <option>--inetd (-i)</option>. Options such " "as <option>-r</option> or <option>--listen-port</option> are fine, though. " "Second, be careful about spaces when invoking the <command>SC.EXE</command> " "command: the <literal>key= value</literal> patterns must have no spaces " "between <literal>key=</literal> and must have exactly one space before the " "<literal>value</literal>. Lastly, be careful about spaces in your command " "line to be invoked. If a directory name contains spaces (or other " "characters that need escaping), place the entire inner value of " "<literal>binpath</literal> in double quotes, by escaping them:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:666 #, no-wrap msgid "" "\n" "C:\\> sc create svn\n" " binpath= \"\\\"C:\\program files\\svn\\bin\\svnserve.exe\\\" --service -r C:\\repos\"\n" " displayname= \"Subversion Server\"\n" " depend= Tcpip\n" " start= auto\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:674 msgid "" "Also note that the word <literal>binpath</literal> is misleading—its " "value is a <emphasis>command line</emphasis>, not the path to an " "executable. That's why you need to surround it with quotes if it contains " "embedded spaces." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:680 msgid "" "Once the service is defined, it can be stopped, started, or queried using " "standard GUI tools (the Services administrative control panel), or at the " "command line:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:685 #, no-wrap msgid "" "\n" "C:\\> net stop svn\n" "C:\\> net start svn\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:690 msgid "" "The service can also be uninstalled (i.e., undefined) by deleting its " "definition: <userinput>sc delete svn</userinput>. Just be sure to stop the " "service first! The <command>SC.EXE</command> program has many other " "subcommands and options; run <userinput>sc /?</userinput> to learn more " "about it." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:703 msgid "Built-in Authentication and Authorization" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:705 msgid "" "When a client connects to an <command>svnserve</command> process, the " "following things happen:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:709 msgid "The client selects a specific repository." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:712 msgid "" "The server processes the repository's <filename>conf/svnserve.conf</" "filename> file and begins to enforce any authentication and authorization " "policies it describes." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:717 msgid "Depending on the defined policies, one of the following may occur:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:721 msgid "" "The client may be allowed to make requests anonymously, without ever " "receiving an authentication challenge." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:725 msgid "The client may be challenged for authentication at any time." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:728 msgid "" "If operating in tunnel mode, the client will declare itself to be already " "externally authenticated (typically by SSH)." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch06-server-configuration.xml:736 msgid "" "The <command>svnserve</command> server, by default, knows only how to send a " "CRAM-MD5 <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:739 msgid "See RFC 2195." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:740 msgid "" "</footnote> authentication challenge. In essence, the server sends a small " "amount of data to the client. The client uses the MD5 hash algorithm to " "create a fingerprint of the data and password combined, and then sends the " "fingerprint as a response. The server performs the same computation with " "the stored password to verify that the result is identical. <emphasis>At no " "point does the actual password travel over the network.</emphasis>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:750 msgid "" "If your <command>svnserve</command> server was built with SASL support, it " "not only knows how to send CRAM-MD5 challenges, but also likely knows a " "whole host of other authentication mechanisms. See <xref linkend=\"svn." "serverconfig.svnserve.sasl\"/> later in this chapter to learn how to " "configure SASL authentication and encryption." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:758 msgid "" "It's also possible, of course, for the client to be externally authenticated " "via a tunnel agent, such as <command>ssh</command>. In that case, the " "server simply examines the user it's running as, and uses this name as the " "authenticated username. For more on this, see the later section, <xref " "linkend=\"svn.serverconfig.svnserve.sshauth\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:766 msgid "" "As you've already guessed, a repository's <filename>svnserve.conf</filename> " "file is the central mechanism for controlling authentication and " "authorization policies. The file has the same format as other configuration " "files (see <xref linkend=\"svn.advanced.confarea\"/>): section names are " "marked by square brackets (<literal>[</literal> and <literal>]</literal>), " "comments begin with hashes (<literal>#</literal>), and each section contains " "specific variables that can be set (<literal>variable = value</literal>). " "Let's walk through these files and learn how to use them." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:780 msgid "Create a users file and realm" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:782 msgid "" "For now, the <literal>[general]</literal> section of <filename>svnserve." "conf</filename> has all the variables you need. Begin by changing the " "values of those variables: choose a name for a file that will contain your " "usernames and passwords and choose an authentication realm:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:788 #, no-wrap msgid "" "\n" "[general]\n" "password-db = userfile\n" "realm = example realm\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:794 msgid "" "The <literal>realm</literal> is a name that you define. It tells clients " "which sort of <quote>authentication namespace</quote> they're connecting to; " "the Subversion client displays it in the authentication prompt and uses it " "as a key (along with the server's hostname and port) for caching credentials " "on disk (see <xref linkend=\"svn.serverconfig.netmodel.credcache\"/>). The " "<literal>password-db</literal> variable points to a separate file that " "contains a list of usernames and passwords, using the same familiar format. " "For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:805 #, no-wrap msgid "" "\n" "[users]\n" "harry = foopassword\n" "sally = barpassword\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:811 msgid "" "The value of <literal>password-db</literal> can be an absolute or relative " "path to the users file. For many admins, it's easy to keep the file right " "in the <filename>conf/</filename> area of the repository, alongside " "<filename>svnserve.conf</filename>. On the other hand, it's possible you " "may want to have two or more repositories share the same users file; in that " "case, the file should probably live in a more public place. The " "repositories sharing the users file should also be configured to have the " "same realm, since the list of users essentially defines an authentication " "realm. Wherever the file lives, be sure to set the file's read and write " "permissions appropriately. If you know which user(s) <command>svnserve</" "command> will run as, restrict read access to the users file as necessary." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:830 msgid "Set access controls" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:832 msgid "" "There are two more variables to set in the <filename>svnserve.conf</" "filename> file: they determine what unauthenticated (anonymous) and " "authenticated users are allowed to do. The variables <literal>anon-access</" "literal> and <literal>auth-access</literal> can be set to the value " "<literal>none</literal>, <literal>read</literal>, or <literal>write</" "literal>. Setting the value to <literal>none</literal> prohibits both " "reading and writing; <literal>read</literal> allows read-only access to the " "repository, and <literal>write</literal> allows complete read/write access " "to the repository. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:844 #, no-wrap msgid "" "\n" "[general]\n" "password-db = userfile\n" "realm = example realm\n" "\n" "# anonymous users can only read the repository\n" "anon-access = read\n" "\n" "# authenticated users can both read and write\n" "auth-access = write\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:856 msgid "" "The example settings are, in fact, the default values of the variables, " "should you forget to define them. If you want to be even more conservative, " "you can block anonymous access completely:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:861 #, no-wrap msgid "" "\n" "[general]\n" "password-db = userfile\n" "realm = example realm\n" "\n" "# anonymous users aren't allowed\n" "anon-access = none\n" "\n" "# authenticated users can both read and write\n" "auth-access = write\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:873 msgid "" "The server process understands not only these <quote>blanket</quote> access " "controls to the repository, but also finer-grained access restrictions " "placed on specific files and directories within the repository. To make use " "of this feature, you need to define a file containing more detailed rules, " "and then set the <literal>authz-db</literal> variable to point to it:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:881 #, no-wrap msgid "" "\n" "[general]\n" "password-db = userfile\n" "realm = example realm\n" "\n" "# Specific access rules for specific locations\n" "authz-db = authzfile\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:890 msgid "" "We discuss the syntax of the <filename>authzfile</filename> file in detail " "later in this chapter, in <xref linkend=\"svn.serverconfig.pathbasedauthz\"/" ">. Note that the <literal>authz-db</literal> variable isn't mutually " "exclusive with the <literal>anon-access</literal> and <literal>auth-access</" "literal> variables; if all the variables are defined at once, <emphasis>all</" "emphasis> of the rules must be satisfied before access is allowed." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:904 #, fuzzy #| msgid "<command>svn revert</command>" msgid "Using <command>svnserve</command> with SASL" msgstr "<command>svn revert</command>" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:906 msgid "" "For many teams, the built-in CRAM-MD5 authentication is all they need from " "<command>svnserve</command>. However, if your server (and your Subversion " "clients) were built with the Cyrus Simple Authentication and Security Layer " "(SASL) library, you have a number of authentication and encryption options " "available to you." msgstr "" # type: Content of: <preface><sect1><title> #: ../en/book/ch06-server-configuration.xml:914 #, fuzzy #| msgid "What Is Subversion?" msgid "What Is SASL?" msgstr "Was ist Subversion?" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch06-server-configuration.xml:915 msgid "" "The Cyrus Simple Authentication and Security Layer is open source software " "written by Carnegie Mellon University. It adds generic authentication and " "encryption capabilities to any network protocol, and as of Subversion 1.5 " "and later, both the <command>svnserve</command> server and <command>svn</" "command> client know how to make use of this library. It may or may not be " "available to you: if you're building Subversion yourself, you'll need to " "have at least version 2.1 of SASL installed on your system, and you'll need " "to make sure that it's detected during Subversion's build process. If " "you're using a prebuilt Subversion binary package, you'll have to check with " "the package maintainer as to whether SASL support was compiled in. SASL " "comes with a number of pluggable modules that represent different " "authentication systems: Kerberos (GSSAPI), NTLM, One-Time-Passwords (OTP), " "DIGEST-MD5, LDAP, Secure-Remote-Password (SRP), and others. Certain " "mechanisms may or may not be available to you; be sure to check which " "modules are provided." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch06-server-configuration.xml:935 msgid "" "You can download Cyrus SASL (both code and documentation) from <ulink url=" "\"http://asg.web.cmu.edu/sasl/sasl-library.html\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:940 msgid "" "Normally, when a subversion client connects to <command>svnserve</command>, " "the server sends a greeting that advertises a list of the capabilities it " "supports, and the client responds with a similar list of capabilities. If " "the server is configured to require authentication, it then sends a " "challenge that lists the authentication mechanisms available; the client " "responds by choosing one of the mechanisms, and then authentication is " "carried out in some number of round-trip messages. Even when SASL " "capabilities aren't present, the client and server inherently know how to " "use the CRAM-MD5 and ANONYMOUS mechanisms (see <xref linkend=\"svn." "serverconfig.svnserve.auth\"/>). If server and client were linked against " "SASL, a number of other authentication mechanisms may also be available. " "However, you'll need to explicitly configure SASL on the server side to " "advertise them." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:958 #, fuzzy #| msgid "Authenticating As a Different User" msgid "Authenticating with SASL" msgstr "Authentifizierung als ein anderer Anwender" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:960 msgid "" "To activate specific SASL mechanisms on the server, you'll need to do two " "things. First, create a <literal>[sasl]</literal> section in your " "repository's <filename>svnserve.conf</filename> file with an initial key-" "value pair:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><programlisting> #: ../en/book/ch06-server-configuration.xml:966 #, no-wrap msgid "" "\n" " [sasl]\n" " use-sasl = true\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:971 msgid "" "Second, create a main SASL configuration file called <filename>svn.conf</" "filename> in a place where the SASL library can find it—typically in " "the directory where SASL plug-ins are located. You'll have to locate the " "plug-in directory on your particular system, such as <filename>/usr/lib/" "sasl2/</filename> or <filename>/etc/sasl2/</filename>. (Note that this is " "<emphasis>not</emphasis> the <filename>svnserve.conf</filename> file that " "lives within a repository!)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:982 msgid "" "On a Windows server, you'll also have to edit the system registry (using a " "tool such as <command>regedit</command>) to tell SASL where to find " "things. Create a registry key named <literal>[HKEY_LOCAL_MACHINE\\SOFTWARE" "\\Carnegie Mellon\\Project Cyrus\\SASL Library]</literal>, and place two " "keys inside it: a key called <literal>SearchPath</literal> (whose value is a " "path to the directory containing the SASL <filename>sasl*.dll</filename> " "plug-in libraries), and a key called <literal>ConfFile</literal> (whose " "value is a path to the parent directory containing the <filename>svn.conf</" "filename> file you created)." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:995 msgid "" "Because SASL provides so many different kinds of authentication mechanisms, " "it would be foolish (and far beyond the scope of this book) to try to " "describe every possible server-side configuration. Instead, we recommend " "that you read the documentation supplied in the <filename>doc/</filename> " "subdirectory of the SASL source code. It goes into great detail about every " "mechanism and how to configure the server appropriately for each. For the " "purposes of this discussion, we'll just demonstrate a simple example of " "configuring the DIGEST-MD5 mechanism. For example, if your " "<filename>subversion.conf</filename> (or <filename>svn.conf</filename>) file " "contains the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1009 #, no-wrap msgid "" "\n" "pwcheck_method: auxprop\n" "auxprop_plugin: sasldb\n" "sasldb_path: /etc/my_sasldb\n" "mech_list: DIGEST-MD5\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1016 msgid "" "you've told SASL to advertise the DIGEST-MD5 mechanism to clients and to " "check user passwords against a private password database located at " "<filename>/etc/my_sasldb</filename>. A system administrator can then use " "the <command>saslpasswd2</command> program to add or modify usernames and " "passwords in the database:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1024 #, no-wrap msgid "" "\n" "$ saslpasswd2 -c -f /etc/my_sasldb -u realm username\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1028 msgid "" "A few words of warning: first, make sure the <quote>realm</quote> argument " "to <command>saslpasswd2</command> matches the same realm you've defined in " "your repository's <filename>svnserve.conf</filename> file; if they don't " "match, authentication will fail. Also, due to a shortcoming in SASL, the " "common realm must be a string with no space characters. Finally, if you " "decide to go with the standard SASL password database, make sure the " "<command>svnserve</command> program has read access to the file (and " "possibly write access as well, if you're using a mechanism such as OTP)." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1041 msgid "" "This is just one simple way of configuring SASL. Many other authentication " "mechanisms are available, and passwords can be stored in other places such " "as in LDAP or a SQL database. Consult the full SASL documentation for " "details." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1047 msgid "" "Remember that if you configure your server to only allow certain SASL " "authentication mechanisms, this forces all connecting clients to have SASL " "support as well. Any Subversion client built without SASL support (which " "includes all pre-1.5 clients) will be unable to authenticate. On the one " "hand, this sort of restriction may be exactly what you want (<quote>My " "clients must all use Kerberos!</quote>). However, if you still want non-" "SASL clients to be able to authenticate, be sure to advertise the CRAM-MD5 " "mechanism as an option. All clients are able to use CRAM-MD5, whether they " "have SASL capabilities or not." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:1062 msgid "SASL encryption" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1064 msgid "" "SASL is also able to perform data encryption if a particular mechanism " "supports it. The built-in CRAM-MD5 mechanism doesn't support encryption, " "but DIGEST-MD5 does, and mechanisms such as SRP actually require use of the " "OpenSSL library. To enable or disable different levels of encryption, you " "can set two values in your repository's <filename>svnserve.conf</filename> " "file:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1072 #, no-wrap msgid "" "\n" "[sasl]\n" "use-sasl = true\n" "min-encryption = 128\n" "max-encryption = 256\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1079 msgid "" "The <literal>min-encryption</literal> and <literal>max-encryption</literal> " "variables control the level of encryption demanded by the server. To " "disable encryption completely, set both values to 0. To enable simple " "checksumming of data (i.e., prevent tampering and guarantee data integrity " "without encryption), set both values to 1. If you wish to allow—but " "not require—encryption, set the minimum value to 0, and the maximum " "value to some bit length. To require encryption unconditionally, set both " "values to numbers greater than 1. In our previous example, we require " "clients to do at least 128-bit encryption, but no more than 256-bit " "encryption." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1099 msgid "Tunneling over SSH" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1101 msgid "" "<command>svnserve</command>'s built-in authentication (and SASL support) can " "be very handy, because it avoids the need to create real system accounts. " "On the other hand, some administrators already have well-established SSH " "authentication frameworks in place. In these situations, all of the " "project's users already have system accounts and the ability to <quote>SSH " "into</quote> the server machine." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1109 msgid "" "It's easy to use SSH in conjunction with <command>svnserve</command>. The " "client simply uses the <literal>svn+ssh://</literal> URL scheme to connect:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1113 #, no-wrap msgid "" "\n" "$ whoami\n" "harry\n" "\n" "$ svn list svn+ssh://host.example.com/repos/project\n" "harry@host.example.com's password: *****\n" "\n" "foo\n" "bar\n" "baz\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1126 msgid "" "In this example, the Subversion client is invoking a local <command>ssh</" "command> process, connecting to <literal>host.example.com</literal>, " "authenticating as the user <literal>harry</literal>, then spawning a private " "<command>svnserve</command> process on the remote machine running as the " "user <literal>harry</literal>. The <command>svnserve</command> command is " "being invoked in tunnel mode (<option>-t</option>), and its network protocol " "is being <quote>tunneled</quote> over the encrypted connection by " "<command>ssh</command>, the tunnel agent. <command>svnserve</command> is " "aware that it's running as the user <literal>harry</literal>, and if the " "client performs a commit, the authenticated username will be used as the " "author of the new revision." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1141 msgid "" "The important thing to understand here is that the Subversion client is " "<emphasis>not</emphasis> connecting to a running <command>svnserve</command> " "daemon. This method of access doesn't require a daemon, nor does it notice " "one if present. It relies wholly on the ability of <command>ssh</command> " "to spawn a temporary <command>svnserve</command> process, which then " "terminates when the network connection is closed." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1150 msgid "" "When using <literal>svn+ssh://</literal> URLs to access a repository, " "remember that it's the <command>ssh</command> program prompting for " "authentication, and <emphasis>not</emphasis> the <command>svn</command> " "client program. That means there's no automatic password-caching going on " "(see <xref linkend=\"svn.serverconfig.netmodel.credcache\"/>). The " "Subversion client often makes multiple connections to the repository, though " "users don't normally notice this due to the password caching feature. When " "using <literal>svn+ssh://</literal> URLs, however, users may be annoyed by " "<command>ssh</command> repeatedly asking for a password for every outbound " "connection. The solution is to use a separate SSH password-caching tool " "such as <command>ssh-agent</command> on a Unix-like system, or " "<command>pageant</command> on Windows." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch06-server-configuration.xml:1166 msgid "" "When running over a tunnel, authorization is primarily controlled by " "operating system permissions to the repository's database files; it's very " "much the same as if Harry were accessing the repository directly via a " "<literal>file://</literal> URL. If multiple system users are going to be " "accessing the repository directly, you may want to place them into a common " "group, and you'll need to be careful about umasks (be sure to read <xref " "linkend=\"svn.serverconfig.multimethod\"/> later in this chapter). But even " "in the case of tunneling, you can still use the <filename>svnserve.conf</" "filename> file to block access, by simply setting <literal>auth-access = " "read</literal> or <literal>auth-access = none</literal>. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:1180 msgid "" "Note that using any sort of <command>svnserve</command>-enforced access " "control at all is a bit pointless; the user already has direct access to the " "repository database." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch06-server-configuration.xml:1187 msgid "" "You'd think that the story of SSH tunneling would end here, but it doesn't. " "Subversion allows you to create custom tunnel behaviors in your runtime " "<filename>config</filename> file (see <xref linkend=\"svn.advanced.confarea" "\"/>.) For example, suppose you want to use RSH instead of SSH. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:1193 msgid "" "We don't actually recommend this, since RSH is notably less secure than SSH." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1195 msgid "" "</footnote> In the <literal>[tunnels]</literal> section of your " "<filename>config</filename> file, simply define it like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1200 #, no-wrap msgid "" "\n" "[tunnels]\n" "rsh = rsh\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1205 msgid "" "And now, you can use this new tunnel definition by using a URL scheme that " "matches the name of your new variable: <literal>svn+rsh://host/path</" "literal>. When using the new URL scheme, the Subversion client will " "actually be running the command <userinput>rsh host svnserve -t</userinput> " "behind the scenes. If you include a username in the URL (e.g., <literal>svn" "+rsh://username@host/path</literal>), the client will also include that in " "its command (<userinput>rsh username@host svnserve -t</userinput>). But you " "can define new tunneling schemes to be much more clever than that:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1216 #, no-wrap msgid "" "\n" "[tunnels]\n" "joessh = $JOESSH /opt/alternate/ssh -p 29934\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1221 msgid "" "This example demonstrates a couple of things. First, it shows how to make " "the Subversion client launch a very specific tunneling binary (the one " "located at <filename>/opt/alternate/ssh</filename>) with specific options. " "In this case, accessing an <literal>svn+joessh://</literal> URL would invoke " "the particular SSH binary with <option>-p 29934</option> as arguments—" "useful if you want the tunnel program to connect to a nonstandard port." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1231 msgid "" "Second, it shows how to define a custom environment variable that can " "override the name of the tunneling program. Setting the <literal>SVN_SSH</" "literal> environment variable is a convenient way to override the default " "SSH tunnel agent. But if you need to have several different overrides for " "different servers, each perhaps contacting a different port or passing a " "different set of options to SSH, you can use the mechanism demonstrated in " "this example. Now if we were to set the <literal>JOESSH</literal> " "environment variable, its value would override the entire value of the " "tunnel variable—<command>$JOESSH</command> would be executed instead " "of <userinput>/opt/alternate/ssh -p 29934</userinput>." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1249 msgid "SSH configuration tricks" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1251 msgid "" "It's possible to control not only the way in which the client invokes " "<command>ssh</command>, but also to control the behavior of <command>sshd</" "command> on your server machine. In this section, we'll show how to control " "the exact <command>svnserve</command> command executed by <command>sshd</" "command>, as well as how to have multiple users share a single system " "account." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1263 msgid "" "To begin, locate the home directory of the account you'll be using to launch " "<command>svnserve</command>. Make sure the account has an SSH public/" "private keypair installed, and that the user can log in via public-key " "authentication. Password authentication will not work, since all of the " "following SSH tricks revolve around using the SSH <filename>authorized_keys</" "filename> file." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1271 msgid "" "If it doesn't already exist, create the <filename>authorized_keys</filename> " "file (on Unix, typically <filename>~/.ssh/authorized_keys</filename>). Each " "line in this file describes a public key that is allowed to connect. The " "lines are typically of the form:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1278 #, no-wrap msgid "" "\n" " ssh-dsa AAAABtce9euch… user@example.com\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1282 msgid "" "The first field describes the type of key, the second field is the base64-" "encoded key itself, and the third field is a comment. However, it's a " "lesser known fact that the entire line can be preceded by a " "<literal>command</literal> field:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1288 #, no-wrap msgid "" "\n" " command=\"program\" ssh-dsa AAAABtce9euch… user@example.com\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1292 msgid "" "When the <literal>command</literal> field is set, the SSH daemon will run " "the named program instead of the typical tunnel-mode <command>svnserve</" "command> invocation that the Subversion client asks for. This opens the " "door to a number of server-side tricks. In the following examples, we " "abbreviate the lines of the file as:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1299 #, no-wrap msgid "" "\n" " command=\"program\" TYPE KEY COMMENT\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:1307 msgid "Controlling the invoked command" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1309 msgid "" "Because we can specify the executed server-side command, it's easy to name a " "specific <command>svnserve</command> binary to run and to pass it extra " "arguments:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1313 #, no-wrap msgid "" "\n" " command=\"/path/to/svnserve -t -r /virtual/root\" TYPE KEY COMMENT\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1317 msgid "" "In this example, <filename>/path/to/svnserve</filename> might be a custom " "wrapper script around <command>svnserve</command> which sets the umask (see " "<xref linkend=\"svn.serverconfig.multimethod\"/>.) It also shows how to " "anchor <command>svnserve</command> in a virtual root directory, just as one " "often does when running <command>svnserve</command> as a daemon process. " "This might be done either to restrict access to parts of the system, or " "simply to relieve the user of having to type an absolute path in the " "<literal>svn+ssh://</literal> URL." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1329 msgid "" "It's also possible to have multiple users share a single account. Instead " "of creating a separate system account for each user, generate a public/" "private key pair for each person. Then place each public key into the " "<filename>authorized_users</filename> file, one per line, and use the " "<option>--tunnel-user</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1337 #, no-wrap msgid "" "\n" " command=\"svnserve -t --tunnel-user=harry\" TYPE1 KEY1 harry@example.com\n" " command=\"svnserve -t --tunnel-user=sally\" TYPE2 KEY2 sally@example.com\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1342 msgid "" "This example allows both Harry and Sally to connect to the same account via " "public key authentication. Each of them has a custom command that will be " "executed; the <option>--tunnel-user</option> option tells <command>svnserve</" "command> to assume that the named argument is the authenticated user. " "Without <option>--tunnel-user</option>, it would appear as though all " "commits were coming from the one shared system account." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1352 msgid "" "A final word of caution: giving a user access to the server via public-key " "in a shared account might still allow other forms of SSH access, even if " "you've set the <literal>command</literal> value in " "<filename>authorized_keys</filename>. For example, the user may still get " "shell access through SSH or be able to perform X11 or general port " "forwarding through your server. To give the user as little permission as " "possible, you may want to specify a number of restrictive options " "immediately after the <literal>command</literal>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1363 #, no-wrap msgid "" "\n" " command=\"svnserve -t --tunnel-user=harry\",no-port-forwarding,no-agent-forw\n" "arding,no-X11-forwarding,no-pty TYPE1 KEY1 harry@example.com\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1368 msgid "" "Note that this all must be on one line—truly on one line—since " "SSH <filename>authorized_keys</filename> files do not even allow the " "conventional backslash character (<literal>\\</literal>) for line " "continuation. The only reason we've formatted it with a line break is to " "fit it on the physical page of a book." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:1387 msgid "httpd, the Apache HTTP Server" msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch06-server-configuration.xml:1389 msgid "" "The Apache HTTP Server is a <quote>heavy-duty</quote> network server that " "Subversion can leverage. Via a custom module, <command>httpd</command> " "makes Subversion repositories available to clients via the WebDAV/DeltaV " "protocol, which is an extension to HTTP 1.1 (see <ulink url=\"http://www." "webdav.org/\"/> for more information). This protocol takes the ubiquitous " "HTTP protocol that is the core of the World Wide Web, and adds writing—" "specifically, versioned writing—capabilities. The result is a " "standardized, robust system that is conveniently packaged as part of the " "Apache 2.0 software, supported by numerous operating systems and third-party " "products, and doesn't require network administrators to open up yet another " "custom port. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:1403 msgid "They really hate doing that." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:1404 msgid "" "</footnote> While an Apache-Subversion server has more features than " "<command>svnserve</command>, it's also a bit more difficult to set up. With " "flexibility often comes more complexity." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:1409 msgid "" "Much of the following discussion includes references to Apache configuration " "directives. While some examples are given of the use of these directives, " "describing them in full is outside the scope of this chapter. The Apache " "team maintains excellent documentation, publicly available on their web site " "at <ulink url=\"http://httpd.apache.org\"/>. For example, a general " "reference for the configuration directives is located at <ulink url=\" " "http://httpd.apache.org/docs-2.0/mod/directives.html\"/>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:1419 msgid "" "Also, as you make changes to your Apache setup, it is likely that somewhere " "along the way a mistake will be made. If you are not already familiar with " "Apache's logging subsystem, you should become aware of it. In your " "<filename>httpd.conf</filename> file are directives that specify the on-disk " "locations of the access and error logs generated by Apache (the " "<literal>CustomLog</literal> and <literal>ErrorLog</literal> directives, " "respectively). Subversion's <command>mod_dav_svn</command> uses Apache's " "error logging interface as well. You can always browse the contents of " "those files for information that might reveal the source of a problem that " "is not clearly noticeable otherwise." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch06-server-configuration.xml:1433 msgid "Why Apache 2?" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:1435 msgid "" "If you're a system administrator, it's very likely that you're already " "running the Apache web server and have some prior experience with it. At " "the time of this writing, Apache 1.3 is the more popular version of Apache. " "The world has been somewhat slow to upgrade to the Apache 2.x series for " "various reasons: some people fear change, especially changing something as " "critical as a web server. Other people depend on plug-in modules that work " "only against the Apache 1.3 API, and they are waiting for a 2.x port. " "Whatever the reason, many people begin to worry when they first discover " "that Subversion's Apache module is written specifically for the Apache 2 API." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:1448 msgid "" "The proper response to this problem is: don't worry about it. It's easy to " "run Apache 1.3 and Apache 2 side by side; simply install them to separate " "places and use Apache 2 as a dedicated Subversion server that runs on a port " "other than 80. Clients can access the repository by placing the port number " "into the URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1455 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.example.com:9834/repos\n" #| "…\n" msgid "" "\n" "$ svn checkout http://host.example.com:7382/repos/project\n" msgstr "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1463 msgid "Prerequisites" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1465 msgid "" "To network your repository over HTTP, you basically need four components, " "available in two packages. You'll need Apache <command>httpd</command> 2.0, " "the <command>mod_dav</command> DAV module that comes with it, Subversion, " "and the <command>mod_dav_svn</command> filesystem provider module " "distributed with Subversion. Once you have all of those components, the " "process of networking your repository is as simple as:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1476 msgid "" "Getting httpd 2.0 up and running with the <command>mod_dav</command> module" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1480 msgid "" "Installing the <command>mod_dav_svn</command> backend to <command>mod_dav</" "command>, which uses Subversion's libraries to access the repository" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1485 msgid "" "Configuring your <filename>httpd.conf</filename> file to export (or expose) " "the repository" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1490 msgid "" "You can accomplish the first two items either by compiling <command>httpd</" "command> and Subversion from source code or by installing prebuilt binary " "packages of them on your system. For the most up-to-date information on how " "to compile Subversion for use with the Apache HTTP Server, as well as how to " "compile and configure Apache itself for this purpose, see the " "<filename>INSTALL</filename> file in the top level of the Subversion source " "code tree." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1503 msgid "Basic Apache Configuration" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1505 msgid "" "Once you have all the necessary components installed on your system, all " "that remains is the configuration of Apache via its <filename>httpd.conf</" "filename> file. Instruct Apache to load the <command>mod_dav_svn</command> " "module using the <literal>LoadModule</literal> directive. This directive " "must precede any other Subversion-related configuration items. If your " "Apache was installed using the default layout, your <command>mod_dav_svn</" "command> module should have been installed in the <filename>modules</" "filename> subdirectory of the Apache install location (often <filename>/usr/" "local/apache2</filename>). The <literal>LoadModule</literal> directive has " "a simple syntax, mapping a named module to the location of a shared library " "on disk:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1520 #, no-wrap msgid "" "\n" "LoadModule dav_svn_module modules/mod_dav_svn.so\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1524 msgid "" "Note that if <command>mod_dav</command> was compiled as a shared object " "(instead of statically linked directly to the <command>httpd</command> " "binary), you'll need a similar <literal>LoadModule</literal> statement for " "it, too. Be sure that it comes before the <command>mod_dav_svn</command> " "line:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1530 #, no-wrap msgid "" "\n" "LoadModule dav_module modules/mod_dav.so\n" "LoadModule dav_svn_module modules/mod_dav_svn.so\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1536 msgid "" "At a later location in your configuration file, you now need to tell Apache " "where you keep your Subversion repository (or repositories). The " "<literal>Location</literal> directive has an XML-like notation, starting " "with an opening tag and ending with a closing tag, with various other " "configuration directives in the middle. The purpose of the " "<literal>Location</literal> directive is to instruct Apache to do something " "special when handling requests that are directed at a given URL or one of " "its children. In the case of Subversion, you want Apache to simply hand off " "support for URLs that point at versioned resources to the DAV layer. You " "can instruct Apache to delegate the handling of all URLs whose path portions " "(the part of the URL that follows the server's name and the optional port " "number) begin with <filename>/repos/</filename> to a DAV provider whose " "repository is located at <filename>/var/svn/repository</filename> using the " "following <filename>httpd.conf</filename> syntax:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1555 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNPath /var/svn/repository\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1562 msgid "" "If you plan to support multiple Subversion repositories that will reside in " "the same parent directory on your local disk, you can use an alternative " "directive—<literal>SVNParentPath</literal>—to indicate that " "common parent directory. For example, if you know you will be creating " "multiple Subversion repositories in a directory <filename>/var/svn</" "filename> that would be accessed via URLs such as" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1570 msgid "," msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1571 msgid "" ", and so on, you could use the <filename>httpd.conf</filename> configuration " "syntax in the following example:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1575 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" "\n" " # any \"/svn/foo\" URL will map to a repository /var/svn/foo\n" " SVNParentPath /var/svn\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1584 msgid "" "Using the previous syntax, Apache will delegate the handling of all URLs " "whose path portions begin with <filename>/svn/</filename> to the Subversion " "DAV provider, which will then assume that any items in the directory " "specified by the <literal>SVNParentPath</literal> directive are actually " "Subversion repositories. This is a particularly convenient syntax in that, " "unlike the use of the <literal>SVNPath</literal> directive, you don't have " "to restart Apache to create and network new repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1594 msgid "" "Be sure that when you define your new <literal>Location</literal>, it " "doesn't overlap with other exported locations. For example, if your main " "<literal>DocumentRoot</literal> is exported to <filename>/www</filename>, do " "not export a Subversion repository in <literal><Location /www/repos></" "literal>. If a request comes in for the URI <filename>/www/repos/foo.c</" "filename>, Apache won't know whether to look for a file <filename>repos/foo." "c</filename> in the <literal>DocumentRoot</literal>, or whether to delegate " "<command>mod_dav_svn</command> to return <filename>foo.c</filename> from the " "Subversion repository. The result is often an error from the server of the " "form <literal>301 Moved Permanently</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch06-server-configuration.xml:1610 msgid "Server Names and the COPY Request" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch06-server-configuration.xml:1612 msgid "" "Subversion makes use of the <literal>COPY</literal> request type to perform " "server-side copies of files and directories. As part of the sanity checking " "done by the Apache modules, the source of the copy is expected to be located " "on the same machine as the destination of the copy. To satisfy this " "requirement, you might need to tell <command>mod_dav</command> the name you " "use as the hostname of your server. Generally, you can use the " "<literal>ServerName</literal> directive in <filename>httpd.conf</filename> " "to accomplish this." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch06-server-configuration.xml:1623 #, no-wrap msgid "" "\n" "ServerName svn.example.com\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch06-server-configuration.xml:1627 msgid "" "If you are using Apache's virtual hosting support via the " "<literal>NameVirtualHost</literal> directive, you may need to use the " "<literal>ServerAlias</literal> directive to specify additional names by " "which your server is known. Again, refer to the Apache documentation for " "full details." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1635 msgid "" "At this stage, you should strongly consider the question of permissions. If " "you've been running Apache for some time now as your regular web server, you " "probably already have a collection of content—web pages, scripts, and " "such. These items have already been configured with a set of permissions " "that allows them to work with Apache, or more appropriately, that allows " "Apache to work with those files. Apache, when used as a Subversion server, " "will also need the correct permissions to read and write to your Subversion " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1646 msgid "" "You will need to determine a permission system setup that satisfies " "Subversion's requirements without messing up any previously existing web " "page or script installations. This might mean changing the permissions on " "your Subversion repository to match those in use by other things that Apache " "serves for you, or it could mean using the <literal>User</literal> and " "<literal>Group</literal> directives in <filename>httpd.conf</filename> to " "specify that Apache should run as the user and group that owns your " "Subversion repository. There is no single correct way to set up your " "permissions, and each administrator will have different reasons for doing " "things a certain way. Just be aware that permission-related problems are " "perhaps the most common oversight when configuring a Subversion repository " "for use with Apache." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1666 #, fuzzy #| msgid "Authenticating As a Different User" msgid "Authentication Options" msgstr "Authentifizierung als ein anderer Anwender" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1668 msgid "" "At this point, if you configured <filename>httpd.conf</filename> to contain " "something such as the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1672 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1679 msgid "" "your repository is <quote>anonymously</quote> accessible to the world. " "Until you configure some authentication and authorization policies, the " "Subversion repositories that you make available via the <literal>Location</" "literal> directive will be generally accessible to everyone. In other words:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1688 msgid "" "Anyone can use a Subversion client to check out a working copy of a " "repository URL (or any of its subdirectories)." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1693 msgid "" "Anyone can interactively browse the repository's latest revision simply by " "pointing a web browser to the repository URL." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1698 msgid "Anyone can commit to the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1702 msgid "" "Of course, you might have already set up a <filename>pre-commit</filename> " "hook script to prevent commits (see <xref linkend=\"svn.reposadmin.create." "hooks\"/>). But as you read on, you'll see that it's also possible to use " "Apache's built-in methods to restrict access in specific ways." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:1711 msgid "Setting up HTTP authentication" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1713 msgid "" "The easiest way to authenticate a client is via the HTTP Basic " "authentication mechanism, which simply uses a username and password to " "verify that a user is who she says she is. Apache provides an " "<command>htpasswd</command> utility for managing the list of acceptable " "usernames and passwords. Let's grant commit access to Sally and Harry. " "First, we need to add them to the password file:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1722 #, no-wrap msgid "" "\n" "$ ### First time: use -c to create the file\n" "$ ### Use -m to use MD5 encryption of the password, which is more secure\n" "$ htpasswd -cm /etc/svn-auth-file harry\n" "New password: *****\n" "Re-type new password: *****\n" "Adding password for user harry\n" "$ htpasswd -m /etc/svn-auth-file sally\n" "New password: *******\n" "Re-type new password: *******\n" "Adding password for user sally\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1736 msgid "" "Next, you need to add some more <filename>httpd.conf</filename> directives " "inside your <literal>Location</literal> block to tell Apache what to do with " "your new password file. The <literal>AuthType</literal> directive specifies " "the type of authentication system to use. In this case, we want to specify " "the <literal>Basic</literal> authentication system. <literal>AuthName</" "literal> is an arbitrary name that you give for the authentication domain. " "Most browsers will display this name in the pop-up dialog box when the " "browser is querying the user for her name and password. Finally, use the " "<literal>AuthUserFile</literal> directive to specify the location of the " "password file you created using <command>htpasswd</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1751 msgid "" "After adding these three directives, your <literal><Location></" "literal> block should look something like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1755 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /etc/svn-auth-file\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1765 msgid "" "This <literal><Location></literal> block is not yet complete, and it " "will not do anything useful. It's merely telling Apache that whenever " "authorization is required, Apache should harvest a username and password " "from the Subversion client. What's missing here, however, are directives " "that tell Apache <emphasis>which</emphasis> sorts of client requests require " "authorization. Wherever authorization is required, Apache will demand " "authentication as well. The simplest thing to do is protect all requests. " "Adding <literal>Require valid-user</literal> tells Apache that all requests " "require an authenticated user:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1777 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /etc/svn-auth-file\n" " Require valid-user\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1788 msgid "" "Be sure to read the next section (<xref linkend=\"svn.serverconfig.httpd." "authz\"/>) for more detail on the <literal>Require</literal> directive and " "other ways to set authorization policies." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1793 msgid "" "One word of warning: HTTP Basic Auth passwords pass in very nearly plain " "text over the network, and thus are extremely insecure." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1797 msgid "" "Another option is to not use Basic authentication, but to use Digest " "authentication instead. Digest authentication allows the server to verify " "the client's identity <emphasis>without</emphasis> passing the plain-text " "password over the network. Assuming that the client and server both know " "the user's password, they can verify that the password is the same by using " "it to apply a hashing function to a one-time bit of information. The server " "sends a small random-ish string to the client; the client uses the user's " "password to hash the string; the server then looks to see whether the hashed " "value is what it expected." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1809 msgid "" "Configuring Apache for Digest authentication is also fairly easy, and only a " "small variation on our prior example. Be sure to consult Apache's " "documentation for full details." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1814 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" " AuthType Digest\n" " AuthName \"Subversion repository\"\n" " AuthDigestDomain /svn/\n" " AuthUserFile /etc/svn-auth-file\n" " Require valid-user\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch06-server-configuration.xml:1826 msgid "" "If you're looking for maximum security, public key cryptography is the best " "solution. It may be best to use some sort of SSL encryption, so that " "clients authenticate via <literal>https://</literal> instead of " "<literal>http://</literal>; at a bare minimum, you can configure Apache to " "use a self-signed server certificate. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:1833 msgid "" "While self-signed server certificates are still vulnerable to a <quote>man-" "in-the-middle</quote> attack, such an attack is much more difficult for a " "casual observer to pull off, compared to sniffing unprotected passwords." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1838 msgid "" "</footnote> Consult Apache's documentation (and OpenSSL documentation) " "about how to do that." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:1847 msgid "SSL certificate management" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1849 msgid "" "Businesses that need to expose their repositories for access outside the " "company firewall should be conscious of the possibility that unauthorized " "parties could be <quote>sniffing</quote> their network traffic. SSL makes " "that kind of unwanted attention less likely to result in sensitive data " "leaks." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1856 msgid "" "If a Subversion client is compiled to use OpenSSL, it gains the ability to " "speak to an Apache server via <literal>https://</literal> URLs. The Neon " "library used by the Subversion client is not only able to verify server " "certificates, but can also supply client certificates when challenged. When " "the client and server have exchanged SSL certificates and successfully " "authenticated one another, all further communication is encrypted via a " "session key." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1865 msgid "" "It's beyond the scope of this book to describe how to generate client and " "server certificates and how to configure Apache to use them. Many other " "books, including Apache's own documentation, describe this task. But what " "we <emphasis>can</emphasis> cover here is how to manage server and client " "certificates from an ordinary Subversion client." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1873 msgid "" "When speaking to Apache via <literal>https://</literal>, a Subversion client " "can receive two different types of information:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1878 msgid "A server certificate" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1879 msgid "A demand for a client certificate" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1882 msgid "" "If the client receives a server certificate, it needs to verify that it " "trusts the certificate: is the server really who it claims to be? The " "OpenSSL library does this by examining the signer of the server certificate, " "or <firstterm>certificate authority</firstterm> (CA). If OpenSSL is unable " "to automatically trust the CA, or if some other problem occurs (such as an " "expired certificate or hostname mismatch), the Subversion command-line " "client will ask you whether you want to trust the server certificate anyway:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1893 #, no-wrap msgid "" "\n" "$ svn list https://host.example.com/repos/project\n" "\n" "Error validating server certificate for 'https://host.example.com:443':\n" " - The certificate is not issued by a trusted authority. Use the\n" " fingerprint to validate the certificate manually!\n" "Certificate information:\n" " - Hostname: host.example.com\n" " - Valid: from Jan 30 19:23:56 2004 GMT until Jan 30 19:23:56 2006 GMT\n" " - Issuer: CA, example.com, Sometown, California, US\n" " - Fingerprint: 7d:e1:a9:34:33:39:ba:6a:e9:a5:c4:22:98:7b:76:5c:92:a0:9c:7b\n" "\n" "(R)eject, accept (t)emporarily or accept (p)ermanently?\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1908 msgid "" "This dialogue should look familiar; it's essentially the same question " "you've probably seen coming from your web browser (which is just another " "HTTP client like Subversion). If you choose the <literal>(p)</" "literal>ermanent option, the server certificate will be cached in your " "private runtime <filename>auth/</filename> area in just the same way your " "username and password are cached (see <xref linkend=\"svn.serverconfig." "netmodel.credcache\"/>). If cached, Subversion will automatically trust " "this certificate in future negotiations." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1919 msgid "" "Your runtime <filename>servers</filename> file also gives you the ability to " "make your Subversion client automatically trust specific CAs, either " "globally or on a per-host basis. Simply set the <literal>ssl-authority-" "files</literal> variable to a semicolon-separated list of PEM-encoded CA " "certificates:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1926 #, no-wrap msgid "" "\n" "[global]\n" "ssl-authority-files = /path/to/CAcert1.pem;/path/to/CAcert2.pem\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1931 msgid "" "Many OpenSSL installations also have a predefined set of <quote>default</" "quote> CAs that are nearly universally trusted. To make the Subversion " "client automatically trust these standard authorities, set the <literal>ssl-" "trust-default-ca</literal> variable to <literal>true</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1938 msgid "" "When talking to Apache, a Subversion client might also receive a challenge " "for a client certificate. Apache is asking the client to identify itself: " "is the client really who it says it is? If all goes correctly, the " "Subversion client sends back a private certificate signed by a CA that " "Apache trusts. A client certificate is usually stored on disk in encrypted " "format, protected by a local password. When Subversion receives this " "challenge, it will ask you for a path to the certificate and the password " "that protects it:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1949 #, no-wrap msgid "" "\n" "$ svn list https://host.example.com/repos/project\n" "\n" "Authentication realm: https://host.example.com:443\n" "Client certificate filename: /path/to/my/cert.p12\n" "Passphrase for '/path/to/my/cert.p12': ********\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1958 msgid "" "Notice that the client certificate is a <quote>p12</quote> file. To use a " "client certificate with Subversion, it must be in PKCS#12 format, which is a " "portable standard. Most web browsers are already able to import and export " "certificates in that format. Another option is to use the OpenSSL command-" "line tools to convert existing certificates into PKCS#12." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1966 msgid "" "Again, the runtime <filename>servers</filename> file allows you to automate " "this challenge on a per-host basis. Either or both pieces of information " "can be described in runtime variables:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1971 #, no-wrap msgid "" "\n" "[groups]\n" "examplehost = host.example.com\n" "\n" "[examplehost]\n" "ssl-client-cert-file = /path/to/my/cert.p12\n" "ssl-client-cert-password = somepassword\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch06-server-configuration.xml:1980 msgid "" "Once you've set the <literal>ssl-client-cert-file</literal> and <literal>ssl-" "client-cert-password</literal> variables, the Subversion client can " "automatically respond to a client certificate challenge without prompting " "you. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:1986 msgid "" "More security-conscious folk might not want to store the client certificate " "password in the runtime <filename>servers</filename> file." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1998 msgid "Authorization Options" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:2000 msgid "" "At this point, you've configured authentication, but not authorization. " "Apache is able to challenge clients and confirm identities, but it has not " "been told how to allow or restrict access to the clients bearing those " "identities. This section describes two strategies for controlling access to " "your repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:2009 msgid "Blanket access control" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2011 msgid "" "The simplest form of access control is to authorize certain users for either " "read-only access to a repository or read/write access to a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2015 msgid "" "You can restrict access on all repository operations by adding the " "<literal>Require valid-user</literal> directive to your <literal><" "Location></literal> block. Using our previous example, this would mean " "that only clients that claimed to be either <literal>harry</literal> or " "<literal>sally</literal> and that provided the correct password for their " "respective username would be allowed to do anything with the Subversion " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2024 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " # how to authenticate a user\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /path/to/users/file\n" "\n" " # only authenticated users may access the repository\n" " Require valid-user\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2039 msgid "" "Sometimes you don't need to run such a tight ship. For example, " "Subversion's own source code repository at <ulink url=\"http://svn.collab." "net/repos/svn\"/> allows anyone in the world to perform read-only repository " "tasks (such as checking out working copies and browsing the repository with " "a web browser), but restricts all write operations to authenticated users. " "To do this type of selective restriction, you can use the <literal>Limit</" "literal> and <literal>LimitExcept</literal> configuration directives. Like " "the <literal>Location</literal> directive, these blocks have starting and " "ending tags, and you would nest them inside your <literal><Location></" "literal> block." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2053 msgid "" "The parameters present on the <literal>Limit</literal> and " "<literal>LimitExcept</literal> directives are HTTP request types that are " "affected by that block. For example, if you wanted to disallow all access " "to your repository except the currently supported read-only operations, you " "would use the <literal>LimitExcept</literal> directive, passing the " "<literal>GET</literal>, <literal>PROPFIND</literal>, <literal>OPTIONS</" "literal>, and <literal>REPORT</literal> request type parameters. Then the " "previously mentioned <literal>Require valid-user</literal> directive would " "be placed inside the <literal><LimitExcept></literal> block instead of " "just inside the <literal><Location></literal> block." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2067 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " # how to authenticate a user\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /path/to/users/file\n" "\n" " # For any operations other than these, require an authenticated user.\n" " <LimitExcept GET PROPFIND OPTIONS REPORT>\n" " Require valid-user\n" " </LimitExcept>\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2084 msgid "" "These are only a few simple examples. For more in-depth information about " "Apache access control and the <literal>Require</literal> directive, take a " "look at the <literal>Security</literal> section of the Apache " "documentation's tutorials collection at <ulink url=\"http://httpd.apache.org/" "docs-2.0/misc/tutorials.html\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:2096 msgid "Per-directory access control" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2098 msgid "" "It's possible to set up finer-grained permissions using a second Apache " "httpd module, <command>mod_authz_svn</command>. This module grabs the " "various opaque URLs passing from client to server, asks " "<command>mod_dav_svn</command> to decode them, and then possibly vetoes " "requests based on access policies defined in a configuration file." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2106 msgid "" "If you've built Subversion from source code, <command>mod_authz_svn</" "command> is automatically built and installed alongside " "<command>mod_dav_svn</command>. Many binary distributions install it " "automatically as well. To verify that it's installed correctly, make sure " "it comes right after <command>mod_dav_svn</command>'s <literal>LoadModule</" "literal> directive in <filename>httpd.conf</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2115 #, no-wrap msgid "" "\n" "LoadModule dav_module modules/mod_dav.so\n" "LoadModule dav_svn_module modules/mod_dav_svn.so\n" "LoadModule authz_svn_module modules/mod_authz_svn.so\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2121 msgid "" "To activate this module, you need to configure your <literal>Location</" "literal> block to use the <literal>AuthzSVNAccessFile</literal> directive, " "which specifies a file containing the permissions policy for paths within " "your repositories. (In a moment, we'll discuss the format of that file.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2128 msgid "" "Apache is flexible, so you have the option to configure your block in one of " "three general patterns. To begin, choose one of these basic configuration " "patterns. (The following examples are very simple; look at Apache's own " "documentation for much more detail on Apache authentication and " "authorization options.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2135 msgid "" "The simplest block is to allow open access to everyone. In this scenario, " "Apache never sends authentication challenges, so all users are treated as " "<quote>anonymous.</quote> (See <xref linkend=\"svn.serverconfig.httpd.authz." "perdir.ex-1\"/>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><title> #: ../en/book/ch06-server-configuration.xml:2142 msgid "A sample configuration for anonymous access" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><programlisting> #: ../en/book/ch06-server-configuration.xml:2143 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " # our access control policy\n" " AuthzSVNAccessFile /path/to/access/file\n" "</Location>\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2154 msgid "" "On the opposite end of the paranoia scale, you can configure your block to " "demand authentication from everyone. All clients must supply credentials to " "identify themselves. Your block unconditionally requires authentication via " "the <literal>Require valid-user</literal> directive, and it defines a means " "to authenticate. (See <xref linkend=\"svn.serverconfig.httpd.authz.perdir." "ex-2\"/>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><title> #: ../en/book/ch06-server-configuration.xml:2163 msgid "A sample configuration for authenticated access" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><programlisting> #: ../en/book/ch06-server-configuration.xml:2164 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " # our access control policy\n" " AuthzSVNAccessFile /path/to/access/file\n" "\n" " # only authenticated users may access the repository\n" " Require valid-user\n" "\n" " # how to authenticate a user\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /path/to/users/file\n" "</Location>\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2183 msgid "" "A third very popular pattern is to allow a combination of authenticated and " "anonymous access. For example, many administrators want to allow anonymous " "users to read certain repository directories, but want only authenticated " "users to read (or write) more sensitive areas. In this setup, all users " "start out accessing the repository anonymously. If your access control " "policy demands a real username at any point, Apache will demand " "authentication from the client. To do this, use both the <literal>Satisfy " "Any</literal> and <literal>Require valid-user</literal> directives " "together. (See <xref linkend=\"svn.serverconfig.httpd.authz.perdir.ex-3\"/" ">.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><title> #: ../en/book/ch06-server-configuration.xml:2197 msgid "A sample configuration for mixed authenticated/anonymous access" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><programlisting> #: ../en/book/ch06-server-configuration.xml:2199 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " # our access control policy\n" " AuthzSVNAccessFile /path/to/access/file\n" "\n" " # try anonymous access first, resort to real\n" " # authentication if necessary.\n" " Satisfy Any\n" " Require valid-user\n" "\n" " # how to authenticate a user\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /path/to/users/file\n" "</Location>\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2220 msgid "" "Once you've settled on one of these three basic <filename>httpd.conf</" "filename> templates, you need to create your file containing access rules " "for particular paths within the repository. We describe this later in this " "chapter, in <xref linkend=\"svn.serverconfig.pathbasedauthz\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:2231 #, fuzzy #| msgid "Disabling Password Caching" msgid "Disabling path-based checks" msgstr "Das Zwischenspeichern des Passwortes abstellen" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2233 msgid "" "The <command>mod_dav_svn</command> module goes through a lot of work to make " "sure that data you've marked <quote>unreadable</quote> doesn't get " "accidentally leaked. This means it needs to closely monitor all of the " "paths and file-contents returned by commands such as <command>svn checkout</" "command> and <command>svn update</command>. If these commands encounter a " "path that isn't readable according to some authorization policy, the path is " "typically omitted altogether. In the case of history or rename " "tracing—for example, running a command such as <userinput>svn cat -r " "OLD foo.c</userinput> on a file that was renamed long ago—the rename " "tracking will simply halt if one of the object's former names is determined " "to be read-restricted." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2248 msgid "" "All of this path checking can sometimes be quite expensive, especially in " "the case of <command>svn log</command>. When retrieving a list of " "revisions, the server looks at every changed path in each revision and " "checks it for readability. If an unreadable path is discovered, it's " "omitted from the list of the revision's changed paths (normally seen with " "the <option>--verbose</option> option), and the whole log message is " "suppressed. Needless to say, this can be time-consuming on revisions that " "affect a large number of files. This is the cost of security: even if you " "haven't configured a module such as <command>mod_authz_svn</command> at all, " "the <command>mod_dav_svn</command> module is still asking Apache " "<command>httpd</command> to run authorization checks on every path. The " "<command>mod_dav_svn</command> module has no idea what authorization modules " "have been installed, so all it can do is ask Apache to invoke whatever might " "be present." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2268 msgid "" "On the other hand, there's also an escape hatch of sorts, which allows you " "to trade security features for speed. If you're not enforcing any sort of " "per-directory authorization (i.e., not using <command>mod_authz_svn</" "command> or similar module), you can disable all of this path checking. In " "your <filename>httpd.conf</filename> file, use the <literal>SVNPathAuthz</" "literal> directive as shown in <xref linkend=\"svn.serverconfig.httpd.authz." "pathauthzoff.ex-1\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><title> #: ../en/book/ch06-server-configuration.xml:2280 msgid "Disabling path checks altogether" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><programlisting> #: ../en/book/ch06-server-configuration.xml:2281 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " SVNPathAuthz off\n" "</Location>\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2291 msgid "" "The <literal>SVNPathAuthz</literal> directive is <quote>on</quote> by " "default. When set to <quote>off,</quote> all path-based authorization " "checking is disabled; <command>mod_dav_svn</command> stops invoking " "authorization checks on every path it discovers." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:2304 msgid "Extra Goodies" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:2306 msgid "" "We've covered most of the authentication and authorization options for " "Apache and <command>mod_dav_svn</command>. But there are a few other nice " "features that Apache provides." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch06-server-configuration.xml:2313 #, fuzzy #| msgid "Repository URLs" msgid "Repository browsing" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2315 msgid "" "One of the most useful benefits of an Apache/WebDAV configuration for your " "Subversion repository is that the youngest revisions of your versioned files " "and directories are immediately available for viewing via a regular web " "browser. Since Subversion uses URLs to identify versioned resources, those " "URLs used for HTTP-based repository access can be typed directly into a web " "browser. Your browser will issue an HTTP <literal>GET</literal> request for " "that URL; based on whether that URL represents a versioned directory or " "file, <command>mod_dav_svn</command> will respond with a directory listing " "or with file contents." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2327 msgid "" "Since the URLs do not contain any information about which version of the " "resource you wish to see, <command>mod_dav_svn</command> will always answer " "with the youngest version. This functionality has the wonderful side effect " "that you can pass around Subversion URLs to your peers as references to " "documents, and those URLs will always point at the latest manifestation of " "that document. Of course, you can even use the URLs as hyperlinks from " "other web sites, too." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><title> #: ../en/book/ch06-server-configuration.xml:2338 msgid "Can I View Older Revisions?" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2340 msgid "" "With an ordinary web browser? In one word: nope. At least, not with " "<command>mod_dav_svn</command> as your only tool." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2344 msgid "" "Your web browser speaks ordinary HTTP only. That means it knows only how to " "GET public URLs, which represent the latest versions of files and " "directories. According to the WebDAV/DeltaV specification, each server " "defines a private URL syntax for older versions of resources, and that " "syntax is opaque to clients. To find an older version of a file, a client " "must follow a specific procedure to <quote>discover</quote> the proper URL; " "the procedure involves issuing a series of WebDAV PROPFIND requests and " "understanding DeltaV concepts. This is something your web browser simply " "can't do." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para><footnote> #: ../en/book/ch06-server-configuration.xml:2356 msgid "" "So, to answer the question, one obvious way to see older revisions of files " "and directories is by passing the <option>--revision</option> (<option>-r</" "option>) argument to the <command>svn list</command> and <command>svn cat</" "command> commands. To browse old revisions with your web browser, however, " "you can use third-party software. A good example of this is ViewVC (<ulink " "url=\"http://viewvc.tigris.org/\"/>). ViewVC was originally written to " "display CVS repositories through the Web, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:2366 msgid "Back then, it was called ViewCVS." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2367 msgid "" "</footnote> and the latest releases are able to understand Subversion " "repositories as well." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2373 msgid "Proper MIME type" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2375 msgid "" "When browsing a Subversion repository, the web browser gets a clue about how " "to render a file's contents by looking at the <literal>Content-Type:</" "literal> header returned in Apache's response to the HTTP <literal>GET</" "literal> request. The value of this header is some sort of MIME type. By " "default, Apache will tell the web browsers that all repository files are of " "the <quote>default</quote> MIME type, typically <literal>text/plain</" "literal>. This can be frustrating, however, if a user wishes repository " "files to render as something more meaningful—for example, it might be " "nice to have a <filename>foo.html</filename> file in the repository actually " "render as HTML when browsing." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2390 msgid "" "To make this happen, you need only to make sure that your files have the " "proper <literal>svn:mime-type</literal> set. We discuss this in more detail " "in <xref linkend=\"svn.advanced.props.special.mime-type\"/>, and you can " "even configure your client to automatically attach proper <literal>svn:mime-" "type</literal> properties to files entering the repository for the first " "time; see <xref linkend=\"svn.advanced.props.auto\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2400 msgid "" "So in our example, if one were to set the <literal>svn:mime-type</literal> " "property to <literal>text/html</literal> on file <filename>foo.html</" "filename>, Apache would properly tell your web browser to render the file as " "HTML. One could also attach proper <literal>image/*</literal> MIME-type " "properties to image files and ultimately get an entire web site to be " "viewable directly from a repository! There's generally no problem with this, " "as long as the web site doesn't contain any dynamically generated content." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2415 msgid "Customizing the look" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2417 msgid "" "You generally will get more use out of URLs to versioned files—after " "all, that's where the interesting content tends to lie. But you might have " "occasion to browse a Subversion directory listing, where you'll quickly note " "that the generated HTML used to display that listing is very basic, and " "certainly not intended to be aesthetically pleasing (or even interesting). " "To enable customization of these directory displays, Subversion provides an " "XML index feature. A single <literal>SVNIndexXSLT</literal> directive in " "your repository's <literal>Location</literal> block of <filename>httpd.conf</" "filename> will instruct <command>mod_dav_svn</command> to generate XML " "output when displaying a directory listing, and to reference the XSLT " "stylesheet of your choice:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><screen> #: ../en/book/ch06-server-configuration.xml:2433 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" " SVNIndexXSLT \"/svnindex.xsl\"\n" " …\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2442 msgid "" "Using the <literal>SVNIndexXSLT</literal> directive and a creative XSLT " "stylesheet, you can make your directory listings match the color schemes and " "imagery used in other parts of your web site. Or, if you'd prefer, you can " "use the sample stylesheets provided in the Subversion source distribution's " "<filename>tools/xslt/</filename> directory. Keep in mind that the path " "provided to the <literal>SVNIndexXSLT</literal> directory is actually a URL " "path—browsers need to be able to read your stylesheets to make use of " "them!" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2456 msgid "Listing repositories" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2458 msgid "" "If you're serving a collection of repositories from a single URL via the " "<literal>SVNParentPath</literal> directive, then it's also possible to have " "Apache display all available repositories to a web browser. Just activate " "the <literal>SVNListParentPath</literal> directive:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><screen> #: ../en/book/ch06-server-configuration.xml:2465 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" " SVNListParentPath on\n" " …\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2474 msgid "" "If a user now points her web browser to the URL <literal>http://host.example." "com/svn/</literal>, she'll see a list of all Subversion repositories sitting " "in <filename>/var/svn</filename>. Obviously, this can be a security " "problem, so this feature is turned off by default." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:2487 msgid "Apache logging" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2489 msgid "" "Because Apache is an HTTP server at heart, it contains fantastically " "flexible logging features. It's beyond the scope of this book to discuss " "all of the ways logging can be configured, but we should point out that even " "the most generic <filename>httpd.conf</filename> file will cause Apache to " "produce two logs: <filename>error_log</filename> and <filename>access_log</" "filename>. These logs may appear in different places, but are typically " "created in the logging area of your Apache installation. (On Unix, they " "often live in <filename>/usr/local/apache2/logs/</filename>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2502 msgid "" "The <filename>error_log</filename> describes any internal errors that Apache " "runs into as it works. The <filename>access_log</filename> file records " "every incoming HTTP request received by Apache. This makes it easy to see, " "for example, which IP addresses Subversion clients are coming from, how " "often particular clients use the server, which users are authenticating " "properly, and which requests succeed or fail." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2511 msgid "" "Unfortunately, because HTTP is a stateless protocol, even the simplest " "Subversion client operation generates multiple network requests. It's very " "difficult to look at the <filename>access_log</filename> and deduce what the " "client was doing—most operations look like a series of cryptic " "<literal>PROPPATCH</literal>, <literal>GET</literal>, <literal>PUT</" "literal>, and <literal>REPORT</literal> requests. To make things worse, " "many client operations send nearly identical series of requests, so it's " "even harder to tell them apart." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2522 msgid "" "<command>mod_dav_svn</command>, however, can come to your aid. By " "activating an <quote>operational logging</quote> feature, you can ask " "<command>mod_dav_svn</command> to create a separate log file describing what " "sort of high-level operations your clients are performing." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2529 msgid "" "To do this, you need to make use of Apache's <literal>CustomLog</literal> " "directive (which is explained in more detail in Apache's own " "documentation). Be sure to invoke this directive <emphasis>outside</" "emphasis> your Subversion <literal>Location</literal> block:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2536 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " …\n" "</Location>\n" "\n" "CustomLog logs/svn_logfile \"%t %u %{SVN-ACTION}e\" env=SVN-ACTION\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2545 msgid "" "In this example, we're asking Apache to create a special logfile, " "<filename>svn_logfile</filename>, in the standard Apache <filename>logs</" "filename> directory. The <literal>%t</literal> and <literal>%u</literal> " "variables are replaced by the time and username of the request, " "respectively. The really important parts are the two instances of " "<literal>SVN-ACTION</literal>. When Apache sees that variable, it " "substitutes the value of the <literal>SVN-ACTION</literal> environment " "variable, which is automatically set by <command>mod_dav_svn</command> " "whenever it detects a high-level client action." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2557 msgid "" "So, instead of having to interpret a traditional <filename>access_log</" "filename> like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2561 #, no-wrap msgid "" "\n" "[26/Jan/2007:22:25:29 -0600] \"PROPFIND /svn/calc/!svn/vcc/default HTTP/1.1\" 207 398\n" "[26/Jan/2007:22:25:29 -0600] \"PROPFIND /svn/calc/!svn/bln/59 HTTP/1.1\" 207 449\n" "[26/Jan/2007:22:25:29 -0600] \"PROPFIND /svn/calc HTTP/1.1\" 207 647\n" "[26/Jan/2007:22:25:29 -0600] \"REPORT /svn/calc/!svn/vcc/default HTTP/1.1\" 200 607\n" "[26/Jan/2007:22:25:31 -0600] \"OPTIONS /svn/calc HTTP/1.1\" 200 188\n" "[26/Jan/2007:22:25:31 -0600] \"MKACTIVITY /svn/calc/!svn/act/e6035ef7-5df0-4ac0-b811-4be7c823f998 HTTP/1.1\" 201 227\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2571 msgid "" "you can peruse a much more intelligible <filename>svn_logfile</filename> " "like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2575 #, no-wrap msgid "" "\n" "[26/Jan/2007:22:24:20 -0600] - get-dir /tags r1729 props\n" "[26/Jan/2007:22:24:27 -0600] - update /trunk r1729 depth=infinity send-copyfrom-args\n" "[26/Jan/2007:22:25:29 -0600] - status /trunk/foo r1729 depth=infinity\n" "[26/Jan/2007:22:25:31 -0600] sally commit r1730\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2582 msgid "" "For an exhaustive list of all actions logged, see <xref linkend=\"svn.ref." "mod_dav_svn.conf.logging\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:2589 msgid "Write-through proxying" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2591 msgid "" "One of the nice advantages of using Apache as a Subversion server is that it " "can be set up for simple replication. For example, suppose that your team " "is distributed across four offices around the globe. The Subversion " "repository can exist only in one of those offices, which means the other " "three offices will not enjoy accessing it—they're likely to experience " "significantly slower traffic and response times when updating and committing " "code. A powerful solution is to set up a system consisting of one " "<firstterm>master</firstterm> Apache server and several <firstterm>slave</" "firstterm> Apache servers. If you place a slave server in each office, " "users can check out a working copy from whichever slave is closest to them. " "All read requests go to their local slave. Write requests get automatically " "routed to the single master server. When the commit completes, the master " "then automatically <quote>pushes</quote> the new revision to each slave " "server using the <command>svnsync</command> replication tool." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2611 msgid "" "This configuration creates a huge perceptual speed increase for your users, " "because Subversion client traffic is typically 80–90% read requests. " "And if those requests are coming from a <emphasis>local</emphasis> server, " "it's a huge win." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2617 msgid "" "In this section, we'll walk you through a standard setup of this single-" "master/multiple-slave system. However, keep in mind that your servers must " "be running at least Apache 2.2.0 (with <command>mod_proxy</command> loaded) " "and Subversion 1.5 (<command>mod_dav_svn</command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2624 msgid "Configure the servers" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2626 msgid "" "First, configure your master server's <filename>httpd.conf</filename> file " "in the usual way. Make the repository available at a certain URI location, " "and configure authentication and authorization however you'd like. After " "that's done, configure each of your <quote>slave</quote> servers in the " "exact same way, but add the special <literal>SVNMasterURI</literal> " "directive to the block:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><screen> #: ../en/book/ch06-server-configuration.xml:2635 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNPath /var/svn/repos\n" " SVNMasterURI http://master.example.com/svn\n" " …\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2644 msgid "" "This new directive tells a slave server to redirect all write requests to " "the master. (This is done automatically via Apache's <command>mod_proxy</" "command> module.) Ordinary read requests, however, are still serviced by " "the slaves. Be sure that your master and slave servers all have matching " "authentication and authorization configurations; if they fall out of sync, " "it can lead to big headaches." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2653 msgid "" "Next, we need to deal with the problem of infinite recursion. With the " "current configuration, imagine what will happen when a Subversion client " "performs a commit to the master server. After the commit completes, the " "server uses <command>svnsync</command> to replicate the new revision to each " "slave. But because <command>svnsync</command> appears to be just another " "Subversion client performing a commit, the slave will immediately attempt to " "proxy the incoming write request back to the master! Hilarity ensues." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2664 msgid "" "The solution to this problem is to have the master push revisions to a " "different <literal><Location></literal> on the slaves. This location " "is configured to <emphasis>not</emphasis> proxy write requests at all, but " "to accept normal commits from (and only from) the master's IP address:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><screen> #: ../en/book/ch06-server-configuration.xml:2671 #, no-wrap msgid "" "\n" "<Location /svn-proxy-sync>\n" " DAV svn\n" " SVNPath /var/svn/repos\n" " Order deny,allow\n" " Deny from all\n" " # Only let the server's IP address access this Location:\n" " Allow from 10.20.30.40\n" " …\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2686 msgid "Set up replication" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2688 msgid "" "Now that you've configured your <literal>Location</literal> blocks on master " "and slaves, you need to configure the master to replicate to the slaves. " "This is done the usual way— using <command>svnsync</command>. If " "you're not familiar with this tool, see <xref linkend=\"svn.reposadmin.maint." "replication\"/> for details." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2697 msgid "" "First, make sure that each slave repository has a <filename>pre-revprop-" "change</filename> hook script which allows remote revision property " "changes. (This is standard procedure for being on the receiving end of " "<command>svnsync</command>.) Then log into the master server and configure " "each of the slave repository URIs to receive data from the master repository " "on the local disk:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><screen> #: ../en/book/ch06-server-configuration.xml:2706 #, no-wrap msgid "" "\n" "$ svnsync init http://slave1.example.com/svn-proxy-sync file://var/svn/repos\n" "Copied properties for revision 0.\n" "$ svnsync init http://slave2.example.com/svn-proxy-sync file://var/svn/repos\n" "Copied properties for revision 0.\n" "$ svnsync init http://slave3.example.com/svn-proxy-sync file://var/svn/repos\n" "Copied properties for revision 0.\n" "\n" "# Perform the initial replication\n" "\n" "$ svnsync sync http://slave1.example.com/svn-proxy-sync\n" "Transmitting file data ....\n" "Committed revision 1.\n" "Copied properties for revision 1.\n" "Transmitting file data .......\n" "Committed revision 2.\n" "Copied properties for revision 2.\n" "…\n" "\n" "$ svnsync sync http://slave2.example.com/svn-proxy-sync\n" "Transmitting file data ....\n" "Committed revision 1.\n" "Copied properties for revision 1.\n" "Transmitting file data .......\n" "Committed revision 2.\n" "Copied properties for revision 2.\n" "…\n" "\n" "$ svnsync sync http://slave3.example.com/svn-proxy-sync\n" "Transmitting file data ....\n" "Committed revision 1.\n" "Copied properties for revision 1.\n" "Transmitting file data .......\n" "Committed revision 2.\n" "Copied properties for revision 2.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2744 msgid "" "After this is done, we configure the master server's <filename>post-commit</" "filename> hook script to invoke <command>svnsync</command> on each slave " "server:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><programlisting> #: ../en/book/ch06-server-configuration.xml:2748 #, no-wrap msgid "" "\n" "#!/bin/sh\n" "# Post-commit script to replicate newly committed revision to slaves\n" "\n" "svnsync sync http://slave1.example.com/svn-proxy-sync > /dev/null 2>&1\n" "svnsync sync http://slave2.example.com/svn-proxy-sync > /dev/null 2>&1\n" "svnsync sync http://slave3.example.com/svn-proxy-sync > /dev/null 2>&1\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2757 msgid "" "The extra bits on the end of each line aren't necessary, but they're a " "sneaky way to allow the sync commands to run in the background so that the " "Subversion client isn't left waiting forever for the commit to finish. In " "addition to this <filename>post-commit</filename> hook, you'll need a " "<filename>post-revprop-change</filename> hook as well so that when a user, " "say, modifies a log message, the slave servers get that change also:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><programlisting> #: ../en/book/ch06-server-configuration.xml:2767 #, no-wrap msgid "" "\n" "#!/bin/sh\n" "# Post-revprop-change script to replicate revprop-changes to slaves\n" "\n" "REV=${2}\n" "svnsync copy-revprops http://slave1.example.com/svn-proxy-sync ${REV} > /dev/null 2>&1\n" "svnsync copy-revprops http://slave2.example.com/svn-proxy-sync ${REV} > /dev/null 2>&1\n" "svnsync copy-revprops http://slave3.example.com/svn-proxy-sync ${REV} > /dev/null 2>&1\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2777 msgid "" "The only thing we've left out here is what to do about locks. Because locks " "are strictly enforced by the master server (the only place where commits " "happen), we don't technically need to do anything. Many teams don't use " "Subversion's locking features at all, so it may be a nonissue for you. " "However, if lock changes aren't replicated from master to slaves, it means " "that clients won't be able to query the status of locks (e.g., " "<userinput>svn status -u</userinput> will show no information about " "repository locks). If this bothers you, you can write <filename>post-lock</" "filename> and <filename>post-unlock</filename> hook scripts that run " "<command>svn lock</command> and <command>svn unlock</command> on each slave " "machine, presumably through a remote shell method such as SSH. That's left " "as an exercise for the reader!" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2797 msgid "Caveats" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2799 msgid "" "Your master/slave replication system should now be ready to use. A couple " "of words of warning are in order, however. Remember that this replication " "isn't entirely robust in the face of computer or network crashes. For " "example, if one of the automated <command>svnsync</command> commands fails " "to complete for some reason, the slaves will begin to fall behind. For " "example, your remote users will see that they've committed revision 100, but " "then when they run <command>svn update</command>, their local server will " "tell them that revision 100 doesn't yet exist! Of course, the problem will " "be automatically fixed the next time another commit happens and the " "subsequent <command>svnsync</command> is successful—the sync will " "replicate all waiting revisions. But still, you may want to set up some " "sort of out-of-band monitoring to notice synchronization failures and force " "<command>svnsync</command> to run when things go wrong." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><sidebar><title> #: ../en/book/ch06-server-configuration.xml:2819 msgid "Can We Set Up Replication with svnserve?" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2821 msgid "" "If you're using <command>svnserve</command> instead of Apache as your " "server, you can certainly configure your repository's hook scripts to invoke " "<command>svnsync</command> as we've shown here, thereby causing automatic " "replication from master to slaves. Unfortunately, at the time of this " "writing there is no way to make slave <command>svnserve</command> servers " "automatically proxy write requests back to the master server. This means " "your users would only be able to check out read-only working copies from the " "slave servers. You'd have to configure your slave servers to disallow write " "access completely. This might be useful for creating read-only " "<quote>mirrors</quote> of popular open source projects, but it's not a " "transparent proxying system." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:2843 msgid "Other Apache features" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2845 msgid "" "Several of the features already provided by Apache in its role as a robust " "web server can be leveraged for increased functionality or security in " "Subversion as well. The Subversion client is able to use SSL (the Secure " "Sockets Layer, discussed earlier). If your Subversion client is built to " "support SSL, it can access your Apache server using <literal>https://</" "literal> and enjoy a high-quality encrypted network session." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2854 msgid "" "Equally useful are other features of the Apache and Subversion relationship, " "such as the ability to specify a custom port (instead of the default HTTP " "port 80) or a virtual domain name by which the Subversion repository should " "be accessed, or the ability to access the repository through an HTTP proxy." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2861 msgid "" "Finally, because <command>mod_dav_svn</command> is speaking a subset of the " "WebDAV/DeltaV protocol, it's possible to access the repository via third-" "party DAV clients. Most modern operating systems (Win32, OS X, and Linux) " "have the built-in ability to mount a DAV server as a standard network " "<quote>shared folder.</quote> This is a complicated topic, but also wondrous " "when implemented. For details, read <xref linkend=\"svn.webdav\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2870 msgid "" "Note that there are a number of other small tweaks one can make to " "<command>mod_dav_svn</command> that are too obscure to mention in this " "chapter. For a complete list of all <filename>httpd.conf</filename> " "directives that <command>mod_dav_svn</command> responds to, see <xref " "linkend=\"svn.ref.mod_dav_svn.conf.directives\"/>." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:2888 msgid "Path-Based Authorization" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:2890 msgid "" "Both Apache and <command>svnserve</command> are capable of granting (or " "denying) permissions to users. Typically this is done over the entire " "repository: a user can read the repository (or not), and she can write to " "the repository (or not). It's also possible, however, to define finer-" "grained access rules. One set of users may have permission to write to a " "certain directory in the repository, but not others; another directory might " "not even be readable by all but a few special people." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:2900 msgid "" "Both servers use a common file format to describe these path-based access " "rules. In the case of Apache, one needs to load the <command>mod_authz_svn</" "command> module and then add the <literal>AuthzSVNAccessFile</literal> " "directive (within the <filename>httpd.conf</filename> file) pointing to your " "own rules file. (For a full explanation, see <xref linkend=\"svn." "serverconfig.httpd.authz.perdir\"/>.) If you're using <command>svnserve</" "command>, you need to make the <literal>authz-db</literal> variable (within " "<filename>svnserve.conf</filename>) point to your rules file." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch06-server-configuration.xml:2913 msgid "Do You Really Need Path-Based Access Control?" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2915 msgid "" "A lot of administrators setting up Subversion for the first time tend to " "jump into path-based access control without giving it a lot of thought. The " "administrator usually knows which teams of people are working on which " "projects, so it's easy to jump in and grant certain teams access to certain " "directories and not others. It seems like a natural thing, and it appeases " "the administrator's desire to maintain tight control of the repository." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2924 msgid "" "Note, though, that there are often invisible (and visible!) costs associated " "with this feature. In the visible category, the server needs to do a lot " "more work to ensure that the user has the right to read or write each " "specific path; in certain situations, there's very noticeable performance " "loss. In the invisible category, consider the culture you're creating. " "Most of the time, while certain users <emphasis>shouldn't</emphasis> be " "committing changes to certain parts of the repository, that social contract " "doesn't need to be technologically enforced. Teams can sometimes " "spontaneously collaborate with each other; someone may want to help someone " "else out by committing to an area she doesn't normally work on. By " "preventing this sort of thing at the server level, you're setting up " "barriers to unexpected collaboration. You're also creating a bunch of rules " "that need to be maintained as projects develop, new users are added, and so " "on. It's a bunch of extra work to maintain." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2943 msgid "" "Remember that this is a version control system! Even if somebody " "accidentally commits a change to something she shouldn't, it's easy to undo " "the change. And if a user commits to the wrong place with deliberate " "malice, it's a social problem anyway, and that the problem needs to be dealt " "with outside Subversion." msgstr "" # type: Content of: <chapter><sect1><sidebar><para><footnote> #: ../en/book/ch06-server-configuration.xml:2950 msgid "" "So, before you begin restricting users' access rights, ask yourself whether " "there's a real, honest need for this, or whether it's just something that " "<quote>sounds good</quote> to an administrator. Decide whether it's worth " "sacrificing some server speed, and remember that there's very little risk " "involved; it's bad to become dependent on technology as a crutch for social " "problems. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sidebar><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:2958 msgid "A common theme in this book!" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2962 msgid "" "As an example to ponder, consider that the Subversion project itself has " "always had a notion of who is allowed to commit where, but it's always been " "enforced socially. This is a good model of community trust, especially for " "open source projects. Of course, sometimes there <emphasis>are</emphasis> " "truly legitimate needs for path-based access control; within corporations, " "for example, certain types of data really can be sensitive, and access needs " "to be genuinely restricted to small groups of people." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:2974 msgid "" "Once your server knows where to find your rules file, it's time to define " "the rules." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:2977 msgid "" "The syntax of the file is the same familiar one used by <filename>svnserve." "conf</filename> and the runtime configuration files. Lines that start with " "a hash (<literal>#</literal>) are ignored. In its simplest form, each " "section names a repository and path within it, as well as the authenticated " "usernames are the option names within each section. The value of each " "option describes the user's level of access to the repository path: either " "<literal>r</literal> (read-only) or <literal>rw</literal> (read/write). If " "the user is not mentioned at all, no access is allowed." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:2989 msgid "" "To be more specific: the value of the section names is either of the form " "<literal>[repos-name:path]</literal> or of the form <literal>[path]</" "literal>. If you're using the <literal>SVNParentPath</literal> directive, " "it's important to specify the repository names in your sections. If you " "omit them, a section such as <literal>[/some/dir]</literal> will match the " "path <filename>/some/dir</filename> in <emphasis>every</emphasis> " "repository. If you're using the <literal>SVNPath</literal> directive, " "however, it's fine to only define paths in your sections—after all, " "there's only one repository." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3001 #, no-wrap msgid "" "\n" "[calc:/branches/calc/bug-142]\n" "harry = rw\n" "sally = r\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3007 msgid "" "In this first example, the user <literal>harry</literal> has full read and " "write access on the <filename>/branches/calc/bug-142</filename> directory in " "the <literal>calc</literal> repository, but the user <literal>sally</" "literal> has read-only access. Any other users are blocked from accessing " "this directory." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3014 msgid "" "Of course, permissions are inherited from parent to child directory. That " "means we can specify a subdirectory with a different access policy for Sally:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3018 #, no-wrap msgid "" "\n" "[calc:/branches/calc/bug-142]\n" "harry = rw\n" "sally = r\n" "\n" "# give sally write access only to the 'testing' subdir\n" "[calc:/branches/calc/bug-142/testing]\n" "sally = rw\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3028 msgid "" "Now Sally can write to the <filename>testing</filename> subdirectory of the " "branch, but can still only read other parts. Harry, meanwhile, continues to " "have complete read/write access to the whole branch." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3033 msgid "" "It's also possible to explicitly deny permission to someone via inheritance " "rules, by setting the username variable to nothing:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3037 #, no-wrap msgid "" "\n" "[calc:/branches/calc/bug-142]\n" "harry = rw\n" "sally = r\n" "\n" "[calc:/branches/calc/bug-142/secret]\n" "harry =\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3046 msgid "" "In this example, Harry has read/write access to the entire <filename>bug-" "142</filename> tree, but has absolutely no access at all to the " "<filename>secret</filename> subdirectory within it." msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch06-server-configuration.xml:3052 msgid "" "The thing to remember is that the most specific path always matches first. " "The server tries to match the path itself, and then the parent of the path, " "then the parent of that, and so on. The net effect is that mentioning a " "specific path in the access file will always override any permissions " "inherited from parent directories." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3060 msgid "" "By default, nobody has any access to the repository at all. That means that " "if you're starting with an empty file, you'll probably want to give at least " "read permission to all users at the root of the repository. You can do this " "by using the asterisk variable (<literal>*</literal>), which means " "<quote>all users</quote>:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3067 #, no-wrap msgid "" "\n" "[/]\n" "* = r\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3072 msgid "" "This is a common setup; notice that no repository name is mentioned in the " "section name. This makes all repositories world-readable to all users. Once " "all users have read access to the repositories, you can give explicit " "<literal>rw</literal> permission to certain users on specific subdirectories " "within specific repositories." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3079 msgid "" "The asterisk variable (<literal>*</literal>) is also worth special mention " "because it's the <emphasis>only</emphasis> pattern that matches an anonymous " "user. If you've configured your server block to allow a mixture of " "anonymous and authenticated access, all users start out accessing " "anonymously. The server looks for a <literal>*</literal> value defined for " "the path being accessed; if it can't find one, it demands real " "authentication from the client." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3089 msgid "" "The access file also allows you to define whole groups of users, much like " "the Unix <filename>/etc/group</filename> file:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3093 #, no-wrap msgid "" "\n" "[groups]\n" "calc-developers = harry, sally, joe\n" "paint-developers = frank, sally, jane\n" "everyone = harry, sally, joe, frank, sally, jane\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3100 msgid "" "Groups can be granted access control just like users. Distinguish them with " "an <quote>at</quote> (<literal>@</literal>) prefix:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3104 #, no-wrap msgid "" "\n" "[calc:/projects/calc]\n" "@calc-developers = rw\n" "\n" "[paint:/projects/paint]\n" "jane = r\n" "@paint-developers = rw\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3113 msgid "" "Another important fact is that the <emphasis>first</emphasis> matching rule " "is the one which gets applied to a user. In the prior example, even though " "Jane is a member of the <literal>paint-developers</literal> group (which has " "read/write access), the <literal>jane = r</literal> rule will be discovered " "and matched before the group rule, thus denying Jane write access." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3121 msgid "Groups can also be defined to contain other groups:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3123 #, no-wrap msgid "" "\n" "[groups]\n" "calc-developers = harry, sally, joe\n" "paint-developers = frank, sally, jane\n" "everyone = @calc-developers, @paint-developers\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3130 msgid "" "Subversion 1.5 brings another useful feature to the access file syntax: " "username aliases. Some authentication systems expect and carry relatively " "short usernames of the sorts we've been describing here—" "<literal>harry</literal>, <literal>sally</literal>, <literal>joe</literal>, " "and so on. But other authentication systems—such as those which use " "LDAP stores or SSL client certificates—may carry much more complex " "usernames. For example, Harry's username in an LDAP-protected system might " "be <literal>CN=Harold Hacker,OU=Engineers,DC=red-bean,DC=com</literal>. " "With usernames like that, the access file can become quite bloated with long " "or obscure usernames that are easy to mistype. Fortunately, username " "aliases allow you to have to type the correct complex username only once, in " "a statement which assigns to it a more easily digestable alias." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3146 #, no-wrap msgid "" "\n" "[aliases]\n" "harry = CN=Harold Hacker,OU=Engineers,DC=red-bean,DC=com\n" "sally = CN=Sally Swatterbug,OU=Engineers,DC=red-bean,DC=com\n" "joe = CN=Gerald I. Joseph,OU=Engineers,DC=red-bean,DC=com\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3154 msgid "" "Once you've defined a set of aliases, you can refer to the users elsewhere " "in the access file via their aliases in all the same places you could have " "instead used their actual usernames. Simply prepend an ampersand to the " "alias to distinguish it from a regular username:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3160 #, no-wrap msgid "" "\n" "[groups]\n" "calc-developers = &harry, &sally, &joe\n" "paint-developers = &frank, &sally, &jane\n" "everyone = @calc-developers, @paint-developers\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3167 msgid "" "You might also choose to use aliases if your users' usernames change " "frequently. Doing so allows you to need to update only the aliases table " "when these username changes occur, instead of doing global-search-and-" "replace operations on the whole access file." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch06-server-configuration.xml:3177 msgid "Partial Readability and Checkouts" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:3179 msgid "" "If you're using Apache as your Subversion server and have made certain " "subdirectories of your repository unreadable to certain users, you need to " "be aware of a possible nonoptimal behavior with <command>svn checkout</" "command>." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:3184 msgid "" "When the client requests a checkout or update over HTTP, it makes a single " "server request and receives a single (often large) server response. When " "the server receives the request, that is the <emphasis>only</emphasis> " "opportunity Apache has to demand user authentication. This has some odd " "side effects. For example, if a certain subdirectory of the repository is " "readable only by user Sally, and user Harry checks out a parent directory, " "his client will respond to the initial authentication challenge as Harry. " "As the server generates the large response, there's no way it can resend an " "authentication challenge when it reaches the special subdirectory; thus the " "subdirectory is skipped altogether, rather than asking the user to " "reauthenticate as Sally at the right moment. In a similar way, if the root " "of the repository is anonymously world-readable, the entire checkout will be " "done without authentication—again, skipping the unreadable directory, " "rather than asking for authentication partway through." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:3210 msgid "Supporting Multiple Repository Access Methods" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3212 msgid "" "You've seen how a repository can be accessed in many different ways. But is " "it possible—or safe—for your repository to be accessed by " "multiple methods simultaneously? The answer is yes, provided you use a bit " "of foresight." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3217 msgid "" "At any given time, these processes may require read and write access to your " "repository:" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3222 msgid "" "Regular system users using a Subversion client (as themselves) to access the " "repository directly via <literal>file://</literal> URLs" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3227 msgid "" "Regular system users connecting to SSH-spawned private <command>svnserve</" "command> processes (running as themselves), which access the repository" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3232 msgid "" "An <command>svnserve</command> process—either a daemon or one launched " "by <command>inetd</command>—running as a particular fixed user" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3238 msgid "" "An Apache <command>httpd</command> process, running as a particular fixed " "user" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3243 msgid "" "The most common problem administrators run into is repository ownership and " "permissions. Does every process (or user) in the preceding list have the " "rights to read and write the repository's underlying data files? Assuming " "you have a Unix-like operating system, a straightforward approach might be " "to place every potential repository user into a new <literal>svn</literal> " "group, and make the repository wholly owned by that group. But even that's " "not enough, because a process may write to the database files using an " "unfriendly umask—one that prevents access by other users." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3254 msgid "" "So the next step beyond setting up a common group for repository users is to " "force every repository-accessing process to use a sane umask. For users " "accessing the repository directly, you can make the <command>svn</command> " "program into a wrapper script that first runs <userinput>umask 002</" "userinput> and then runs the real <command>svn</command> client program. " "You can write a similar wrapper script for the <command>svnserve</command> " "program, and add a <userinput>umask 002</userinput> command to Apache's own " "startup script, <filename>apachectl</filename>. For example:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3265 #, no-wrap msgid "" "\n" "$ cat /usr/bin/svn\n" "\n" "#!/bin/sh\n" "\n" "umask 002\n" "/usr/bin/svn-real \"$@\"\n" "\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3275 msgid "" "Another common problem is often encountered on Unix-like systems. If your " "repository is backed by Berkeley DB, for example, it occasionally creates " "new log files to journal its actions. Even if the Berkeley DB repository is " "wholly owned by the <command>svn</command> group, these newly created log " "files won't necessarily be owned by that same group, which then creates more " "permissions problems for your users. A good workaround is to set the group " "SUID bit on the repository's <filename>db</filename> directory. This causes " "all newly created log files to have the same group owner as the parent " "directory." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3287 msgid "" "Once you've jumped through these hoops, your repository should be accessible " "by all the necessary processes. It may seem a bit messy and complicated, " "but the problems of having multiple users sharing write access to common " "files are classic ones that are not often elegantly solved." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3293 msgid "" "Fortunately, most repository administrators will never <emphasis>need</" "emphasis> to have such a complex configuration. Users who wish to access " "repositories that live on the same machine are not limited to using " "<literal>file://</literal> access URLs—they can typically contact the " "Apache HTTP server or <command>svnserve</command> using <literal>localhost</" "literal> for the server name in their <literal>http://</literal> or " "<literal>svn://</literal> URL. And maintaining multiple server processes " "for your Subversion repositories is likely to be more of a headache than " "necessary. We recommend that you choose a single server that best meets " "your needs and stick with it!" msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch06-server-configuration.xml:3307 msgid "The svn+ssh:// Server Checklist" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:3309 msgid "" "It can be quite tricky to get a bunch of users with existing SSH accounts to " "share a repository without permissions problems. If you're confused about " "all the things that you (as an administrator) need to do on a Unix-like " "system, here's a quick checklist that resummarizes some of the topics " "discussed in this section:" msgstr "" # type: Content of: <chapter><sect1><sidebar><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3318 msgid "" "All of your SSH users need to be able to read and write to the repository, " "so put all the SSH users into a single group." msgstr "" # type: Content of: <chapter><sect1><sidebar><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3324 msgid "Make the repository wholly owned by that group." msgstr "" # type: Content of: <chapter><sect1><sidebar><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3328 msgid "Set the group permissions to read/write." msgstr "" # type: Content of: <chapter><sect1><sidebar><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3332 msgid "" "Your users need to use a sane umask when accessing the repository, so make " "sure <command>svnserve</command> (<filename>/usr/bin/svnserve</filename>, or " "wherever it lives in <literal>$PATH</literal>) is actually a wrapper script " "that runs <userinput>umask 002</userinput> and executes the real " "<command>svnserve</command> binary." msgstr "" # type: Content of: <chapter><sect1><sidebar><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3340 msgid "" "Take similar measures when using <command>svnlook</command> and " "<command>svnadmin</command>. Either run them with a sane umask or wrap them " "as just described." msgstr "" # type: Content of: <chapter><title> #: ../en/book/ch07-customizing-svn.xml:2 msgid "Customizing Your Subversion Experience" msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch07-customizing-svn.xml:4 msgid "" "Version control can be a complex subject, as much art as science, that " "offers myriad ways of getting stuff done. Throughout this book, you've read " "of the various Subversion command-line client subcommands and the options " "that modify their behavior. In this chapter, we'll look into still more " "ways to customize the way Subversion works for you—setting up the " "Subversion runtime configuration, using external helper applications, " "Subversion's interaction with the operating system's configured locale, and " "so on." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch07-customizing-svn.xml:24 msgid "Runtime Configuration Area" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:26 msgid "" "Subversion provides many optional behaviors that the user can control. Many " "of these options are of the kind that a user would wish to apply to all " "Subversion operations. So, rather than forcing users to remember command-" "line arguments for specifying these options and to use them for every " "operation they perform, Subversion uses configuration files, segregated into " "a Subversion configuration area." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:34 msgid "" "The Subversion <firstterm>configuration area</firstterm> is a two-tiered " "hierarchy of option names and their values. Usually, this boils down to a " "special directory that contains <firstterm>configuration files</firstterm> " "(the first tier), which are just text files in standard INI format (with " "<quote>sections</quote> providing the second tier). You can easily edit " "these files using your favorite text editor (such as Emacs or vi), and they " "contain directives read by the client to determine which of several optional " "behaviors the user prefers." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:47 msgid "Configuration Area Layout" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch07-customizing-svn.xml:49 msgid "" "The first time the <command>svn</command> command-line client is executed, " "it creates a per-user configuration area. On Unix-like systems, this area " "appears as a directory named <filename>.subversion</filename> in the user's " "home directory. On Win32 systems, Subversion creates a folder named " "<filename>Subversion</filename>, typically inside the <filename>Application " "Data</filename> area of the user's profile directory (which, by the way, is " "usually a hidden directory). However, on this platform, the exact location " "differs from system to system and is dictated by the Windows Registry. " "<footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch07-customizing-svn.xml:61 msgid "" "The <literal>APPDATA</literal> environment variable points to the " "<filename>Application Data</filename> area, so you can always refer to this " "folder as <filename>%APPDATA%\\Subversion</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:65 msgid "" "</footnote> We will refer to the per-user configuration area using its Unix " "name, <filename>.subversion</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:69 msgid "" "In addition to the per-user configuration area, Subversion also recognizes " "the existence of a system-wide configuration area. This gives system " "administrators the ability to establish defaults for all users on a given " "machine. Note that the system-wide configuration area alone does not " "dictate mandatory policy—the settings in the per-user configuration " "area override those in the system-wide one, and command-line arguments " "supplied to the <command>svn</command> program have the final word on " "behavior. On Unix-like platforms, the system-wide configuration area is " "expected to be the <filename>/etc/subversion</filename> directory; on " "Windows machines, it looks for a <filename>Subversion</filename> directory " "inside the common <filename>Application Data</filename> location (again, as " "specified by the Windows Registry). Unlike the per-user case, the " "<command>svn</command> program does not attempt to create the system-wide " "configuration area." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:87 msgid "" "The per-user configuration area currently contains three files—two " "configuration files (<filename>config</filename> and <filename>servers</" "filename>), and a <filename>README.txt</filename> file, which describes the " "INI format. At the time of their creation, the files contain default values " "for each of the supported Subversion options, mostly commented out and " "grouped with textual descriptions about how the values for the key affect " "Subversion's behavior. To change a certain behavior, you need only to load " "the appropriate configuration file into a text editor, and to modify the " "desired option's value. If at any time you wish to have the default " "configuration settings restored, you can simply remove (or rename) your " "configuration directory and then run some innocuous <command>svn</command> " "command, such as <userinput>svn --version</userinput>. A new configuration " "directory with the default contents will be created." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:104 msgid "" "The per-user configuration area also contains a cache of authentication " "data. The <filename>auth</filename> directory holds a set of subdirectories " "that contain pieces of cached information used by Subversion's various " "supported authentication methods. This directory is created in such a way " "that only the user herself has permission to read its contents." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:116 msgid "Configuration and the Windows Registry" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:118 msgid "" "In addition to the usual INI-based configuration area, Subversion clients " "running on Windows platforms may also use the Windows Registry to hold the " "configuration data. The option names and their values are the same as in " "the INI files. The <quote>file/section</quote> hierarchy is preserved as " "well, though addressed in a slightly different fashion—in this schema, " "files and sections are just levels in the Registry key tree." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:127 msgid "" "Subversion looks for system-wide configuration values under the " "<literal>HKEY_LOCAL_MACHINE\\Software\\Tigris.org\\Subversion</literal> " "key. For example, the <literal>global-ignores</literal> option, which is in " "the <literal>miscellany</literal> section of the <filename>config</filename> " "file, would be found at <literal>HKEY_LOCAL_MACHINE\\Software\\Tigris.org" "\\Subversion\\Config\\Miscellany\\global-ignores</literal>. Per-user " "configuration values should be stored under <literal>HKEY_CURRENT_USER" "\\Software\\Tigris.org\\Subversion</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:138 msgid "" "Registry-based configuration options are parsed <emphasis>before</emphasis> " "their file-based counterparts, so they are overridden by values found in the " "configuration files. In other words, Subversion looks for configuration " "information in the following locations on a Windows system; lower-numbered " "locations take precedence over higher-numbered locations:" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:147 msgid "Command-line options" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:150 msgid "The per-user INI files" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:153 msgid "The per-user Registry values" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:156 msgid "The system-wide INI files" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:159 msgid "The system-wide Registry values" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:163 msgid "" "Also, the Windows Registry doesn't really support the notion of something " "being <quote>commented out.</quote> However, Subversion will ignore any " "option key whose name begins with a hash (<literal>#</literal>) character. " "This allows you to effectively comment out a Subversion option without " "deleting the entire key from the Registry, obviously simplifying the process " "of restoring that option." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:171 msgid "" "The <command>svn</command> command-line client never attempts to write to " "the Windows Registry and will not attempt to create a default configuration " "area there. You can create the keys you need using the <command>REGEDIT</" "command> program. Alternatively, you can create a <filename>.reg</filename> " "file (such as the one in <xref linkend=\"svn.advanced.confarea.windows-" "registry.ex-1\" />), and then double-click on that file's icon in the " "Explorer shell, which will cause the data to be merged into your Registry." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch07-customizing-svn.xml:183 msgid "Sample registration entries (.reg) file" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch07-customizing-svn.xml:185 #, no-wrap msgid "" "\n" "REGEDIT4\n" "\n" "[HKEY_LOCAL_MACHINE\\Software\\Tigris.org\\Subversion\\Servers\\groups]\n" "\n" "[HKEY_LOCAL_MACHINE\\Software\\Tigris.org\\Subversion\\Servers\\global]\n" "\"#http-proxy-host\"=\"\"\n" "\"#http-proxy-port\"=\"\"\n" "\"#http-proxy-username\"=\"\"\n" "\"#http-proxy-password\"=\"\"\n" "\"#http-proxy-exceptions\"=\"\"\n" "\"#http-timeout\"=\"0\"\n" "\"#http-compression\"=\"yes\"\n" "\"#neon-debug-mask\"=\"\"\n" "\"#ssl-authority-files\"=\"\"\n" "\"#ssl-trust-default-ca\"=\"\"\n" "\"#ssl-client-cert-file\"=\"\"\n" "\"#ssl-client-cert-password\"=\"\"\n" "\n" "[HKEY_CURRENT_USER\\Software\\Tigris.org\\Subversion\\Config\\auth]\n" "\"#store-passwords\"=\"yes\"\n" "\"#store-auth-creds\"=\"yes\"\n" "\n" "[HKEY_CURRENT_USER\\Software\\Tigris.org\\Subversion\\Config\\helpers]\n" "\"#editor-cmd\"=\"notepad\"\n" "\"#diff-cmd\"=\"\"\n" "\"#diff3-cmd\"=\"\"\n" "\"#diff3-has-program-arg\"=\"\"\n" "\n" "[HKEY_CURRENT_USER\\Software\\Tigris.org\\Subversion\\Config\\tunnels]\n" "\n" "[HKEY_CURRENT_USER\\Software\\Tigris.org\\Subversion\\Config\\miscellany]\n" "\"#global-ignores\"=\"*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store\"\n" "\"#log-encoding\"=\"\"\n" "\"#use-commit-times\"=\"\"\n" "\"#no-unlock\"=\"\"\n" "\"#enable-auto-props\"=\"\"\n" "\n" "[HKEY_CURRENT_USER\\Software\\Tigris.org\\Subversion\\Config\\auto-props]\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:227 msgid "" "The previous example shows the contents of a <filename>.reg</filename> file, " "which contains some of the most commonly used configuration options and " "their default values. Note the presence of both system-wide (for network " "proxy-related options) and per-user settings (editor programs and password " "storage, among others). Also note that all the options are effectively " "commented out. You need only to remove the hash (<literal>#</literal>) " "character from the beginning of the option names and set the values as you " "desire." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:242 msgid "Configuration Options" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:246 msgid "" "In this section, we will discuss the specific runtime configuration options " "that Subversion currently supports." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch07-customizing-svn.xml:252 msgid "Servers" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:254 msgid "" "The <filename>servers</filename> file contains Subversion configuration " "options related to the network layers. There are two special section names " "in this file—<literal>groups</literal> and <literal>global</literal>. " "The <literal>groups</literal> section is essentially a cross-reference " "table. The keys in this section are the names of other sections in the " "file; their values are <firstterm>globs</firstterm>—textual tokens " "that possibly contain wildcard characters—that are compared against " "the hostnames of the machine to which Subversion requests are sent." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><programlisting> #: ../en/book/ch07-customizing-svn.xml:266 #, no-wrap msgid "" "\n" "[groups]\n" "beanie-babies = *.red-bean.com\n" "collabnet = svn.collab.net\n" "\n" "[beanie-babies]\n" "…\n" "\n" "[collabnet]\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:278 msgid "" "When Subversion is used over a network, it attempts to match the name of the " "server it is trying to reach with a group name under the <literal>groups</" "literal> section. If a match is made, Subversion then looks for a section " "in the <filename>servers</filename> file whose name is the matched group's " "name. From that section, it reads the actual network configuration settings." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:286 msgid "" "The <literal>global</literal> section contains the settings that are meant " "for all of the servers not matched by one of the globs under the " "<literal>groups</literal> section. The options available in this section " "are exactly the same as those that are valid for the other server sections " "in the file (except, of course, the special <literal>groups</literal> " "section), and are as follows:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:297 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-proxy-exceptions</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:299 msgid "" "This specifies a comma-separated list of patterns for repository hostnames " "that should be accessed directly, without using the proxy machine. The " "pattern syntax is the same as is used in the Unix shell for filenames. A " "repository hostname matching any of these patterns will not be proxied." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:308 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-proxy-host</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:310 msgid "" "This specifies the hostname of the proxy computer through which your HTTP-" "based Subversion requests must pass. It defaults to an empty value, which " "means that Subversion will not attempt to route HTTP requests through a " "proxy computer, and will instead attempt to contact the destination machine " "directly." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:319 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>http-proxy-port</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:321 msgid "" "This specifies the port number on the proxy host to use. It defaults to an " "empty value." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:326 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-proxy-username</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:328 msgid "" "This specifies the username to supply to the proxy machine. It defaults to " "an empty value." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:333 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-proxy-password</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:335 msgid "" "This specifies the password to supply to the proxy machine. It defaults to " "an empty value." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:340 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>http-timeout</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:342 msgid "" "This specifies the amount of time, in seconds, to wait for a server " "response. If you experience problems with a slow network connection causing " "Subversion operations to time out, you should increase the value of this " "option. The default value is <literal>0</literal>, which instructs the " "underlying HTTP library, Neon, to use its default timeout setting." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:353 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-compression</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:355 msgid "" "This specifies whether Subversion should attempt to compress network " "requests made to DAV-ready servers. The default value is <literal>yes</" "literal> (though compression will occur only if that capability is compiled " "into the network layer). Set this to <literal>no</literal> to disable " "compression, such as when debugging network transmissions." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:365 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>http-library</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:367 msgid "" "Subversion provides a pair of repository access modules that understand its " "WebDAV network protocol. The original one, which shipped with Subversion " "1.0, is <literal>libsvn_ra_neon</literal> (though back then it was called " "<literal>libsvn_ra_dav</literal>). Newer Subversion versions also provide " "<literal>libsvn_ra_serf</literal>, which uses a different underlying " "implementation and aims to support some of the newer HTTP concepts." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:377 msgid "" "At this point, <literal>libsvn_ra_serf</literal> is still considered " "experimental, though it appears to work in the common cases quite well. To " "encourage experimentation, Subversion provides the <literal>http-library</" "literal> runtime configuration option to allow users to specify (generally, " "or in a per-server-group fashion) which WebDAV access module they'd prefer " "to use—<literal>neon</literal> or <literal>serf</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:389 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-auth-types</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:391 msgid "" "This option is a semicolon-delimited list of authentication types supported " "by the Neon-based WebDAV repository access modules. Valid members of this " "list are <literal>basic</literal>, <literal>digest</literal>, and " "<literal>negotiate</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:400 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>neon-debug-mask</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:402 msgid "" "This is an integer mask that the underlying HTTP library, Neon, uses for " "choosing what type of debugging output to yield. The default value is " "<literal>0</literal>, which will silence all debugging output. For more " "information about how Subversion makes use of Neon, see <xref linkend=\"svn." "developer\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:411 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>ssl-authority-files</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:413 msgid "" "This is a semicolon-delimited list of paths to files containing certificates " "of the certificate authorities (or CAs) that are accepted by the Subversion " "client when accessing the repository over HTTPS." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:421 #, fuzzy #| msgid "<literal>svn+ssh://</literal>" msgid "<literal>ssl-trust-default-ca</literal>" msgstr "<literal>svn+ssh://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:423 msgid "" "Set this variable to <literal>yes</literal> if you want Subversion to " "automatically trust the set of default CAs that ship with OpenSSL." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:429 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>ssl-client-cert-file</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:431 msgid "" "If a host (or set of hosts) requires an SSL client certificate, you'll " "normally be prompted for a path to your certificate. By setting this " "variable to that same path, Subversion will be able to find your client " "certificate automatically without prompting you. There's no standard place " "to store your certificate on disk; Subversion will grab it from any path you " "specify." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:442 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>ssl-client-cert-password</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:444 msgid "" "If your SSL client certificate file is encrypted by a passphrase, Subversion " "will prompt you for the passphrase whenever the certificate is used. If you " "find this annoying (and don't mind storing the password in the " "<filename>servers</filename> file), you can set this variable to the " "certificate's passphrase. You won't be prompted anymore." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch07-customizing-svn.xml:459 msgid "Config" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:461 msgid "" "The <filename>config</filename> file contains the rest of the currently " "available Subversion runtime options—those not related to networking. " "There are only a few options in use as of this writing, but they are again " "grouped into sections in expectation of future additions." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:468 msgid "" "The <literal>auth</literal> section contains settings related to " "Subversion's authentication and authorization against the repository. It " "contains the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:474 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>store-passwords</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:476 msgid "" "This instructs Subversion to cache, or not to cache, passwords that are " "supplied by the user in response to server authentication challenges. The " "default value is <literal>yes</literal>. Set this to <literal>no</literal> " "to disable this on-disk password caching. You can override this option for " "a single instance of the <command>svn</command> command using the <option>--" "no-auth-cache</option> command-line parameter (for those subcommands that " "support it). For more information, see <xref linkend=\"svn.serverconfig." "netmodel.credcache\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:490 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>store-auth-creds</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:492 msgid "" "This setting is the same as <literal>store-passwords</literal>, except that " "it enables or disables on-disk caching of <emphasis>all</emphasis> " "authentication information: usernames, passwords, server certificates, and " "any other types of cacheable credentials." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:502 msgid "" "The <literal>helpers</literal> section controls which external applications " "Subversion uses to accomplish its tasks. Valid options in this section are:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:508 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>editor-cmd</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:510 msgid "" "This specifies the program Subversion will use to query the user for certain " "types of textual metadata or when interactively resolving conflicts. See " "<xref linkend=\"svn.advanced.externaleditors\"/> for more details on using " "external text editors with Subversion." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:519 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>diff-cmd</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:521 msgid "" "This specifies the absolute path of a differencing program, used when " "Subversion generates <quote>diff</quote> output (such as when using the " "<command>svn diff</command> command). By default, Subversion uses an " "internal differencing library—setting this option will cause it to " "perform this task using an external program. See <xref linkend=\"svn." "advanced.externaldifftools\"/> for more details on using such programs." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:533 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>diff3-cmd</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:535 msgid "" "This specifies the absolute path of a three-way differencing program. " "Subversion uses this program to merge changes made by the user with those " "received from the repository. By default, Subversion uses an internal " "differencing library—setting this option will cause it to perform this " "task using an external program. See <xref linkend=\"svn.advanced." "externaldifftools\"/> for more details on using such programs." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:547 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>diff3-has-program-arg</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:549 msgid "" "This flag should be set to <literal>true</literal> if the program specified " "by the <literal>diff3-cmd</literal> option accepts a <option>--diff-program</" "option> command-line parameter." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:557 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>merge-tool-cmd</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:559 msgid "" "This specifies the program that Subversion will use to perform three-way " "merge operations on your versioned files. See <xref linkend=\"svn.advanced." "externaldifftools\"/> for more details on using such programs." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:568 msgid "" "The <literal>tunnels</literal> section allows you to define new tunnel " "schemes for use with <command>svnserve</command> and <literal>svn://</" "literal> client connections. For more details, see <xref linkend=\"svn." "serverconfig.svnserve.sshauth\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch07-customizing-svn.xml:574 msgid "" "The <literal>miscellany</literal> section is where everything that doesn't " "belong elsewhere winds up. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch07-customizing-svn.xml:577 msgid "Anyone for potluck dinner?" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:578 msgid "</footnote> In this section, you can find:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:583 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>global-ignores</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:585 msgid "" "When running the <command>svn status</command> command, Subversion lists " "unversioned files and directories along with the versioned ones, annotating " "them with a <literal>?</literal> character (see <xref linkend=\"svn.tour." "cycle.examine.status\" />). Sometimes it can be annoying to see " "uninteresting, unversioned items—for example, object files that result " "from a program's compilation—in this display. The <literal>global-" "ignores</literal> option is a list of whitespace-delimited globs that " "describe the names of files and directories that Subversion should not " "display unless they are versioned. The default value is <literal>*.o *.lo *." "la #*# .*.rej *.rej .*~ *~ .#* .DS_Store</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:600 msgid "" "As well as <command>svn status</command>, the <command>svn add</command> and " "<command>svn import</command> commands also ignore files that match the list " "when they are scanning a directory. You can override this behavior for a " "single instance of any of these commands by explicitly specifying the " "filename, or by using the <option>--no-ignore</option> command-line flag." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:608 msgid "" "For information on finer-grained control of ignored items, see <xref linkend=" "\"svn.advanced.props.special.ignore\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:615 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>enable-auto-props</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:617 msgid "" "This instructs Subversion to automatically set properties on newly added or " "imported files. The default value is <literal>no</literal>, so set this to " "<literal>yes</literal> to enable this feature. The <literal>auto-props</" "literal> section of this file specifies which properties are to be set on " "which files." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:627 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>log-encoding</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:629 msgid "" "This variable sets the default character set encoding for commit log " "messages. It's a permanent form of the <option>--encoding</option> option " "(see <xref linkend=\"svn.ref.svn.sw\"/>). The Subversion repository stores " "log messages in UTF-8 and assumes that your log message is written using " "your operating system's native locale. You should specify a different " "encoding if your commit messages are written in any other encoding." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:642 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>use-commit-times</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:644 msgid "" "Normally your working copy files have timestamps that reflect the last time " "they were touched by any process, whether your own editor or some " "<command>svn</command> subcommand. This is generally convenient for people " "developing software, because build systems often look at timestamps as a way " "of deciding which files need to be recompiled." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:652 msgid "" "In other situations, however, it's sometimes nice for the working copy files " "to have timestamps that reflect the last time they were changed in the " "repository. The <command>svn export</command> command always places these " "<quote>last-commit timestamps</quote> on trees that it produces. By setting " "this config variable to <literal>yes</literal>, the <command>svn checkout</" "command>, <command>svn update</command>, <command>svn switch</command>, and " "<command>svn revert</command> commands will also set last-commit timestamps " "on files that they touch." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:668 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>mime-types-file</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:670 msgid "" "This option, new to Subversion 1.5, specifies the path of a MIME types " "mapping file, such as the <filename>mime.types</filename> file provided by " "the Apache HTTP Server. Subversion uses this file to assign MIME types to " "newly added or imported files. See <xref linkend=\"svn.advanced.props.auto" "\" /> and <xref linkend=\"svn.advanced.props.special.mime-type\" /> for more " "about Subversion's detection and use of file content types." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:683 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>preserved-conflict-file-exts</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:685 msgid "" "The value of this option is a space-delimited list of file extensions that " "Subversion should preserve when generating conflict filenames. By default, " "the list is empty. This option is new to Subversion 1.5." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:691 msgid "" "When Subversion detects conflicting file content changes, it defers " "resolution of those conflicts to the user. To assist in the resolution, " "Subversion keeps pristine copies of the various competing versions of the " "file in the working copy. By default, those conflict files have names " "constructed by appending to the original filename a custom extension such as " "<filename>.mine</filename> or <filename>.<replaceable>REV</replaceable></" "filename> (where <replaceable>REV</replaceable> is a revision number). A " "mild annoyance with this naming scheme is that on operating systems where a " "file's extension determines the default application used to open and edit " "that file, appending a custom extension prevents the file from being easily " "opened by its native application. For example, if the file " "<filename>ReleaseNotes.pdf</filename> was conflicted, the conflict files " "might be named <filename>ReleaseNotes.pdf.mine</filename> or " "<filename>ReleaseNotes.pdf.r4231</filename>. While your system might be " "configured to use Adobe's Acrobat Reader to open files whose extensions are " "<filename>.pdf</filename>, there probably isn't an application configured on " "your system to open all files whose extensions are <filename>.r4231</" "filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:718 msgid "" "You can fix this annoyance by using this configuration option, though. For " "files with one of the specified extensions, Subversion will append to the " "conflict file names the custom extension just as before, but then also " "reappend the file's original extension. Using the previous example, and " "assuming that <literal>pdf</literal> is one of the extensions configured in " "this list thereof, the conflict files generated for <filename>ReleaseNotes." "pdf</filename> would instead be named <filename>ReleaseNotes.pdf.mine.pdf</" "filename> and <filename>ReleaseNotes.pdf.r4231.pdf</filename>. Because each " "file ends in <filename>.pdf</filename>, the correct default application will " "be used to view them." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:737 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>interactive-conflicts</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:739 msgid "" "This is a Boolean option that specifies whether Subversion should try to " "resolve conflicts interactively. If its value is <literal>yes</literal> " "(which is the default value), Subversion will prompt the user for how to " "handle conflicts in the manner demonstrated in <xref linkend=\"svn.tour." "cycle.resolve\" />. Otherwise, it will simply flag the conflict and " "continue its operation, postponing resolution to a later time." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:752 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>no-unlock</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:754 msgid "" "This Boolean option corresponds to <command>svn commit</command>'s <option>--" "no-unlock</option> option, which tells Subversion not to release locks on " "files you've just committed. If this runtime option is set to <literal>yes</" "literal>, Subversion will never release locks automatically, leaving you to " "run <command>svn unlock</command> explicitly. It defaults to <literal>no</" "literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:768 msgid "" "The <literal>auto-props</literal> section controls the Subversion client's " "ability to automatically set properties on files when they are added or " "imported. It contains any number of key-value pairs in the format " "<literal>PATTERN = PROPNAME=PROPVALUE</literal>, where <literal>PATTERN</" "literal> is a file pattern that matches a set of filenames and the rest of " "the line is the property and its value. Multiple matches on a file will " "result in multiple propsets for that file; however, there is no guarantee " "that auto-props will be applied in the order in which they are listed in the " "config file, so you can't have one rule <quote>override</quote> another. " "You can find several examples of auto-props usage in the <filename>config</" "filename> file. Lastly, don't forget to set <literal>enable-auto-props</" "literal> to <literal>yes</literal> in the <literal>miscellany</literal> " "section if you want to enable auto-props." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch07-customizing-svn.xml:796 msgid "Localization" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:798 msgid "" "<firstterm>Localization</firstterm> is the act of making programs behave in " "a region-specific way. When a program formats numbers or dates in a way " "specific to your part of the world or prints messages (or accepts input) in " "your native language, the program is said to be <firstterm>localized</" "firstterm>. This section describes steps Subversion has made toward " "localization." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:808 msgid "Understanding Locales" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:810 msgid "" "Most modern operating systems have a notion of the <quote>current locale</" "quote>—that is, the region or country whose localization conventions " "are honored. These conventions—typically chosen by some runtime " "configuration mechanism on the computer—affect the way in which " "programs present data to the user, as well as the way in which they accept " "user input." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:818 msgid "" "On most Unix-like systems, you can check the values of the locale-related " "runtime configuration options by running the <command>locale</command> " "command:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch07-customizing-svn.xml:822 #, no-wrap msgid "" "\n" "$ locale\n" "LANG=\n" "LC_COLLATE=\"C\"\n" "LC_CTYPE=\"C\"\n" "LC_MESSAGES=\"C\"\n" "LC_MONETARY=\"C\"\n" "LC_NUMERIC=\"C\"\n" "LC_TIME=\"C\"\n" "LC_ALL=\"C\"\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:835 msgid "" "The output is a list of locale-related environment variables and their " "current values. In this example, the variables are all set to the default " "<literal>C</literal> locale, but users can set these variables to specific " "country/language code combinations. For example, if one were to set the " "<literal>LC_TIME</literal> variable to <literal>fr_CA</literal>, programs " "would know to present time and date information formatted according to a " "French-speaking Canadian's expectations. And if one were to set the " "<literal>LC_MESSAGES</literal> variable to <literal>zh_TW</literal>, " "programs would know to present human-readable messages in Traditional " "Chinese. Setting the <literal>LC_ALL</literal> variable has the effect of " "changing every locale variable to the same value. The value of " "<literal>LANG</literal> is used as a default value for any locale variable " "that is unset. To see the list of available locales on a Unix system, run " "the command <userinput>locale -a</userinput>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:854 msgid "" "On Windows, locale configuration is done via the <quote>Regional and " "Language Options</quote> control panel item. There you can view and select " "the values of individual settings from the available locales, and even " "customize (at a sickening level of detail) several of the display formatting " "conventions." msgstr "" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:865 #, fuzzy #| msgid "Subversion's Components" msgid "Subversion's Use of Locales" msgstr "Die Komponenten von Subversion" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:867 msgid "" "The Subversion client, <command>svn</command>, honors the current locale " "configuration in two ways. First, it notices the value of the " "<literal>LC_MESSAGES</literal> variable and attempts to print all messages " "in the specified language. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch07-customizing-svn.xml:873 #, no-wrap msgid "" "\n" "$ export LC_MESSAGES=de_DE\n" "$ svn help cat\n" "cat: Gibt den Inhalt der angegebenen Dateien oder URLs aus.\n" "Aufruf: cat ZIEL[@REV]...\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:881 msgid "" "This behavior works identically on both Unix and Windows systems. Note, " "though, that while your operating system might have support for a certain " "locale, the Subversion client still may not be able to speak the particular " "language. In order to produce localized messages, human volunteers must " "provide translations for each language. The translations are written using " "the GNU gettext package, which results in translation modules that end with " "the <filename>.mo</filename> filename extension. For example, the German " "translation file is named <filename>de.mo</filename>. These translation " "files are installed somewhere on your system. On Unix, they typically live " "in <filename>/usr/share/locale/</filename>, while on Windows they're often " "found in the <filename>\\share\\locale\\</filename> folder in Subversion's " "installation area. Once installed, a module is named after the program for " "which it provides translations. For example, the <filename>de.mo</filename> " "file may ultimately end up installed as <filename>/usr/share/locale/de/" "LC_MESSAGES/subversion.mo</filename>. By browsing the installed <filename>." "mo</filename> files, you can see which languages the Subversion client is " "able to speak." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:904 msgid "" "The second way in which the locale is honored involves how <command>svn</" "command> interprets your input. The repository stores all paths, filenames, " "and log messages in Unicode, encoded as UTF-8. In that sense, the " "repository is <firstterm>internationalized</firstterm>—that is, the " "repository is ready to accept input in any human language. This means, " "however, that the Subversion client is responsible for sending only UTF-8 " "filenames and log messages into the repository. To do this, it must convert " "the data from the native locale into UTF-8." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:915 msgid "" "For example, suppose you create a file named <filename>caffè.txt</filename>, " "and then when committing the file, you write the log message as " "<quote>Adesso il caffè è più forte.</quote> Both the filename and the log " "message contain non-ASCII characters, but because your locale is set to " "<literal>it_IT</literal>, the Subversion client knows to interpret them as " "Italian. It uses an Italian character set to convert the data to UTF-8 " "before sending it off to the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:925 msgid "" "Note that while the repository demands UTF-8 filenames and log messages, it " "<emphasis>does not</emphasis> pay attention to file contents. Subversion " "treats file contents as opaque strings of bytes, and neither client nor " "server makes an attempt to understand the character set or encoding of the " "contents." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch07-customizing-svn.xml:933 msgid "Character Set Conversion Errors" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch07-customizing-svn.xml:935 msgid "" "While using Subversion, you might get hit with an error related to character " "set conversions:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch07-customizing-svn.xml:938 #, no-wrap msgid "" "\n" "svn: Can't convert string from native encoding to 'UTF-8':\n" "…\n" "svn: Can't convert string from 'UTF-8' to native encoding:\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch07-customizing-svn.xml:945 msgid "" "Errors such as this typically occur when the Subversion client has received " "a UTF-8 string from the repository, but not all of the characters in that " "string can be represented using the encoding of the current locale. For " "example, if your locale is <literal>en_US</literal> but a collaborator has " "committed a Japanese filename, you're likely to see this error when you " "receive the file during an <command>svn update</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch07-customizing-svn.xml:954 msgid "" "The solution is either to set your locale to something that <emphasis>can</" "emphasis> represent the incoming UTF-8 data, or to change the filename or " "log message in the repository. (And don't forget to slap your " "collaborator's hand—projects should decide on common languages ahead " "of time so that all participants are using the same locale.)" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch07-customizing-svn.xml:971 msgid "Using External Editors" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:973 msgid "" "The most obvious way to get data into Subversion is through the addition of " "files to version control, committing changes to those files, and so on. But " "other pieces of information besides merely versioned file data live in your " "Subversion repository. Some of these bits of information—commit log " "messages, lock comments, and some property values—tend to be textual " "in nature and are provided explicitly by users. Most of this information " "can be provided to the Subversion command-line client using the <option>--" "message</option> (<option>-m</option>) and <option>--file</option> (<option>-" "F</option>) options with the appropriate subcommands." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:986 msgid "" "Each of these options has its pros and cons. For example, when performing a " "commit, <option>--file</option> (<option>-F</option>) works well if you've " "already prepared a text file that holds your commit log message. If you " "didn't, though, you can use <option>--message</option> (<option>-m</option>) " "to provide a log message on the command line. Unfortunately, it can be " "tricky to compose anything more than a simple one-line message on the " "command line. Users want more flexibility—multiline, free-form log " "message editing on demand." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:997 msgid "" "Subversion supports this by allowing you to specify an external text editor " "that it will launch as necessary to give you a more powerful input mechanism " "for this textual metadata. There are several ways to tell Subversion which " "editor you'd like use. Subversion checks the following things, in the order " "specified, when it wants to launch such an editor:" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1007 msgid "<literal>--editor-cmd</literal> command-line option" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1010 msgid "<literal>SVN_EDITOR</literal> environment variable" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1013 msgid "<literal>editor-cmd</literal> runtime configuration option" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1016 msgid "<literal>VISUAL</literal> environment variable" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1019 msgid "<literal>EDITOR</literal> environment variable" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1022 msgid "" "Possibly, a fallback value built into the Subversion libraries (not present " "in the official builds)" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1027 msgid "" "The value of any of these options or variables is the beginning of a command " "line to be executed by the shell. Subversion appends to that command line a " "space and the pathname of a temporary file to be edited. So, to be used " "with Subversion, the configured or specified editor needs to support an " "invocation in which its last command-line parameter is a file to be edited, " "and it should be able to save the file in place and return a zero exit code " "to indicate success." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1036 msgid "" "As noted, external editors can be used to provide commit log messages to any " "of the committing subcommands (such as <command>svn commit</command> or " "<command>import</command>, <command>svn mkdir</command> or <command>delete</" "command> when provided a URL target, etc.), and Subversion will try to " "launch the editor automatically if you don't specify either of the <option>--" "message</option> (<option>-m</option>) or <option>--file</option> (<option>-" "F</option>) options. The <command>svn propedit</command> command is built " "almost entirely around the use of an external editor. And beginning in " "version 1.5, Subversion will also use the configured external text editor " "when the user asks it to launch an editor during interactive conflict " "resolution. Oddly, there doesn't appear to be a way to use external editors " "to interactively provide lock comments." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch07-customizing-svn.xml:1058 msgid "Using External Differencing and Merge Tools" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1060 msgid "" "The interface between Subversion and external two- and three-way " "differencing tools harkens back to a time when Subversion's only contextual " "differencing capabilities were built around invocations of the GNU diffutils " "toolchain, specifically the <command>diff</command> and <command>diff3</" "command> utilities. To get the kind of behavior Subversion needed, it " "called these utilities with more than a handful of options and parameters, " "most of which were quite specific to the utilities. Some time later, " "Subversion grew its own internal differencing library, and as a failover " "mechanism, the <option>--diff-cmd</option> and <option>--diff3-cmd</option> " "options were added to the Subversion command-line client so that users could " "more easily indicate that they preferred to use the GNU diff and diff3 " "utilities instead of the newfangled internal diff library. If those options " "were used, Subversion would simply ignore the internal diff library, and " "fall back to running those external programs, lengthy argument lists and " "all. And that's where things remain today." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1079 msgid "" "It didn't take long for folks to realize that having such easy configuration " "mechanisms for specifying that Subversion should use the external GNU diff " "and diff3 utilities located at a particular place on the system could be " "applied toward the use of other differencing tools, too. After all, " "Subversion didn't actually verify that the things it was being told to run " "were members of the GNU diffutils toolchain. But the only configurable " "aspect of using those external tools is their location on the system—" "not the option set, parameter order, and so on. Subversion continues to " "throw all those GNU utility options at your external diff tool regardless of " "whether that program can understand those options. And that's where things " "get unintuitive for most users." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1093 msgid "" "The key to using external two- and three-way differencing tools (other than " "GNU diff and diff3, of course) with Subversion is to use wrapper scripts, " "which convert the input from Subversion into something that your " "differencing tool can understand, and then to convert the output of your " "tool back into a format that Subversion expects—the format that the " "GNU tools would have used. The following sections cover the specifics of " "those expectations." msgstr "" # type: Content of: <chapter><sect1><note><para> #: ../en/book/ch07-customizing-svn.xml:1103 msgid "" "The decision on when to fire off a contextual two- or three-way diff as part " "of a larger Subversion operation is made entirely by Subversion and is " "affected by, among other things, whether the files being operated on are " "human-readable as determined by their <literal>svn:mime-type</literal> " "property. This means, for example, that even if you had the niftiest " "Microsoft Word-aware differencing or merging tool in the universe, it would " "never be invoked by Subversion as long as your versioned Word documents had " "a configured MIME type that denoted that they were not human-readable (such " "as <literal>application/msword</literal>). For more about MIME type " "settings, see <xref linkend=\"svn.advanced.props.special.mime-type\"/>" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1118 msgid "" "Subversion 1.5 introduces interactive resolution of conflicts (described in " "<xref linkend=\"svn.tour.cycle.resolve\" />), and one of the options " "provided to users is the ability to launch a third-party merge tool. If " "this action is taken, Subversion will consult the <literal>merge-tool-cmd</" "literal> runtime configuration option to find the name of an external merge " "tool and, upon finding one, will launch that tool with the appropriate input " "files. This differs from the configurable three-way differencing tool in a " "couple of ways. First, the differencing tool is always used to handle three-" "way differences, whereas the merge tool is employed only when three-way " "difference application has detected a conflict. Second, the interface is " "much cleaner—your configured merge tool need only accept as command-" "line parameters four path specifications: the base file, the <quote>theirs</" "quote> file (which contains upstream changes), the <quote>mine</quote> file " "(which contains local modifications), and the path of the file where the " "final resolved contents should be stored." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:1139 msgid "External diff" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch07-customizing-svn.xml:1141 msgid "" "Subversion calls external diff programs with parameters suitable for the GNU " "diff utility, and expects only that the external program will return with a " "successful error code. For most alternative diff programs, only the sixth " "and seventh arguments—the paths of the files that represent the left " "and right sides of the diff, respectively—are of interest. Note that " "Subversion runs the diff program once per modified file covered by the " "Subversion operation, so if your program runs in an asynchronous fashion (or " "is <quote>backgrounded</quote>), you might have several instances of it all " "running simultaneously. Finally, Subversion expects that your program " "return an error code of 1 if your program detected differences, or 0 if it " "did not—any other error code is considered a fatal error. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch07-customizing-svn.xml:1156 msgid "" "The GNU diff manual page puts it this way: <quote>An exit status of 0 means " "no differences were found, 1 means some differences were found, and 2 means " "trouble.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:1162 msgid "" "<xref linkend=\"svn.advanced.externaldifftools.diff.ex-1\"/> and <xref " "linkend=\"svn.advanced.externaldifftools.diff.ex-2\"/> are templates for " "external diff tool wrappers in the Python and Windows batch scripting " "languages, respectively." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch07-customizing-svn.xml:1168 msgid "diffwrap.py" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch07-customizing-svn.xml:1169 #, no-wrap msgid "" "\n" "#!/usr/bin/env python\n" "import sys\n" "import os\n" "\n" "# Configure your favorite diff program here.\n" "DIFF = \"/usr/local/bin/my-diff-tool\"\n" "\n" "# Subversion provides the paths we need as the last two parameters.\n" "LEFT = sys.argv[-2]\n" "RIGHT = sys.argv[-1]\n" "\n" "# Call the diff command (change the following line to make sense for\n" "# your diff program).\n" "cmd = [DIFF, '--left', LEFT, '--right', RIGHT]\n" "os.execv(cmd[0], cmd)\n" "\n" "# Return an errorcode of 0 if no differences were detected, 1 if some were.\n" "# Any other errorcode will be treated as fatal.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch07-customizing-svn.xml:1192 msgid "diffwrap.bat" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch07-customizing-svn.xml:1193 #, no-wrap msgid "" "\n" "@ECHO OFF\n" "\n" "REM Configure your favorite diff program here.\n" "SET DIFF=\"C:\\Program Files\\Funky Stuff\\My Diff Tool.exe\"\n" "\n" "REM Subversion provides the paths we need as the last two parameters.\n" "REM These are parameters 6 and 7 (unless you use svn diff -x, in\n" "REM which case, all bets are off).\n" "SET LEFT=%6\n" "SET RIGHT=%7\n" "\n" "REM Call the diff command (change the following line to make sense for\n" "REM your diff program).\n" "%DIFF% --left %LEFT% --right %RIGHT%\n" "\n" "REM Return an errorcode of 0 if no differences were detected, 1 if some were.\n" "REM Any other errorcode will be treated as fatal.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:1217 msgid "External diff3" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:1219 msgid "" "Subversion calls external merge programs with parameters suitable for the " "GNU diff3 utility, expecting that the external program will return with a " "successful error code and that the full file contents that result from the " "completed merge operation are printed on the standard output stream (so that " "Subversion can redirect them into the appropriate version-controlled file). " "For most alternative merge programs, only the ninth, tenth, and eleventh " "arguments, the paths of the files which represent the <quote>mine,</quote> " "<quote>older,</quote> and <quote>yours</quote> inputs, respectively, are of " "interest. Note that because Subversion depends on the output of your merge " "program, your wrapper script must not exit before that output has been " "delivered to Subversion. When it finally does exit, it should return an " "error code of 0 if the merge was successful, or 1 if unresolved conflicts " "remain in the output—any other error code is considered a fatal error." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:1237 msgid "" "<xref linkend=\"svn.advanced.externaldifftools.diff3.ex-1\"/> and <xref " "linkend=\"svn.advanced.externaldifftools.diff3.ex-2\"/> are templates for " "external merge tool wrappers in the Python and Windows batch scripting " "languages, respectively." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch07-customizing-svn.xml:1243 msgid "diff3wrap.py" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch07-customizing-svn.xml:1244 #, no-wrap msgid "" "\n" "#!/usr/bin/env python\n" "import sys\n" "import os\n" "\n" "# Configure your favorite diff program here.\n" "DIFF3 = \"/usr/local/bin/my-merge-tool\"\n" "\n" "# Subversion provides the paths we need as the last three parameters.\n" "MINE = sys.argv[-3]\n" "OLDER = sys.argv[-2]\n" "YOURS = sys.argv[-1]\n" "\n" "# Call the merge command (change the following line to make sense for\n" "# your merge program).\n" "cmd = [DIFF3, '--older', OLDER, '--mine', MINE, '--yours', YOURS]\n" "os.execv(cmd[0], cmd)\n" "\n" "# After performing the merge, this script needs to print the contents\n" "# of the merged file to stdout. Do that in whatever way you see fit.\n" "# Return an errorcode of 0 on successful merge, 1 if unresolved conflicts\n" "# remain in the result. Any other errorcode will be treated as fatal.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch07-customizing-svn.xml:1270 msgid "diff3wrap.bat" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch07-customizing-svn.xml:1271 #, no-wrap msgid "" "\n" "@ECHO OFF\n" "\n" "REM Configure your favorite diff3/merge program here.\n" "SET DIFF3=\"C:\\Program Files\\Funky Stuff\\My Merge Tool.exe\"\n" "\n" "REM Subversion provides the paths we need as the last three parameters.\n" "REM These are parameters 9, 10, and 11. But we have access to only\n" "REM nine parameters at a time, so we shift our nine-parameter window\n" "REM twice to let us get to what we need.\n" "SHIFT\n" "SHIFT\n" "SET MINE=%7\n" "SET OLDER=%8\n" "SET YOURS=%9\n" "\n" "REM Call the merge command (change the following line to make sense for\n" "REM your merge program).\n" "%DIFF3% --older %OLDER% --mine %MINE% --yours %YOURS%\n" "\n" "REM After performing the merge, this script needs to print the contents\n" "REM of the merged file to stdout. Do that in whatever way you see fit.\n" "REM Return an errorcode of 0 on successful merge, 1 if unresolved conflicts\n" "REM remain in the result. Any other errorcode will be treated as fatal.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1307 msgid "" "Sometimes there's a single right way to do things; sometimes there are " "many. Subversion's developers understand that while the majority of its " "exact behaviors are acceptable to most of its users, there are some corners " "of its functionality where such a universally pleasing approach doesn't " "exist. In those places, Subversion offers users the opportunity to tell it " "how <emphasis>they</emphasis> want it to behave." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1315 msgid "" "In this chapter, we explored Subversion's runtime configuration system and " "other mechanisms by which users can control those configurable behaviors. " "If you are a developer, though, the next chapter will take you one step " "further. It describes how you can further customize your Subversion " "experience by writing your own software against Subversion's libraries." msgstr "" # type: Content of: <preface><sect1><sect2><para><indexterm><primary> #: ../en/book/ch08-embedding-svn.xml:2 #, fuzzy #| msgid "Subversion" msgid "Embedding Subversion" msgstr "Subversion" # type: Content of: <chapter><para> #: ../en/book/ch08-embedding-svn.xml:4 msgid "" "Subversion has a modular design: it's implemented as a collection of " "libraries written in C. Each library has a well-defined purpose and " "application programming interface (API), and that interface is available not " "only for Subversion itself to use, but for any software that wishes to embed " "or otherwise programmatically control Subversion. Additionally, " "Subversion's API is available not only to other C programs, but also to " "programs written in higher-level languages such as Python, Perl, Java, and " "Ruby." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch08-embedding-svn.xml:14 msgid "" "This chapter is for those who wish to interact with Subversion through its " "public API or its various language bindings. If you wish to write robust " "wrapper scripts around Subversion functionality to simplify your own life, " "are trying to develop more complex integrations between Subversion and other " "pieces of software, or just have an interest in Subversion's various library " "modules and what they offer, this chapter is for you. If, however, you " "don't foresee yourself participating with Subversion at such a level, feel " "free to skip this chapter with the confidence that your experience as a " "Subversion user will not be affected." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch08-embedding-svn.xml:30 msgid "Layered Library Design" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:32 msgid "" "Each of Subversion's core libraries can be said to exist in one of three " "main layers—the Repository layer, the Repository Access (RA) layer, or " "the Client layer (see <xref linkend=\"svn.intro.architecture.dia-1\" /> in " "the Preface). We will examine these layers shortly, but first, let's " "briefly summarize Subversion's various libraries. For the sake of " "consistency, we will refer to the libraries by their extensionless Unix " "library names (<filename>libsvn_fs</filename>, <filename>libsvn_wc</" "filename>, <filename>mod_dav_svn</filename>, etc.)." msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:44 msgid "libsvn_client" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:45 msgid "Primary interface for client programs" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:49 msgid "libsvn_delta" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:50 msgid "Tree and byte-stream differencing routines" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:54 msgid "libsvn_diff" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:55 msgid "Contextual differencing and merging routines" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:59 msgid "libsvn_fs" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:60 msgid "Filesystem commons and module loader" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:64 msgid "libsvn_fs_base" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:65 msgid "The Berkeley DB filesystem backend" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:69 msgid "libsvn_fs_fs" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:70 msgid "The native filesystem (FSFS) backend" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:74 msgid "libsvn_ra" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:75 msgid "Repository Access commons and module loader" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:79 msgid "libsvn_ra_local" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><title> #: ../en/book/ch08-embedding-svn.xml:80 #, fuzzy #| msgid "Repository access URLs" msgid "The local Repository Access module" msgstr "Repository-Zugriffs-URLs" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:84 msgid "libsvn_ra_neon" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:85 msgid "The WebDAV Repository Access module" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:89 msgid "libsvn_ra_serf" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:90 msgid "Another (experimental) WebDAV Repository Access module" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:94 msgid "libsvn_ra_svn" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:95 msgid "The custom protocol Repository Access module" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:99 msgid "libsvn_repos" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><title> #: ../en/book/ch08-embedding-svn.xml:100 #, fuzzy #| msgid "Repository access URLs" msgid "Repository interface" msgstr "Repository-Zugriffs-URLs" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:103 msgid "libsvn_subr" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:104 msgid "Miscellaneous helpful subroutines" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:108 msgid "libsvn_wc" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:109 msgid "The working copy management library" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:113 ../en/book/ch09-reference.xml:9009 #, fuzzy #| msgid "mod_dav_svn" msgid "mod_authz_svn" msgstr "mod_dav_svn" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:114 msgid "" "Apache authorization module for Subversion repositories access via WebDAV" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:119 msgid "Apache module for mapping WebDAV operations to Subversion ones" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:124 msgid "" "The fact that the word <quote>miscellaneous</quote> appears only once in the " "previous list is a good sign. The Subversion development team is serious " "about making sure that functionality lives in the right layer and " "libraries. Perhaps the greatest advantage of the modular design is its lack " "of complexity from a developer's point of view. As a developer, you can " "quickly formulate that kind of <quote>big picture</quote> that allows you to " "pinpoint the location of certain pieces of functionality with relative ease." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:134 msgid "" "Another benefit of modularity is the ability to replace a given module with " "a whole new library that implements the same API without affecting the rest " "of the code base. In some sense, this happens within Subversion already. " "The <filename>libsvn_ra_local</filename>, <filename>libsvn_ra_neon</" "filename>, <filename>libsvn_ra_serf</filename>, and <filename>libsvn_ra_svn</" "filename> libraries each implement the same interface, all working as plug-" "ins to <filename>libsvn_ra</filename>. And all four communicate with the " "Repository layer—<filename>libsvn_ra_local</filename> connects to the " "repository directly; the other three do so over a network. The " "<filename>libsvn_fs_base</filename> and <filename>libsvn_fs_fs</filename> " "libraries are another pair of libraries that implement the same " "functionality in different ways—both are plug-ins to the common " "<filename>libsvn_fs</filename> library." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:152 msgid "" "The client itself also highlights the benefits of modularity in the " "Subversion design. Subversion's <filename>libsvn_client</filename> library " "is a one-stop shop for most of the functionality necessary for designing a " "working Subversion client (see <xref linkend=\"svn.developer.layerlib.client" "\"/>). So while the Subversion distribution provides only the <command>svn</" "command> command-line client program, several third-party programs provide " "various forms of graphical client UIs. These GUIs use the same APIs that " "the stock command-line client does. This type of modularity has played a " "large role in the proliferation of available Subversion clients and IDE " "integrations and, by extension, to the tremendous adoption rate of " "Subversion itself." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch08-embedding-svn.xml:169 #, fuzzy #| msgid "Repository URLs" msgid "Repository Layer" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:171 msgid "" "When referring to Subversion's Repository layer, we're generally talking " "about two basic concepts—the versioned filesystem implementation " "(accessed via <filename>libsvn_fs</filename>, and supported by its " "<filename>libsvn_fs_base</filename> and <filename>libsvn_fs_fs</filename> " "plug-ins), and the repository logic that wraps it (as implemented in " "<filename>libsvn_repos</filename>). These libraries provide the storage and " "reporting mechanisms for the various revisions of your version-controlled " "data. This layer is connected to the Client layer via the Repository Access " "layer, and is, from the perspective of the Subversion user, the stuff at the " "<quote>other end of the line.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:185 msgid "" "The Subversion filesystem is not a kernel-level filesystem that one would " "install in an operating system (such as the Linux ext2 or NTFS), but instead " "is a virtual filesystem. Rather than storing <quote>files</quote> and " "<quote>directories</quote> as real files and directories (the kind you can " "navigate through using your favorite shell program), it uses one of two " "available abstract storage backends—either a Berkeley DB database " "environment or a flat-file representation. (To learn more about the two " "repository backends, see <xref linkend=\"svn.reposadmin.basics.backends\"/" ">.) There has even been considerable interest by the development community " "in giving future releases of Subversion the ability to use other backend " "database systems, perhaps through a mechanism such as Open Database " "Connectivity (ODBC). In fact, Google did something similar to this before " "launching the Google Code Project Hosting service: they announced in mid-" "2006 that members of its open source team had written a new proprietary " "Subversion filesystem plug-in that used Google's ultra-scalable Bigtable " "database for its storage." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:206 msgid "" "The filesystem API exported by <filename>libsvn_fs</filename> contains the " "kinds of functionality you would expect from any other filesystem API—" "you can create and remove files and directories, copy and move them around, " "modify file contents, and so on. It also has features that are not quite as " "common, such as the ability to add, modify, and remove metadata " "(<quote>properties</quote>) on each file or directory. Furthermore, the " "Subversion filesystem is a versioning filesystem, which means that as you " "make changes to your directory tree, Subversion remembers what your tree " "looked like before those changes. And before the previous changes. And the " "previous ones. And so on, all the way back through versioning time to (and " "just beyond) the moment you first started adding things to the filesystem." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:222 msgid "" "All the modifications you make to your tree are done within the context of a " "Subversion commit transaction. The following is a simplified general " "routine for modifying your filesystem:" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch08-embedding-svn.xml:229 #, fuzzy #| msgid "Subversion in Action" msgid "Begin a Subversion commit transaction." msgstr "Subversion in Action" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:232 msgid "Make your changes (adds, deletes, property modifications, etc.)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:236 #, fuzzy #| msgid "Commit your changes." msgid "Commit your transaction." msgstr "Bringen Sie Ihre Änderungen ins Repository." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:240 msgid "" "Once you have committed your transaction, your filesystem modifications are " "permanently stored as historical artifacts. Each of these cycles generates " "a single new revision of your tree, and each revision is forever accessible " "as an immutable snapshot of <quote>the way things were.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch08-embedding-svn.xml:247 msgid "The Transaction Distraction" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:249 msgid "" "The notion of a Subversion transaction can become easily confused with the " "transaction support provided by the underlying database itself, especially " "given the former's close proximity to the Berkeley DB database code in " "<filename>libsvn_fs_base</filename>. Both types of transaction exist to " "provide atomicity and isolation. In other words, transactions give you the " "ability to perform a set of actions in an all-or-nothing fashion—" "either all the actions in the set complete with success, or they all get " "treated as though <emphasis>none</emphasis> of them ever happened—and " "in a way that does not interfere with other processes acting on the data." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:262 msgid "" "Database transactions generally encompass small operations related " "specifically to the modification of data in the database itself (such as " "changing the contents of a table row). Subversion transactions are larger " "in scope, encompassing higher-level operations such as making modifications " "to a set of files and directories that are intended to be stored as the next " "revision of the filesystem tree. If that isn't confusing enough, consider " "the fact that Subversion uses a database transaction during the creation of " "a Subversion transaction (so that if the creation of a Subversion " "transaction fails, the database will look as though we had never attempted " "that creation in the first place)!" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:276 msgid "" "Fortunately for users of the filesystem API, the transaction support " "provided by the database system itself is hidden almost entirely from view " "(as should be expected from a properly modularized library scheme). It is " "only when you start digging into the implementation of the filesystem itself " "that such things become visible (or interesting)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:286 msgid "" "Most of the functionality the filesystem interface provides deals with " "actions that occur on individual filesystem paths. That is, from outside " "the filesystem, the primary mechanism for describing and accessing the " "individual revisions of files and directories comes through the use of path " "strings such as <filename>/foo/bar</filename>, just as though you were " "addressing files and directories through your favorite shell program. You " "add new files and directories by passing their paths-to-be to the right API " "functions. You query for information about them by the same mechanism." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:297 msgid "" "Unlike most filesystems, though, a path alone is not enough information to " "identify a file or directory in Subversion. Think of a directory tree as a " "two-dimensional system, where a node's siblings represent a sort of left-and-" "right motion, and navigating into the node's subdirectories represents a " "downward motion. <xref linkend=\"svn.developer.layerlib.repos.dia-1\"/> " "shows a typical representation of a tree as exactly that." msgstr "" # type: Content of: <chapter><sect1><sect2><figure><title> #: ../en/book/ch08-embedding-svn.xml:307 msgid "Files and directories in two dimensions" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch08-embedding-svn.xml:311 msgid "" "The difference here is that the Subversion filesystem has a nifty third " "dimension that most filesystems do not have—Time! <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch08-embedding-svn.xml:315 msgid "" "We understand that this may come as a shock to sci-fi fans who have long " "been under the impression that Time was actually the <emphasis>fourth</" "emphasis> dimension, and we apologize for any emotional trauma induced by " "our assertion of a different theory." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:320 msgid "" "</footnote> In the filesystem interface, nearly every function that has a " "<parameter>path</parameter> argument also expects a <parameter>root</" "parameter> argument. This <literal>svn_fs_root_t</literal> argument " "describes either a revision or a Subversion transaction (which is simply a " "revision in the making) and provides that third dimension of context needed " "to understand the difference between <filename>/foo/bar</filename> in " "revision 32, and the same path as it exists in revision 98. <xref linkend=" "\"svn.developer.layerlib.repos.dia-2\"/> shows revision history as an added " "dimension to the Subversion filesystem universe." msgstr "" # type: Content of: <chapter><sect1><sect2><figure><title> #: ../en/book/ch08-embedding-svn.xml:335 msgid "Versioning time—the third dimension!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:339 msgid "" "As we mentioned earlier, the <filename>libsvn_fs</filename> API looks and " "feels like any other filesystem, except that it has this wonderful " "versioning capability. It was designed to be usable by any program " "interested in a versioning filesystem. Not coincidentally, Subversion " "itself is interested in that functionality. But while the filesystem API " "should be sufficient for basic file and directory versioning support, " "Subversion wants more—and that is where <filename>libsvn_repos</" "filename> comes in." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:350 msgid "" "The Subversion repository library (<filename>libsvn_repos</filename>) sits " "(logically speaking) atop the <filename>libsvn_fs</filename> API, providing " "additional functionality beyond that of the underlying versioned filesystem " "logic. It does not completely wrap each and every filesystem function—" "only certain major steps in the general cycle of filesystem activity are " "wrapped by the repository interface. Some of these include the creation and " "commit of Subversion transactions and the modification of revision " "properties. These particular events are wrapped by the repository layer " "because they have hooks associated with them. A repository hook system is " "not strictly related to implementing a versioning filesystem, so it lives in " "the repository wrapper library." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:365 msgid "" "The hooks mechanism is but one of the reasons for the abstraction of a " "separate repository library from the rest of the filesystem code. The " "<filename>libsvn_repos</filename> API provides several other important " "utilities to Subversion. These include the abilities to:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:373 msgid "" "Create, open, destroy, and perform recovery steps on a Subversion repository " "and the filesystem included in that repository." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:378 msgid "Describe the differences between two filesystem trees." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:382 msgid "" "Query for the commit log messages associated with all (or some) of the " "revisions in which a set of files was modified in the filesystem." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:387 msgid "" "Generate a human-readable <quote>dump</quote> of the filesystem—a " "complete representation of the revisions in the filesystem." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:392 msgid "" "Parse that dump format, loading the dumped revisions into a different " "Subversion repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:397 msgid "" "As Subversion continues to evolve, the repository library will grow with the " "filesystem library to offer increased functionality and configurable option " "support." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><title> #: ../en/book/ch08-embedding-svn.xml:405 #, fuzzy #| msgid "Repository access URLs" msgid "Repository Access Layer" msgstr "Repository-Zugriffs-URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:407 msgid "" "If the Subversion Repository layer is at <quote>the other end of the line,</" "quote> the Repository Access (RA) layer is the line itself. Charged with " "marshaling data between the client libraries and the repository, this layer " "includes the <filename>libsvn_ra</filename> module loader library, the RA " "modules themselves (which currently includes <filename>libsvn_ra_neon</" "filename>, <filename>libsvn_ra_local</filename>, <filename>libsvn_ra_serf</" "filename>, and <filename>libsvn_ra_svn</filename>), and any additional " "libraries needed by one or more of those RA modules (such as the " "<filename>mod_dav_svn</filename> Apache module or <filename>libsvn_ra_svn</" "filename>'s server, <command>svnserve</command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:422 msgid "" "Since Subversion uses URLs to identify its repository resources, the " "protocol portion of the URL scheme (usually <literal>file://</literal>, " "<literal>http://</literal>, <literal>https://</literal>, <literal>svn://</" "literal>, or <literal>svn+ssh://</literal>) is used to determine which RA " "module will handle the communications. Each module registers a list of the " "protocols it knows how to <quote>speak</quote> so that the RA loader can, at " "runtime, determine which module to use for the task at hand. You can " "determine which RA modules are available to the Subversion command-line " "client, and what protocols they claim to support, by running <userinput>svn " "--version</userinput>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch08-embedding-svn.xml:435 #, no-wrap msgid "" "\n" "$ svn --version\n" "svn, version 1.5.0 (r31699)\n" " compiled Jun 18 2008, 09:57:36\n" "\n" "Copyright (C) 2000-2008 CollabNet.\n" "Subversion is open source software, see http://subversion.tigris.org/\n" "This product includes software developed by CollabNet (http://www.Collab.Net/).\n" "\n" "The following repository access (RA) modules are available:\n" "\n" "* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.\n" " - handles 'http' scheme\n" " - handles 'https' scheme\n" "* ra_svn : Module for accessing a repository using the svn network protocol.\n" " - handles 'svn' scheme\n" "* ra_local : Module for accessing a repository on local disk.\n" " - handles 'file' scheme\n" "* ra_serf : Module for accessing a repository via WebDAV protocol using serf.\n" " - handles 'http' scheme\n" " - handles 'https' scheme\n" "\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:460 msgid "" "The public API exported by the RA layer contains functionality necessary for " "sending and receiving versioned data to and from the repository. And each " "of the available RA plug-ins is able to perform that task using a specific " "protocol—<filename>libsvn_ra_dav</filename> speaks HTTP/WebDAV " "(optionally using SSL encryption) with an Apache HTTP Server that is running " "the <filename>mod_dav_svn</filename> Subversion server module; " "<filename>libsvn_ra_svn</filename> speaks a custom network protocol with the " "<command>svnserve</command> program; and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:472 msgid "" "For those who wish to access a Subversion repository using still another " "protocol, that is precisely why the Repository Access layer is modularized! " "Developers can simply write a new library that implements the RA interface " "on one side and communicates with the repository on the other. Your new " "library can use existing network protocols or you can invent your own. You " "could use interprocess communication (IPC) calls, or—let's get crazy, " "shall we?—you could even implement an email-based protocol. " "Subversion supplies the APIs; you supply the creativity." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:487 msgid "Client Layer" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:489 msgid "" "On the client side, the Subversion working copy is where all the action " "takes place. The bulk of functionality implemented by the client-side " "libraries exists for the sole purpose of managing working copies—" "directories full of files and other subdirectories that serve as a sort of " "local, editable <quote>reflection</quote> of one or more repository " "locations—and propagating changes to and from the Repository Access " "layer." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:498 msgid "" "Subversion's working copy library, <filename>libsvn_wc</filename>, is " "directly responsible for managing the data in the working copies. To " "accomplish this, the library stores administrative information about each " "working copy directory within a special subdirectory. This subdirectory, " "named <filename>.svn</filename>, is present in each working copy directory " "and contains various other files and directories that record state and " "provide a private workspace for administrative action. For those familiar " "with CVS, this <filename>.svn</filename> subdirectory is similar in purpose " "to the <filename>CVS</filename> administrative directories found in CVS " "working copies. For more information about the <filename>.svn</filename> " "administrative area, see <xref linkend=\"svn.developer.insidewc\"/> later in " "this chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:514 msgid "" "The Subversion client library, <filename>libsvn_client</filename>, has the " "broadest responsibility; its job is to mingle the functionality of the " "working copy library with that of the Repository Access layer, and then to " "provide the highest-level API to any application that wishes to perform " "general revision control actions. For example, the function " "<function>svn_client_checkout()</function> takes a URL as an argument. It " "passes this URL to the RA layer and opens an authenticated session with a " "particular repository. It then asks the repository for a certain tree, and " "sends this tree into the working copy library, which then writes a full " "working copy to disk (<filename>.svn</filename> directories and all)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:529 msgid "" "The client library is designed to be used by any application. While the " "Subversion source code includes a standard command-line client, it should be " "very easy to write any number of GUI clients on top of the client library. " "New GUIs (or any new client, really) for Subversion need not be clunky " "wrappers around the included command-line client—they have full access " "via the <filename>libsvn_client</filename> API to the same functionality, " "data, and callback mechanisms that the command-line client uses. In fact, " "the Subversion source code tree contains a small C program (which you can " "find at <filename>tools/examples/minimal_client.c</filename>) that " "exemplifies how to wield the Subversion API to create a simple client " "program." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch08-embedding-svn.xml:545 msgid "Binding Directly—A Word About Correctness" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:547 msgid "" "Why should your GUI program bind directly with a <filename>libsvn_client</" "filename> instead of acting as a wrapper around a command-line program? " "Besides simply being more efficient, it can be more correct as well. A " "command-line program (such as the one supplied with Subversion) that binds " "to the client library needs to effectively translate feedback and requested " "data bits from C types to some form of human-readable output. This type of " "translation can be lossy. That is, the program may not display all of the " "information harvested from the API or may combine bits of information for " "compact representation." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:560 msgid "" "If you wrap such a command-line program with yet another program, the second " "program has access only to already interpreted (and as we mentioned, likely " "incomplete) information, which it must <emphasis>again</emphasis> translate " "into <emphasis>its</emphasis> representation format. With each layer of " "wrapping, the integrity of the original data is potentially tainted more and " "more, much like the result of making a copy of a copy (of a copy…) " "of a favorite audio or video cassette." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:570 msgid "" "But the most compelling argument for binding directly to the APIs instead of " "wrapping other programs is that the Subversion project makes compatibility " "promises regarding its APIs. Across minor versions of those APIs (such as " "between 1.3 and 1.4), no function's prototype will change. In other words, " "you aren't forced to update your program's source code simply because you've " "upgraded to a new version of Subversion. Certain functions might be " "deprecated, but they still work, and this gives you a buffer of time to " "eventually embrace the newer APIs. These kinds of compatibility promises do " "not exist for Subversion command-line program output, which is subject to " "change from release to release." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch08-embedding-svn.xml:593 msgid "Inside the Working Copy Administration Area" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:595 msgid "" "As we mentioned earlier, each directory of a Subversion working copy " "contains a special subdirectory called <filename>.svn</filename> that houses " "administrative data about that working copy directory. Subversion uses the " "information in <filename>.svn</filename> to keep track of things such as:" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:603 msgid "" "Which repository location(s) are represented by the files and subdirectories " "in the working copy directory" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:608 msgid "" "What revision of each of those files and directories is currently present in " "the working copy" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:612 msgid "" "Any user-defined properties that might be attached to those files and " "directories" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:616 msgid "Pristine (unedited) copies of the working copy files" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:621 msgid "" "The Subversion working copy administration area's layout and contents are " "considered implementation details not really intended for human " "consumption. Developers are encouraged to use Subversion's public APIs, or " "the tools that Subversion provides, to access and manipulate the working " "copy data, instead of directly reading or modifying those files. The file " "formats employed by the working copy library for its administrative data do " "change from time to time—a fact that the public APIs do a great job of " "hiding from the average user. In this section, we expose some of these " "implementation details sheerly to appease your overwhelming curiosity." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:635 msgid "The Entries File" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:637 msgid "" "Perhaps the single most important file in the <filename>.svn</filename> " "directory is the <filename>entries</filename> file. It contains the bulk of " "the administrative information about the versioned items in a working copy " "directory. This one file tracks the repository URLs, pristine revision, " "file checksums, pristine text and property timestamps, scheduling and " "conflict state information, last-known commit information (author, revision, " "timestamp), local copy history—practically everything that a " "Subversion client is interested in knowing about a versioned (or to-be-" "versioned) resource!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:650 msgid "" "Folks familiar with CVS's administrative directories will have recognized at " "this point that Subversion's <filename>.svn/entries</filename> file serves " "the purposes of, among other things, CVS's <filename>CVS/Entries</filename>, " "<filename>CVS/Root</filename>, and <filename>CVS/Repository</filename> files " "combined." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:657 msgid "" "The format of the <filename>.svn/entries</filename> file has changed over " "time. Originally an XML file, it now uses a custom—though still human-" "readable—file format. While XML was a great choice for early " "developers of Subversion who were frequently debugging the file's contents " "(and Subversion's behavior in light of them), the need for easy developer " "debugging has diminished as Subversion has matured and has been replaced by " "the user's need for snappier performance. Be aware that Subversion's " "working copy library automatically upgrades working copies from one format " "to another—it reads the old formats and writes the new—which " "saves you the hassle of checking out a new working copy, but can also " "complicate situations where different versions of Subversion might be trying " "to use the same working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:677 msgid "Pristine Copies and Property Files" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:679 msgid "" "As mentioned before, the <filename>.svn</filename> directory also holds the " "pristine <quote>text-base</quote> versions of files. You can find those in " "<filename>.svn/text-base</filename>. The benefits of these pristine copies " "are multiple—network-free checks for local modifications and " "difference reporting, network-free reversion of modified or missing files, " "more efficient transmission of changes to the server—but they come at " "the cost of having each versioned file stored at least twice on disk. These " "days, this seems to be a negligible penalty for most files. However, the " "situation gets uglier as the size of your versioned files grows. Some " "attention is being given to making the presence of the <quote>text-base</" "quote> an option. Ironically, though, it is as your versioned files' sizes " "get larger that the existence of the <quote>text-base</quote> becomes more " "crucial—who wants to transmit a huge file across a network just " "because she wants to commit a tiny change to it?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:698 msgid "" "Similar in purpose to the <quote>text-base</quote> files are the property " "files and their pristine <quote>prop-base</quote> copies, located in " "<filename>.svn/props</filename> and <filename>.svn/prop-base</filename>, " "respectively. Since directories can have properties too, there are also " "<filename>.svn/dir-props</filename> and <filename>.svn/dir-prop-base</" "filename> files." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch08-embedding-svn.xml:715 msgid "Using the APIs" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:717 msgid "" "Developing applications against the Subversion library APIs is fairly " "straightforward. Subversion is primarily a set of C libraries, with header " "(<filename>.h</filename>) files that live in the <filename>subversion/" "include</filename> directory of the source tree. These headers are copied " "into your system locations (e.g., <filename>/usr/local/include</filename>) " "when you build and install Subversion itself from source. These headers " "represent the entirety of the functions and types meant to be accessible by " "users of the Subversion libraries. The Subversion developer community is " "meticulous about ensuring that the public API is well documented—refer " "directly to the header files for that documentation." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:730 msgid "" "When examining the public header files, the first thing you might notice is " "that Subversion's datatypes and functions are namespace-protected. That is, " "every public Subversion symbol name begins with <literal>svn_</literal>, " "followed by a short code for the library in which the symbol is defined " "(such as <literal>wc</literal>, <literal>client</literal>, <literal>fs</" "literal>, etc.), followed by a single underscore (<literal>_</literal>), and " "then the rest of the symbol name. Semipublic functions (used among source " "files of a given library but not by code outside that library, and found " "inside the library directories themselves) differ from this naming scheme in " "that instead of a single underscore after the library code, they use a " "double underscore (<literal>_ _</literal>). Functions that are " "private to a given source file have no special prefixing and are declared " "<literal>static</literal>. Of course, a compiler isn't interested in these " "naming conventions, but they help to clarify the scope of a given function " "or datatype." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch08-embedding-svn.xml:749 msgid "" "Another good source of information about programming against the Subversion " "APIs is the project's own hacking guidelines, which you can find at <ulink " "url=\"http://subversion.tigris.org/hacking.html\" />. This document " "contains useful information, which, while aimed at developers and would-be " "developers of Subversion itself, is equally applicable to folks developing " "against Subversion as a set of third-party libraries. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch08-embedding-svn.xml:758 msgid "After all, Subversion uses Subversion's APIs, too." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:765 msgid "The Apache Portable Runtime Library" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:767 msgid "" "Along with Subversion's own datatypes, you will see many references to " "datatypes that begin with <literal>apr_</literal>—symbols from the " "Apache Portable Runtime (APR) library. APR is Apache's portability library, " "originally carved out of its server code as an attempt to separate the OS-" "specific bits from the OS-independent portions of the code. The result was " "a library that provides a generic API for performing operations that differ " "mildly—or wildly—from OS to OS. While the Apache HTTP Server " "was obviously the first user of the APR library, the Subversion developers " "immediately recognized the value of using APR as well. This means that " "there is practically no OS-specific code in Subversion itself. Also, it " "means that the Subversion client compiles and runs anywhere that the Apache " "HTTP Server does. Currently, this list includes all flavors of Unix, Win32, " "BeOS, OS/2, and Mac OS X." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch08-embedding-svn.xml:784 msgid "" "In addition to providing consistent implementations of system calls that " "differ across operating systems, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch08-embedding-svn.xml:787 msgid "Subversion uses ANSI system calls and datatypes as much as possible." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch08-embedding-svn.xml:789 msgid "" "</footnote> APR gives Subversion immediate access to many custom datatypes, " "such as dynamic arrays and hash tables. Subversion uses these types " "extensively. But perhaps the most pervasive APR datatype, found in nearly " "every Subversion API prototype, is the <literal>apr_pool_t</literal>—" "the APR memory pool. Subversion uses pools internally for all its memory " "allocation needs (unless an external library requires a different memory " "management mechanism for data passed through its API), <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch08-embedding-svn.xml:800 msgid "Neon and Berkeley DB are examples of such libraries." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:801 msgid "" "</footnote> and while a person coding against the Subversion APIs is not " "required to do the same, she <emphasis>is</emphasis> required to provide " "pools to the API functions that need them. This means that users of the " "Subversion API must also link against APR, must call <function>apr_initialize" "()</function> to initialize the APR subsystem, and then must create and " "manage pools for use with Subversion API calls, typically by using " "<function>svn_pool_create()</function>, <function>svn_pool_clear()</" "function>, and <function>svn_pool_destroy()</function>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch08-embedding-svn.xml:814 msgid "Programming with Memory Pools" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:816 msgid "" "Almost every developer who has used the C programming language has at some " "point sighed at the daunting task of managing memory usage. Allocating " "enough memory to use, keeping track of those allocations, freeing the memory " "when you no longer need it—these tasks can be quite complex. And of " "course, failure to do those things properly can result in a program that " "crashes itself, or worse, crashes the computer." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:825 msgid "" "Higher-level languages, on the other hand, either take the job of memory " "management away from you completely or make it something you toy with only " "when doing extremely tight program optimization. Languages such as Java and " "Python use <firstterm>garbage collection</firstterm>, allocating memory for " "objects when needed, and automatically freeing that memory when the object " "is no longer in use." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:834 msgid "" "APR provides a middle-ground approach called <firstterm>pool-based memory " "management</firstterm>. It allows the developer to control memory usage at " "a lower resolution—per chunk (or <quote>pool</quote>) of memory, " "instead of per allocated object. Rather than using <function>malloc()</" "function> and friends to allocate enough memory for a given object, you ask " "APR to allocate the memory from a memory pool. When you're finished using " "the objects you've created in the pool, you destroy the entire pool, " "effectively de-allocating the memory consumed by <emphasis>all</emphasis> " "the objects you allocated from it. Thus, rather than keeping track of " "individual objects that need to be de-allocated, your program simply " "considers the general lifetimes of those objects and allocates the objects " "in a pool whose lifetime (the time between the pool's creation and its " "deletion) matches the object's needs." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:857 msgid "URL and Path Requirements" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:859 msgid "" "With remote version control operation as the whole point of Subversion's " "existence, it makes sense that some attention has been paid to " "internationalization (i18n) support. After all, while <quote>remote</quote> " "might mean <quote>across the office,</quote> it could just as well mean " "<quote>across the globe.</quote> To facilitate this, all of Subversion's " "public interfaces that accept path arguments expect those paths to be " "canonicalized—which is most easily accomplished by passing them " "through the <function>svn_path_canonicalize()</function> function—and " "encoded in UTF-8. This means, for example, that any new client binary that " "drives the <filename>libsvn_client</filename> interface needs to first " "convert paths from the locale-specific encoding to UTF-8 before passing " "those paths to the Subversion libraries, and then reconvert any resultant " "output paths from Subversion back into the locale's encoding before using " "those paths for non-Subversion purposes. Fortunately, Subversion provides a " "suite of functions (see <filename>subversion/include/svn_utf.h</filename>) " "that any program can use to do these conversions." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:880 msgid "" "Also, Subversion APIs require all URL parameters to be properly URI-" "encoded. So, instead of passing" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:882 msgid "" "as the URL of a file named <filename>My File.txt</filename>, you need to pass" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:884 msgid "" ". Again, Subversion supplies helper functions that your application can " "use—<function>svn_path_uri_encode()</function> and " "<function>svn_path_uri_decode()</function>, for URI encoding and decoding, " "respectively." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:892 msgid "Using Languages Other Than C and C++" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:894 msgid "" "If you are interested in using the Subversion libraries in conjunction with " "something other than a C program—say, a Python or Perl script—" "Subversion has some support for this via the Simplified Wrapper and " "Interface Generator (SWIG). The SWIG bindings for Subversion are located in " "<filename>subversion/bindings/swig</filename>. They are still maturing, but " "they are usable. These bindings allow you to call Subversion API functions " "indirectly, using wrappers that translate the datatypes native to your " "scripting language into the datatypes needed by Subversion's C libraries." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:905 msgid "" "Significant efforts have been made toward creating functional SWIG-generated " "bindings for Python, Perl, and Ruby. To some extent, the work done " "preparing the SWIG interface files for these languages is reusable in " "efforts to generate bindings for other languages supported by SWIG (which " "include versions of C#, Guile, Java, MzScheme, OCaml, PHP, and Tcl, among " "others). However, some extra programming is required to compensate for " "complex APIs that SWIG needs some help translating between languages. For " "more information on SWIG itself, see the project's web site at <ulink url=" "\"http://www.swig.org/\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:917 msgid "" "Subversion also has language bindings for Java. The javahl bindings " "(located in <filename>subversion/bindings/java</filename> in the Subversion " "source tree) aren't SWIG-based, but are instead a mixture of Java and hand-" "coded JNI. Javahl covers most Subversion client-side APIs and is " "specifically targeted at implementors of Java-based Subversion clients and " "IDE integrations." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:926 msgid "" "Subversion's language bindings tend to lack the level of developer attention " "given to the core Subversion modules, but can generally be trusted as " "production-ready. A number of scripts and applications, alternative " "Subversion GUI clients, and other third-party tools are successfully using " "Subversion's language bindings today to accomplish their Subversion " "integrations." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:934 msgid "" "It's worth noting here that there are other options for interfacing with " "Subversion using other languages: alternative bindings for Subversion that " "aren't provided by the Subversion development community at all. You can " "find links to these alternative bindings on the Subversion project's links " "page (at <ulink url=\"http://subversion.tigris.org/links.html\" />), but " "there are a couple of popular ones we feel are especially noteworthy. " "First, Barry Scott's PySVN bindings (<ulink url=\"http://pysvn.tigris.org/" "\" />) are a popular option for binding with Python. PySVN boasts of a more " "Pythonic interface than the more C-like APIs provided by Subversion's own " "Python bindings. And if you're looking for a pure Java implementation of " "Subversion, check out SVNKit (<ulink url=\"http://svnkit.com/\" />), which " "is Subversion rewritten from the ground up in Java." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch08-embedding-svn.xml:952 msgid "SVNKit Versus javahl" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:954 msgid "" "In 2005, a small company called TMate announced the 1.0.0 release of " "JavaSVN—a pure Java implementation of Subversion. Since then, the " "project has been renamed to SVNKit (available at <ulink url=\"http://svnkit." "com/\" />) and has seen great success as a provider of Subversion " "functionality to various Subversion clients, IDE integrations, and other " "third-party tools." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:962 msgid "" "The SVNKit library is interesting in that, unlike the javahl library, it is " "not merely a wrapper around the official Subversion core libraries. In " "fact, it shares no code with Subversion at all. But while it is easy to " "confuse SVNKit with javahl, and easier still to not even realize which of " "these libraries you are using, folks should be aware that SVNKit differs " "from javahl in some significant ways. First, SVNKit is not developed as " "open source software and seems to have at any given time only a few " "developers working on it. Also, SVNKit's license is more restrictive than " "that of Subversion. Finally, by aiming to be a pure Java Subversion " "library, SVNKit is limited in which portions of Subversion can be reasonably " "cloned while still keeping up with Subversion's releases. This has already " "happened once—SVNKit cannot access BDB-backed Subversion repositories " "via the <literal>file://</literal> protocol because there's no pure Java " "implementation of Berkeley DB that is file-format-compatible with the native " "implementation of that library." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:982 msgid "" "That said, SVNKit has a well-established track record of reliability. And a " "pure Java solution is much more robust in the face of programming " "errors—a bug in SVNKit might raise a catchable Java Exception, but a " "bug in the Subversion core libraries as accessed via javahl can bring down " "your entire Java Runtime Environment. So, weigh the costs when choosing a " "Java-based Subversion implementation." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:996 msgid "Code Samples" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:998 msgid "" "<xref linkend=\"svn.developer.layerlib.repos.ex-1\" /> contains a code " "segment (written in C) that illustrates some of the concepts we've been " "discussing. It uses both the repository and filesystem interfaces (as can " "be determined by the prefixes <literal>svn_repos_</literal> and " "<literal>svn_fs_</literal> of the function names, respectively) to create a " "new revision in which a directory is added. You can see the use of an APR " "pool, which is passed around for memory allocation purposes. Also, the code " "reveals a somewhat obscure fact about Subversion error handling—all " "Subversion errors must be explicitly handled to avoid memory leakage (and in " "some cases, application failure)." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch08-embedding-svn.xml:1013 #, fuzzy #| msgid "The Repository" msgid "Using the Repository Layer" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch08-embedding-svn.xml:1015 #, no-wrap msgid "" "\n" "/* Convert a Subversion error into a simple boolean error code.\n" " *\n" " * NOTE: Subversion errors must be cleared (using svn_error_clear())\n" " * because they are allocated from the global pool, else memory\n" " * leaking occurs.\n" " */\n" "#define INT_ERR(expr) \\\n" " do { \\\n" " svn_error_t *__temperr = (expr); \\\n" " if (__temperr) \\\n" " { \\\n" " svn_error_clear(__temperr); \\\n" " return 1; \\\n" " } \\\n" " return 0; \\\n" " } while (0)\n" "\n" "/* Create a new directory at the path NEW_DIRECTORY in the Subversion\n" " * repository located at REPOS_PATH. Perform all memory allocation in\n" " * POOL. This function will create a new revision for the addition of\n" " * NEW_DIRECTORY. Return zero if the operation completes\n" " * successfully, nonzero otherwise.\n" " */\n" "static int\n" "make_new_directory(const char *repos_path,\n" " const char *new_directory,\n" " apr_pool_t *pool)\n" "{\n" " svn_error_t *err;\n" " svn_repos_t *repos;\n" " svn_fs_t *fs;\n" " svn_revnum_t youngest_rev;\n" " svn_fs_txn_t *txn;\n" " svn_fs_root_t *txn_root;\n" " const char *conflict_str;\n" "\n" " /* Open the repository located at REPOS_PATH. \n" " */\n" " INT_ERR(svn_repos_open(&repos, repos_path, pool));\n" "\n" " /* Get a pointer to the filesystem object that is stored in REPOS. \n" " */\n" " fs = svn_repos_fs(repos);\n" "\n" " /* Ask the filesystem to tell us the youngest revision that\n" " * currently exists. \n" " */\n" " INT_ERR(svn_fs_youngest_rev(&youngest_rev, fs, pool));\n" "\n" " /* Begin a new transaction that is based on YOUNGEST_REV. We are\n" " * less likely to have our later commit rejected as conflicting if we\n" " * always try to make our changes against a copy of the latest snapshot\n" " * of the filesystem tree. \n" " */\n" " INT_ERR(svn_repos_fs_begin_txn_for_commit2(&txn, repos, youngest_rev,\n" " apr_hash_make(pool), pool));\n" "\n" " /* Now that we have started a new Subversion transaction, get a root\n" " * object that represents that transaction. \n" " */\n" " INT_ERR(svn_fs_txn_root(&txn_root, txn, pool));\n" " \n" " /* Create our new directory under the transaction root, at the path\n" " * NEW_DIRECTORY. \n" " */\n" " INT_ERR(svn_fs_make_dir(txn_root, new_directory, pool));\n" "\n" " /* Commit the transaction, creating a new revision of the filesystem\n" " * which includes our added directory path.\n" " */\n" " err = svn_repos_fs_commit_txn(&conflict_str, repos, \n" " &youngest_rev, txn, pool);\n" " if (! err)\n" " {\n" " /* No error? Excellent! Print a brief report of our success.\n" " */\n" " printf(\"Directory '%s' was successfully added as new revision \"\n" " \"'%ld'.\\n\", new_directory, youngest_rev);\n" " }\n" " else if (err->apr_err == SVN_ERR_FS_CONFLICT)\n" " {\n" " /* Uh-oh. Our commit failed as the result of a conflict\n" " * (someone else seems to have made changes to the same area \n" " * of the filesystem that we tried to modify). Print an error\n" " * message.\n" " */\n" " printf(\"A conflict occurred at path '%s' while attempting \"\n" " \"to add directory '%s' to the repository at '%s'.\\n\", \n" " conflict_str, new_directory, repos_path);\n" " }\n" " else\n" " {\n" " /* Some other error has occurred. Print an error message.\n" " */\n" " printf(\"An error occurred while attempting to add directory '%s' \"\n" " \"to the repository at '%s'.\\n\", \n" " new_directory, repos_path);\n" " }\n" "\n" " INT_ERR(err);\n" "} \n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:1120 msgid "" "Note that in <xref linkend=\"svn.developer.layerlib.repos.ex-1\" />, the " "code could just as easily have committed the transaction using " "<function>svn_fs_commit_txn()</function>. But the filesystem API knows " "nothing about the repository library's hook mechanism. If you want your " "Subversion repository to automatically perform some set of non-Subversion " "tasks every time you commit a transaction (e.g., sending an email that " "describes all the changes made in that transaction to your developer mailing " "list), you need to use the <filename>libsvn_repos</filename>-wrapped version " "of that function, which adds the hook triggering functionality—in this " "case, <function>svn_repos_fs_commit_txn()</function>. (For more information " "regarding Subversion's repository hooks, see <xref linkend=\"svn.reposadmin." "create.hooks\" />.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:1137 msgid "" "Now let's switch languages. <xref linkend=\"svn.developer.usingapi." "otherlangs.ex-1\" /> is a sample program that uses Subversion's SWIG Python " "bindings to recursively crawl the youngest repository revision, and to print " "the various paths reached during the crawl." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch08-embedding-svn.xml:1144 msgid "Using the Repository layer with Python" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch08-embedding-svn.xml:1146 #, no-wrap msgid "" "\n" "#!/usr/bin/python\n" "\n" "\"\"\"Crawl a repository, printing versioned object path names.\"\"\"\n" "\n" "import sys\n" "import os.path\n" "import svn.fs, svn.core, svn.repos\n" "\n" "def crawl_filesystem_dir(root, directory):\n" " \"\"\"Recursively crawl DIRECTORY under ROOT in the filesystem, and return\n" " a list of all the paths at or below DIRECTORY.\"\"\"\n" "\n" " # Print the name of this path.\n" " print directory + \"/\"\n" " \n" " # Get the directory entries for DIRECTORY.\n" " entries = svn.fs.svn_fs_dir_entries(root, directory)\n" "\n" " # Loop over the entries.\n" " names = entries.keys()\n" " for name in names:\n" " # Calculate the entry's full path.\n" " full_path = directory + '/' + name\n" "\n" " # If the entry is a directory, recurse. The recursion will return\n" " # a list with the entry and all its children, which we will add to\n" " # our running list of paths.\n" " if svn.fs.svn_fs_is_dir(root, full_path):\n" " crawl_filesystem_dir(root, full_path)\n" " else:\n" " # Else it's a file, so print its path here.\n" " print full_path\n" "\n" "def crawl_youngest(repos_path):\n" " \"\"\"Open the repository at REPOS_PATH, and recursively crawl its\n" " youngest revision.\"\"\"\n" " \n" " # Open the repository at REPOS_PATH, and get a reference to its\n" " # versioning filesystem.\n" " repos_obj = svn.repos.svn_repos_open(repos_path)\n" " fs_obj = svn.repos.svn_repos_fs(repos_obj)\n" "\n" " # Query the current youngest revision.\n" " youngest_rev = svn.fs.svn_fs_youngest_rev(fs_obj)\n" " \n" " # Open a root object representing the youngest (HEAD) revision.\n" " root_obj = svn.fs.svn_fs_revision_root(fs_obj, youngest_rev)\n" "\n" " # Do the recursive crawl.\n" " crawl_filesystem_dir(root_obj, \"\")\n" " \n" "if __name__ == \"__main__\":\n" " # Check for sane usage.\n" " if len(sys.argv) != 2:\n" " sys.stderr.write(\"Usage: %s REPOS_PATH\\n\"\n" " % (os.path.basename(sys.argv[0])))\n" " sys.exit(1)\n" "\n" " # Canonicalize the repository path.\n" " repos_path = svn.core.svn_path_canonicalize(sys.argv[1])\n" "\n" " # Do the real work.\n" " crawl_youngest(repos_path)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:1213 msgid "" "This same program in C would need to deal with APR's memory pool system. " "But Python handles memory usage automatically, and Subversion's Python " "bindings adhere to that convention. In C, you'd be working with custom " "datatypes (such as those provided by the APR library) for representing the " "hash of entries and the list of paths, but Python has hashes (called " "<quote>dictionaries</quote>) and lists as built-in datatypes, and it " "provides a rich collection of functions for operating on those types. So " "SWIG (with the help of some customizations in Subversion's language bindings " "layer) takes care of mapping those custom datatypes into the native " "datatypes of the target language. This provides a more intuitive interface " "for users of that language." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:1227 msgid "" "The Subversion Python bindings can be used for working copy operations, " "too. In the previous section of this chapter, we mentioned the " "<filename>libsvn_client</filename> interface and how it exists for the sole " "purpose of simplifying the process of writing a Subversion client. <xref " "linkend=\"svn.developer.usingapi.otherlangs.ex-2\" /> is a brief example of " "how that library can be accessed via the SWIG Python bindings to re-create a " "scaled-down version of the <command>svn status</command> command." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch08-embedding-svn.xml:1238 msgid "A Python status crawler" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch08-embedding-svn.xml:1240 #, no-wrap msgid "" "\n" "#!/usr/bin/env python\n" "\n" "\"\"\"Crawl a working copy directory, printing status information.\"\"\"\n" "\n" "import sys\n" "import os.path\n" "import getopt\n" "import svn.core, svn.client, svn.wc\n" "\n" "def generate_status_code(status):\n" " \"\"\"Translate a status value into a single-character status code,\n" " using the same logic as the Subversion command-line client.\"\"\"\n" " code_map = { svn.wc.svn_wc_status_none : ' ',\n" " svn.wc.svn_wc_status_normal : ' ',\n" " svn.wc.svn_wc_status_added : 'A',\n" " svn.wc.svn_wc_status_missing : '!',\n" " svn.wc.svn_wc_status_incomplete : '!',\n" " svn.wc.svn_wc_status_deleted : 'D',\n" " svn.wc.svn_wc_status_replaced : 'R',\n" " svn.wc.svn_wc_status_modified : 'M',\n" " svn.wc.svn_wc_status_merged : 'G',\n" " svn.wc.svn_wc_status_conflicted : 'C',\n" " svn.wc.svn_wc_status_obstructed : '~',\n" " svn.wc.svn_wc_status_ignored : 'I',\n" " svn.wc.svn_wc_status_external : 'X',\n" " svn.wc.svn_wc_status_unversioned : '?',\n" " }\n" " return code_map.get(status, '?')\n" "\n" "def do_status(wc_path, verbose):\n" " # Build a client context baton.\n" " ctx = svn.client.svn_client_ctx_t()\n" "\n" " def _status_callback(path, status):\n" " \"\"\"A callback function for svn_client_status.\"\"\"\n" "\n" " # Print the path, minus the bit that overlaps with the root of\n" " # the status crawl\n" " text_status = generate_status_code(status.text_status)\n" " prop_status = generate_status_code(status.prop_status)\n" " print '%s%s %s' % (text_status, prop_status, path)\n" " \n" " # Do the status crawl, using _status_callback() as our callback function.\n" " revision = svn.core.svn_opt_revision_t()\n" " revision.type = svn.core.svn_opt_revision_head\n" " svn.client.svn_client_status2(wc_path, revision, _status_callback,\n" " svn.core.svn_depth_infinity, verbose,\n" " 0, 0, 1, ctx)\n" "\n" "def usage_and_exit(errorcode):\n" " \"\"\"Print usage message, and exit with ERRORCODE.\"\"\"\n" " stream = errorcode and sys.stderr or sys.stdout\n" " stream.write(\"\"\"Usage: %s OPTIONS WC-PATH\n" "Options:\n" " --help, -h : Show this usage message\n" " --verbose, -v : Show all statuses, even uninteresting ones\n" "\"\"\" % (os.path.basename(sys.argv[0])))\n" " sys.exit(errorcode)\n" " \n" "if __name__ == '__main__':\n" " # Parse command-line options.\n" " try:\n" " opts, args = getopt.getopt(sys.argv[1:], \"hv\", [\"help\", \"verbose\"])\n" " except getopt.GetoptError:\n" " usage_and_exit(1)\n" " verbose = 0\n" " for opt, arg in opts:\n" " if opt in (\"-h\", \"--help\"):\n" " usage_and_exit(0)\n" " if opt in (\"-v\", \"--verbose\"):\n" " verbose = 1\n" " if len(args) != 1:\n" " usage_and_exit(2)\n" " \n" " # Canonicalize the repository path.\n" " wc_path = svn.core.svn_path_canonicalize(args[0])\n" "\n" " # Do the real work.\n" " try:\n" " do_status(wc_path, verbose)\n" " except svn.core.SubversionException, e:\n" " sys.stderr.write(\"Error (%d): %s\\n\" % (e.apr_err, e.message))\n" " sys.exit(1)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:1327 msgid "" "As was the case in <xref linkend=\"svn.developer.usingapi.otherlangs.ex-1\" /" ">, this program is pool-free and uses, for the most part, normal Python " "datatypes. The call to <function>svn_client_ctx_t()</function> is deceiving " "because the public Subversion API has no such function—this just " "happens to be a case where SWIG's automatic language generation bleeds " "through a little bit (the function is a sort of factory function for " "Python's version of the corresponding complex C structure). Also note that " "the path passed to this program (like the last one) gets run through " "<function>svn_path_canonicalize()</function>, because to <emphasis>not</" "emphasis> do so runs the risk of triggering the underlying Subversion C " "library's assertions about such things, which translates into rather " "immediate and unceremonious program abortion." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:1353 msgid "" "One of Subversion's greatest features isn't something you get from running " "its command-line client or other tools. It's the fact that Subversion was " "designed modularly and provides a stable, public API so that others—" "like yourself, perhaps—can write custom software that drives " "Subversion's core logic." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:1360 msgid "" "In this chapter, we took a closer look at Subversion's architecture, " "examining its logical layers and describing that public API, the very same " "API that Subversion's own layers use to communicate with each other. Many " "developers have found interesting uses for the Subversion API, from simple " "repository hook scripts, to integrations between Subversion and some other " "application, to completely different version control systems. What unique " "itch will <emphasis>you</emphasis> scratch with it?" msgstr "" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2 #, fuzzy #| msgid "Subversion's Components" msgid "Subversion Complete Reference" msgstr "Die Komponenten von Subversion" # type: Content of: <chapter><para> #: ../en/book/ch09-reference.xml:4 msgid "" "This chapter is intended to be a complete reference to using Subversion. " "This includes the command-line client (<command>svn</command>) and all its " "subcommands, as well as the repository administration programs " "(<command>svnadmin</command> and <command>svnlook</command>) and their " "respective subcommands." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:16 msgid "The Subversion Command-Line Client: <command>svn</command>" msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch09-reference.xml:18 msgid "" "To use the command-line client, type <command>svn</command>, the subcommand " "you wish to use, <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch09-reference.xml:21 msgid "" "Well, you don't need a subcommand to use the <option>--version</option> " "option, but we'll get to that in just a minute." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:24 msgid "" "</footnote> and any options or targets that you wish to operate on—the " "subcommand and the options need not appear in a specific order. For " "example, all of the following are valid ways to use <command>svn status</" "command>:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch09-reference.xml:30 #, no-wrap msgid "" "\n" "$ svn -v status\n" "$ svn status -v \n" "$ svn status -v myfile\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:36 msgid "" "You can find many more examples of how to use most client commands in <xref " "linkend=\"svn.tour\"/> and commands for managing properties in <xref linkend=" "\"svn.advanced.props\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:42 msgid "svn Options" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:44 msgid "" "While Subversion has different options for its subcommands, all options " "exist in a single namespace—that is, each option is guaranteed to mean " "the same thing regardless of the subcommand you use it with. For example, " "<option>--verbose</option> (<option>-v</option>) always means " "<quote>verbose output,</quote> regardless of the subcommand you use it with." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:52 msgid "" "The <command>svn</command> command-line client usually exits quickly with an " "error if you pass it an option which does not apply to the specified " "subcommand. But as of Subversion 1.5, several of the options which apply to " "all—or nearly all—of the subcommands have been deemed acceptable " "by all subcommands, even if they have no effect on some of them. They " "appear grouped together in the command-line client's usage messages as " "global options. This was done to assist folks who write scripts which wrap " "the command-line client. These global options are as follows:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:67 ../en/book/ch09-reference.xml:7648 msgid "<option>--config-dir</option> <replaceable>DIR</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:70 ../en/book/ch09-reference.xml:7651 msgid "" "Instructs Subversion to read configuration information from the specified " "directory instead of the default location (<filename>.subversion</filename> " "in the user's home directory)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:78 ../en/book/ch09-reference.xml:7659 msgid "<option>--no-auth-cache</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:80 ../en/book/ch09-reference.xml:7661 msgid "" "Prevents caching of authentication information (e.g., username and password) " "in the Subversion runtime configuration directories." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:87 ../en/book/ch09-reference.xml:7668 msgid "<option>--non-interactive</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:89 msgid "" "Disables all interactive prompting. Some examples of interactive prompting " "include requests for authentication credentials and conflict resolution " "decisions. This is useful if you're running Subversion inside an automated " "script and it's more appropriate to have Subversion fail than to prompt for " "more information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:100 msgid "<option>--password</option> <replaceable>PASSWD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:103 msgid "" "Specifies the password to use when authenticating against a Subversion " "server. If not provided, or if incorrect, Subversion will prompt you for " "this information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:111 #, fuzzy #| msgid "<filename>filename.r<replaceable>NEWREV</replaceable> </filename>" msgid "<option>--username</option> <replaceable>NAME</replaceable>" msgstr "<filename>filename.r<replaceable>NEWREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:114 msgid "" "Specifies the username to use when authenticating against a Subversion " "server. If not provided, or if incorrect, Subversion will prompt you for " "this information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:123 msgid "" "The rest of the options apply and are accepted by only a subset of the " "subcommand. They are as follows:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:129 msgid "<option>--accept</option> <replaceable>ACTION</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:132 msgid "" "Specifies an action for automatic conflict resolution. Possible actions are " "<literal>postpone</literal>, <literal>base</literal>, <literal>mine-full</" "literal>, <literal>theirs-full</literal>, <literal>edit</literal>, and " "<literal>launch</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:141 msgid "<option>--auto-props</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:143 msgid "" "Enables auto-props, overriding the <literal>enable-auto-props</literal> " "directive in the <filename>config</filename> file." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:150 msgid "" "<option>--change</option> (<option>-c</option>) <replaceable>ARG</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:153 msgid "" "Used as a means to refer to a specific <quote>change</quote> (a.k.a. a " "revision). This option is syntactic sugar for <quote>-r ARG-1:ARG</quote>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:160 msgid "<option>--changelist</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:163 msgid "" "Instructs Subversion to operate only on members of the changelist named " "<replaceable>ARG</replaceable>. You can use this option multiple times to " "specify sets of changelists." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:170 msgid "<option>--cl</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:173 msgid "An alias for the <option>--changelist</option> option." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:179 msgid "<option>--depth</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:182 msgid "" "Instructs Subversion to limit the scope of an operation to a particular tree " "depth. <replaceable>ARG</replaceable> is one of <literal>empty</literal>, " "<literal>files</literal>, <literal>immediates</literal>, or " "<literal>infinity</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:191 msgid "<option>--diff-cmd</option> <replaceable>CMD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:194 msgid "" "Specifies an external program to use to show differences between files. " "When <command>svn diff</command> is invoked without this option, it uses " "Subversion's internal diff engine, which provides unified diffs by default. " "If you want to use an external diff program, use <option>--diff-cmd</" "option>. You can pass options to the diff program with the <option>--" "extensions</option> option (more on that later in this section)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:207 msgid "<option>--diff3-cmd</option> <replaceable>CMD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:210 msgid "Specifies an external program to use to merge files." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:215 msgid "<option>--dry-run</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:217 msgid "" "Goes through all the motions of running a command, but makes no actual " "changes—either on disk or in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:224 msgid "<option>--editor-cmd</option> <replaceable>CMD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:227 msgid "" "Specifies an external program to use to edit a log message or a property " "value. See the <literal>editor-cmd</literal> section in <xref linkend=\"svn." "advanced.confarea.opts.config\"/> for ways to specify a default editor." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:235 msgid "<option>--encoding</option> <replaceable>ENC</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:237 msgid "" "Tells Subversion that your commit message is encoded in the charset " "provided. The default is your operating system's native locale, and you " "should specify the encoding if your commit message is in any other encoding." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:246 msgid "" "<option>--extensions</option> (<option>-x</option>) <replaceable>ARGS</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:249 msgid "" "Specifies an argument or arguments that Subversion should pass to an " "external diff command. This option is valid only when used with the " "<command>svn diff</command> or <command>svn merge</command> commands, with " "the <option>--diff-cmd</option> option. If you wish to pass multiple " "arguments, you must enclose all of them in quotes (e.g., <userinput>svn diff " "--diff-cmd /usr/bin/diff -x \"-b -E\"</userinput>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:266 msgid "" "<option>--file</option> (<option>-F</option>) <replaceable>FILENAME</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:270 msgid "" "Uses the contents of the named file for the specified subcommand, though " "different subcommands do different things with this content. For example, " "<command>svn commit</command> uses the content as a commit log, whereas " "<command>svn propset</command> uses it as a property value." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:280 msgid "<option>--force</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:282 msgid "" "Forces a particular command or operation to run. Subversion will prevent " "you from performing some operations in normal usage, but you can pass the " "force option to tell Subversion <quote>I know what I'm doing as well as the " "possible repercussions of doing it, so let me at 'em.</quote> This option is " "the programmatic equivalent of doing your own electrical work with the power " "on—if you don't know what you're doing, you're likely to get a nasty " "shock." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:295 msgid "<option>--force-log</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:297 msgid "" "Forces a suspicious parameter passed to the <option>--message</option> " "(<option>-m</option>) or <option>--file</option> (<option>-F</option>) " "option to be accepted as valid. By default, Subversion will produce an " "error if parameters to these options look like they might instead be targets " "of the subcommand. For example, if you pass a versioned file's path to the " "<option>--file</option> (<option>-F</option>) option, Subversion will assume " "you've made a mistake, that the path was instead intended as the target of " "the operation, and that you simply failed to provide some other—" "unversioned—file as the source of your log message. To assert your " "intent and override these types of errors, pass the <option>--force-log</" "option> option to subcommands that accept log messages." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:316 msgid "<option>--help</option> (<option>-h</option>) or <option>-?</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:320 msgid "" "If used with one or more subcommands, shows the built-in help text for " "each. If used alone, it displays the general client help text." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:327 msgid "<option>--ignore-ancestry</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:329 msgid "" "Tells Subversion to ignore ancestry when calculating differences (rely on " "path contents alone)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:335 msgid "<option>--ignore-externals</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:337 msgid "" "Tells Subversion to ignore externals definitions and the external working " "copies managed by them." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:343 ../en/book/ch09-reference.xml:5405 msgid "<option>--incremental</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:345 msgid "Prints output in a format suitable for concatenation." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:351 msgid "<option>--keep-changelists</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:353 msgid "Tells Subversion not to delete changelists after committing." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:358 msgid "<option>--keep-local</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:360 msgid "" "Keeps the local copy of a file or directory (used with the <command>svn " "delete</command> command)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:366 msgid "" "<option>--limit</option> (<option>-l</option>) <replaceable>NUM</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:369 msgid "Shows only the first <replaceable>NUM</replaceable> log messages." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:375 msgid "" "<option>--message</option> (<option>-m</option>) <replaceable>MESSAGE</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:379 msgid "" "Indicates that you will specify either a log message or a lock comment on " "the command line, following this option. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><screen> #: ../en/book/ch09-reference.xml:383 #, no-wrap msgid "" "\n" "$ svn commit -m \"They don't make Sunday.\"\n" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:390 msgid "<option>--new</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:392 msgid "" "Uses <replaceable>ARG</replaceable> as the newer target (for use with " "<command>svn diff</command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:398 msgid "<option>--no-auto-props</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:400 msgid "" "Disables auto-props, overriding the <literal>enable-auto-props</literal> " "directive in the <filename>config</filename> file." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:407 ../en/book/ch09-reference.xml:6626 msgid "<option>--no-diff-deleted</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:409 msgid "" "Prevents Subversion from printing differences for deleted files. The " "default behavior when you remove a file is for <command>svn diff</command> " "to print the same differences that you would see if you had left the file " "but removed all the content." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:418 msgid "<option>--no-ignore</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:420 msgid "" "Shows files in the status listing that would normally be omitted since they " "match a pattern in the <literal>global-ignores</literal> configuration " "option or the <literal>svn:ignore</literal> property. See <xref linkend=" "\"svn.advanced.confarea.opts.config\"/> and <xref linkend=\"svn.advanced." "props.special.ignore\"/> for more information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:431 msgid "<option>--no-unlock</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:433 msgid "" "Tells Subversion not to automatically unlock files (the default commit " "behavior is to unlock all files listed as part of the commit). See <xref " "linkend=\"svn.advanced.locking\"/> for more information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:441 msgid "<option>--non-recursive</option> (<option>-N</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:443 msgid "" "<emphasis>Deprecated</emphasis>. Stops a subcommand from recursing into " "subdirectories. Most subcommands recurse by default, but some " "subcommands—usually those that have the potential to remove or undo " "your local modifications—do not." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:452 msgid "<option>--notice-ancestry</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:454 msgid "Pays attention to ancestry when calculating differences." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:460 msgid "<option>--old</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:462 msgid "" "Uses <replaceable>ARG</replaceable> as the older target (for use with " "<command>svn diff</command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:468 msgid "<option>--parents</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:470 msgid "" "Creates and adds nonexistent or nonversioned parent subdirectories to the " "working copy or repository as part of an operation. This is useful for " "automatically creating multiple subdirectories where none currently exist. " "If performed on a URL, all the directories will be created in a single " "commit." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:480 ../en/book/ch09-reference.xml:7680 msgid "<option>--quiet</option> (<option>-q</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:482 ../en/book/ch09-reference.xml:7682 msgid "" "Requests that the client print only essential information while performing " "an operation." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:488 msgid "<option>--record-only</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:490 msgid "Marks revisions as merged (for use with <option>--revision</option>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:496 msgid "<option>--recursive</option> (<option>-R</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:498 msgid "" "Makes a subcommand recurse into subdirectories. Most subcommands recurse by " "default." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:504 msgid "<option>--reintegrate</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:506 msgid "" "Used with the <command>svn merge</command> subcommand, merges all of the " "source URL's changes into the working copy. See <xref linkend=\"svn." "branchemerge.basicmerging.stayinsync\"/> for details." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:515 msgid "" "<option>--relocate</option> <replaceable>FROM TO [PATH...]</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:518 msgid "" "Used with the <command>svn switch</command> subcommand, changes the location " "of the repository that your working copy references. This is useful if the " "location of your repository changes and you have an existing working copy " "that you'd like to continue to use. See <command>svn switch</command> for " "an example." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:529 msgid "<option>--remove</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:532 msgid "Disassociates <replaceable>ARG</replaceable> from a changelist" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:538 msgid "" "<option>--revision</option> (<option>-r</option>) <replaceable>REV</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:542 msgid "" "Indicates that you're going to supply a revision (or range of revisions) for " "a particular operation. You can provide revision numbers, keywords, or " "dates (in curly braces) as arguments to the revision option. If you wish to " "offer a range of revisions, you can provide two revisions separated by a " "colon. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><screen> #: ../en/book/ch09-reference.xml:550 #, no-wrap msgid "" "\n" "$ svn log -r 1729\n" "$ svn log -r 1729:HEAD\n" "$ svn log -r 1729:1744\n" "$ svn log -r {2001-12-04}:{2002-02-17}\n" "$ svn log -r 1729:{2002-02-17}\n" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:558 msgid "See <xref linkend=\"svn.tour.revs.keywords\"/> for more information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:564 ../en/book/ch09-reference.xml:6657 msgid "<option>--revprop</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:566 ../en/book/ch09-reference.xml:6659 msgid "" "Operates on a revision property instead of a property specific to a file or " "directory. This option requires that you also pass a revision with the " "<option>--revision</option> (<option>-r</option>) option." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:575 msgid "<option>--set-depth</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:578 msgid "" "Sets the sticky depth on a directory in a working copy to one of " "<literal>empty</literal>, <literal>files</literal>, <literal>immediates</" "literal>, or <literal>infinity</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:586 msgid "<option>--show-revs</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:588 msgid "" "Used to make <command>svn mergeinfo</command> display either " "<literal>merged</literal> or <literal>eligible</literal> revisions." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:595 msgid "<option>--show-updates</option> (<option>-u</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:597 msgid "" "Causes the client to display information about which files in your working " "copy are out of date. This doesn't actually update any of your files—" "it just shows you which files will be updated if you then use <command>svn " "update</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:607 msgid "<option>--stop-on-copy</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:609 msgid "" "Causes a Subversion subcommand that traverses the history of a versioned " "resource to stop harvesting that historical information when a copy—" "that is, a location in history where that resource was copied from another " "location in the repository—is encountered." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:619 msgid "<option>--strict</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:621 msgid "" "Causes Subversion to use strict semantics, a notion that is rather vague " "unless talking about specific subcommands (namely, <command>svn propget</" "command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:628 msgid "<option>--targets</option> <replaceable>FILENAME</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:631 msgid "" "Tells Subversion to get the list of files that you wish to operate on from " "the filename that you provide instead of listing all the files on the " "command line." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:639 msgid "<option>--use-merge-history</option> (<option>-g</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:642 msgid "Uses or displays additional information from merge history." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:648 msgid "<option>--verbose</option> (<option>-v</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:650 msgid "" "Requests that the client print out as much information as it can while " "running any subcommand. This may result in Subversion printing out " "additional fields, detailed information about every file, or additional " "information regarding its actions." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:659 ../en/book/ch09-reference.xml:8190 #: ../en/book/ch09-reference.xml:8532 msgid "<option>--version</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:661 msgid "" "Prints the client version info. This information includes not only the " "version number of the client, but also a listing of all repository access " "modules that the client can use to access a Subversion repository. With " "<option>--quiet</option> (<option>-q</option>) it prints only the version " "number in a compact form." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:671 msgid "<option>--with-all-revprops</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:673 msgid "" "Used with the <option>--xml</option> option to <command>svn log</command>, " "will retrieve and display all revision properties in the log output." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:680 msgid "<option>--with-revprop</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:683 msgid "" "When used with any command that writes to the repository, sets the revision " "property, using the <replaceable>NAME=VALUE</replaceable> format, " "<replaceable>NAME</replaceable> to <replaceable>VALUE</replaceable>. When " "used with <command>svn log</command> in <option>--xml</option> mode, this " "displays the value of <replaceable>ARG</replaceable> in the log output." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:694 msgid "<option>--xml</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:696 msgid "Prints output in XML format." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:706 msgid "svn Subcommands" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:708 msgid "" "Here are the various subcommands for the <command>svn</command> program. " "For the sake of brevity, we omit the global options (described in <xref " "linkend=\"svn.ref.svn.sw\" />) from the subcommand descriptions which follow." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:722 #, fuzzy #| msgid "svnadmin" msgid "svn add" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:723 msgid "Add files, directories, or symbolic links." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:727 ../en/book/ch09-reference.xml:836 #: ../en/book/ch09-reference.xml:972 ../en/book/ch09-reference.xml:1052 #: ../en/book/ch09-reference.xml:1147 ../en/book/ch09-reference.xml:1294 #: ../en/book/ch09-reference.xml:1371 ../en/book/ch09-reference.xml:1511 #: ../en/book/ch09-reference.xml:1716 ../en/book/ch09-reference.xml:1828 #: ../en/book/ch09-reference.xml:2153 ../en/book/ch09-reference.xml:2268 #: ../en/book/ch09-reference.xml:2318 ../en/book/ch09-reference.xml:2425 #: ../en/book/ch09-reference.xml:2611 ../en/book/ch09-reference.xml:2754 #: ../en/book/ch09-reference.xml:2847 ../en/book/ch09-reference.xml:3158 #: ../en/book/ch09-reference.xml:3305 ../en/book/ch09-reference.xml:3378 #: ../en/book/ch09-reference.xml:3462 ../en/book/ch09-reference.xml:3591 #: ../en/book/ch09-reference.xml:3670 ../en/book/ch09-reference.xml:3747 #: ../en/book/ch09-reference.xml:3845 ../en/book/ch09-reference.xml:3948 #: ../en/book/ch09-reference.xml:4086 ../en/book/ch09-reference.xml:4218 #: ../en/book/ch09-reference.xml:4312 ../en/book/ch09-reference.xml:4424 #: ../en/book/ch09-reference.xml:4867 ../en/book/ch09-reference.xml:5064 #: ../en/book/ch09-reference.xml:5152 ../en/book/ch09-reference.xml:5519 #: ../en/book/ch09-reference.xml:5567 ../en/book/ch09-reference.xml:5646 #: ../en/book/ch09-reference.xml:5686 ../en/book/ch09-reference.xml:5787 #: ../en/book/ch09-reference.xml:5819 ../en/book/ch09-reference.xml:5873 #: ../en/book/ch09-reference.xml:5906 ../en/book/ch09-reference.xml:5954 #: ../en/book/ch09-reference.xml:6020 ../en/book/ch09-reference.xml:6074 #: ../en/book/ch09-reference.xml:6120 ../en/book/ch09-reference.xml:6197 #: ../en/book/ch09-reference.xml:6242 ../en/book/ch09-reference.xml:6297 #: ../en/book/ch09-reference.xml:6358 ../en/book/ch09-reference.xml:6414 #: ../en/book/ch09-reference.xml:6469 ../en/book/ch09-reference.xml:6536 #: ../en/book/ch09-reference.xml:6708 ../en/book/ch09-reference.xml:6754 #: ../en/book/ch09-reference.xml:6812 ../en/book/ch09-reference.xml:6936 #: ../en/book/ch09-reference.xml:6982 ../en/book/ch09-reference.xml:7054 #: ../en/book/ch09-reference.xml:7100 ../en/book/ch09-reference.xml:7140 #: ../en/book/ch09-reference.xml:7203 ../en/book/ch09-reference.xml:7254 #: ../en/book/ch09-reference.xml:7306 ../en/book/ch09-reference.xml:7352 #: ../en/book/ch09-reference.xml:7407 ../en/book/ch09-reference.xml:7471 #: ../en/book/ch09-reference.xml:7531 ../en/book/ch09-reference.xml:7574 #: ../en/book/ch09-reference.xml:7757 ../en/book/ch09-reference.xml:7825 #: ../en/book/ch09-reference.xml:7866 ../en/book/ch09-reference.xml:7943 #: ../en/book/ch09-reference.xml:8299 ../en/book/ch09-reference.xml:8363 #: ../en/book/ch09-reference.xml:8427 ../en/book/ch09-reference.xml:8470 msgid "Synopsis" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:728 #, no-wrap msgid "svn add PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:733 msgid "" "Schedule files, directories, or symbolic links in your working copy for " "addition to the repository. They will be uploaded and added to the " "repository on your next commit. If you add something and change your mind " "before committing, you can unschedule the addition using <command>svn " "revert</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:743 ../en/book/ch09-reference.xml:849 #: ../en/book/ch09-reference.xml:984 ../en/book/ch09-reference.xml:1067 #: ../en/book/ch09-reference.xml:1164 ../en/book/ch09-reference.xml:1318 #: ../en/book/ch09-reference.xml:1406 ../en/book/ch09-reference.xml:1579 #: ../en/book/ch09-reference.xml:1738 ../en/book/ch09-reference.xml:1969 #: ../en/book/ch09-reference.xml:2178 ../en/book/ch09-reference.xml:2279 #: ../en/book/ch09-reference.xml:2336 ../en/book/ch09-reference.xml:2470 #: ../en/book/ch09-reference.xml:2655 ../en/book/ch09-reference.xml:2770 #: ../en/book/ch09-reference.xml:2884 ../en/book/ch09-reference.xml:3220 #: ../en/book/ch09-reference.xml:3324 ../en/book/ch09-reference.xml:3398 #: ../en/book/ch09-reference.xml:3510 ../en/book/ch09-reference.xml:3607 #: ../en/book/ch09-reference.xml:3686 ../en/book/ch09-reference.xml:3764 #: ../en/book/ch09-reference.xml:3861 ../en/book/ch09-reference.xml:3974 #: ../en/book/ch09-reference.xml:4154 ../en/book/ch09-reference.xml:4240 #: ../en/book/ch09-reference.xml:4329 ../en/book/ch09-reference.xml:4730 #: ../en/book/ch09-reference.xml:4922 ../en/book/ch09-reference.xml:5081 #: ../en/book/ch09-reference.xml:5242 ../en/book/ch09-reference.xml:5800 #: ../en/book/ch09-reference.xml:7119 ../en/book/ch09-reference.xml:7364 #: ../en/book/ch09-reference.xml:7419 msgid "Alternate names" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:744 ../en/book/ch09-reference.xml:985 #: ../en/book/ch09-reference.xml:1319 ../en/book/ch09-reference.xml:2179 #: ../en/book/ch09-reference.xml:2337 ../en/book/ch09-reference.xml:2471 #: ../en/book/ch09-reference.xml:2771 ../en/book/ch09-reference.xml:2885 #: ../en/book/ch09-reference.xml:3221 ../en/book/ch09-reference.xml:3325 #: ../en/book/ch09-reference.xml:3399 ../en/book/ch09-reference.xml:4155 #: ../en/book/ch09-reference.xml:4241 ../en/book/ch09-reference.xml:4330 #: ../en/book/ch09-reference.xml:5082 ../en/book/ch09-reference.xml:5537 #: ../en/book/ch09-reference.xml:6038 ../en/book/ch09-reference.xml:6209 #: ../en/book/ch09-reference.xml:6431 ../en/book/ch09-reference.xml:6500 #: ../en/book/ch09-reference.xml:7115 ../en/book/ch09-reference.xml:7269 #: ../en/book/ch09-reference.xml:7547 ../en/book/ch09-reference.xml:7585 #: ../en/book/ch09-reference.xml:7780 ../en/book/ch09-reference.xml:7842 #: ../en/book/ch09-reference.xml:7847 ../en/book/ch09-reference.xml:8442 msgid "None" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:748 ../en/book/ch09-reference.xml:854 #: ../en/book/ch09-reference.xml:989 ../en/book/ch09-reference.xml:1072 #: ../en/book/ch09-reference.xml:1169 ../en/book/ch09-reference.xml:1323 #: ../en/book/ch09-reference.xml:1413 ../en/book/ch09-reference.xml:1584 #: ../en/book/ch09-reference.xml:1743 ../en/book/ch09-reference.xml:1974 #: ../en/book/ch09-reference.xml:2183 ../en/book/ch09-reference.xml:2287 #: ../en/book/ch09-reference.xml:2341 ../en/book/ch09-reference.xml:2475 #: ../en/book/ch09-reference.xml:2660 ../en/book/ch09-reference.xml:2775 #: ../en/book/ch09-reference.xml:2889 ../en/book/ch09-reference.xml:3225 #: ../en/book/ch09-reference.xml:3329 ../en/book/ch09-reference.xml:3403 #: ../en/book/ch09-reference.xml:3515 ../en/book/ch09-reference.xml:3612 #: ../en/book/ch09-reference.xml:3691 ../en/book/ch09-reference.xml:3769 #: ../en/book/ch09-reference.xml:3866 ../en/book/ch09-reference.xml:3979 #: ../en/book/ch09-reference.xml:4159 ../en/book/ch09-reference.xml:4245 #: ../en/book/ch09-reference.xml:4334 ../en/book/ch09-reference.xml:4735 #: ../en/book/ch09-reference.xml:4927 ../en/book/ch09-reference.xml:5086 #: ../en/book/ch09-reference.xml:5247 #, fuzzy #| msgid "Make changes." msgid "Changes" msgstr "Nehmen Sie Änderungen vor." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:749 ../en/book/ch09-reference.xml:1073 #: ../en/book/ch09-reference.xml:1324 ../en/book/ch09-reference.xml:3226 #: ../en/book/ch09-reference.xml:4160 ../en/book/ch09-reference.xml:4246 #: ../en/book/ch09-reference.xml:4335 ../en/book/ch09-reference.xml:4928 #: ../en/book/ch09-reference.xml:5248 #, fuzzy #| msgid "Working Copies" msgid "Working copy" msgstr "Arbeitskopien" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:753 ../en/book/ch09-reference.xml:859 #: ../en/book/ch09-reference.xml:994 ../en/book/ch09-reference.xml:1077 #: ../en/book/ch09-reference.xml:1174 ../en/book/ch09-reference.xml:1328 #: ../en/book/ch09-reference.xml:1418 ../en/book/ch09-reference.xml:1589 #: ../en/book/ch09-reference.xml:1749 ../en/book/ch09-reference.xml:1979 #: ../en/book/ch09-reference.xml:2188 ../en/book/ch09-reference.xml:2292 #: ../en/book/ch09-reference.xml:2346 ../en/book/ch09-reference.xml:2480 #: ../en/book/ch09-reference.xml:2665 ../en/book/ch09-reference.xml:2780 #: ../en/book/ch09-reference.xml:2894 ../en/book/ch09-reference.xml:3230 #: ../en/book/ch09-reference.xml:3334 ../en/book/ch09-reference.xml:3408 #: ../en/book/ch09-reference.xml:3520 ../en/book/ch09-reference.xml:3617 #: ../en/book/ch09-reference.xml:3696 ../en/book/ch09-reference.xml:3774 #: ../en/book/ch09-reference.xml:3871 ../en/book/ch09-reference.xml:3984 #: ../en/book/ch09-reference.xml:4164 ../en/book/ch09-reference.xml:4250 #: ../en/book/ch09-reference.xml:4339 ../en/book/ch09-reference.xml:4740 #: ../en/book/ch09-reference.xml:4932 ../en/book/ch09-reference.xml:5091 #: ../en/book/ch09-reference.xml:5252 #, fuzzy #| msgid "The Repository" msgid "Accesses repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:758 ../en/book/ch09-reference.xml:864 #: ../en/book/ch09-reference.xml:999 ../en/book/ch09-reference.xml:1082 #: ../en/book/ch09-reference.xml:1179 ../en/book/ch09-reference.xml:1333 #: ../en/book/ch09-reference.xml:1423 ../en/book/ch09-reference.xml:1595 #: ../en/book/ch09-reference.xml:1754 ../en/book/ch09-reference.xml:1985 #: ../en/book/ch09-reference.xml:2193 ../en/book/ch09-reference.xml:2297 #: ../en/book/ch09-reference.xml:2351 ../en/book/ch09-reference.xml:2485 #: ../en/book/ch09-reference.xml:2670 ../en/book/ch09-reference.xml:2785 #: ../en/book/ch09-reference.xml:2899 ../en/book/ch09-reference.xml:3235 #: ../en/book/ch09-reference.xml:3339 ../en/book/ch09-reference.xml:3413 #: ../en/book/ch09-reference.xml:3525 ../en/book/ch09-reference.xml:3622 #: ../en/book/ch09-reference.xml:3701 ../en/book/ch09-reference.xml:3779 #: ../en/book/ch09-reference.xml:3876 ../en/book/ch09-reference.xml:3989 #: ../en/book/ch09-reference.xml:4169 ../en/book/ch09-reference.xml:4255 #: ../en/book/ch09-reference.xml:4344 ../en/book/ch09-reference.xml:4745 #: ../en/book/ch09-reference.xml:4937 ../en/book/ch09-reference.xml:5096 #: ../en/book/ch09-reference.xml:5257 ../en/book/ch09-reference.xml:5535 #: ../en/book/ch09-reference.xml:5599 ../en/book/ch09-reference.xml:5664 #: ../en/book/ch09-reference.xml:5741 ../en/book/ch09-reference.xml:5839 #: ../en/book/ch09-reference.xml:5966 ../en/book/ch09-reference.xml:6036 #: ../en/book/ch09-reference.xml:6130 ../en/book/ch09-reference.xml:6207 #: ../en/book/ch09-reference.xml:6254 ../en/book/ch09-reference.xml:6324 #: ../en/book/ch09-reference.xml:6375 ../en/book/ch09-reference.xml:6429 #: ../en/book/ch09-reference.xml:6498 ../en/book/ch09-reference.xml:6557 #: ../en/book/ch09-reference.xml:6719 ../en/book/ch09-reference.xml:6765 #: ../en/book/ch09-reference.xml:6870 ../en/book/ch09-reference.xml:6947 #: ../en/book/ch09-reference.xml:6993 ../en/book/ch09-reference.xml:7066 #: ../en/book/ch09-reference.xml:7114 ../en/book/ch09-reference.xml:7152 #: ../en/book/ch09-reference.xml:7214 ../en/book/ch09-reference.xml:7267 #: ../en/book/ch09-reference.xml:7316 ../en/book/ch09-reference.xml:7369 #: ../en/book/ch09-reference.xml:7424 ../en/book/ch09-reference.xml:7483 #: ../en/book/ch09-reference.xml:7546 ../en/book/ch09-reference.xml:7584 #: ../en/book/ch09-reference.xml:7784 ../en/book/ch09-reference.xml:7846 #: ../en/book/ch09-reference.xml:7889 ../en/book/ch09-reference.xml:7972 #: ../en/book/ch09-reference.xml:8311 ../en/book/ch09-reference.xml:8375 #: ../en/book/ch09-reference.xml:8441 ../en/book/ch09-reference.xml:8501 msgid "Options" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:760 #, no-wrap msgid "" "\n" "--auto-props\n" "--depth ARG\n" "--force\n" "--no-auto-props\n" "--no-ignore\n" "--parents\n" "--quiet (-q)\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:773 ../en/book/ch09-reference.xml:906 #: ../en/book/ch09-reference.xml:1007 ../en/book/ch09-reference.xml:1191 #: ../en/book/ch09-reference.xml:1342 ../en/book/ch09-reference.xml:1442 #: ../en/book/ch09-reference.xml:1611 ../en/book/ch09-reference.xml:1771 #: ../en/book/ch09-reference.xml:2005 ../en/book/ch09-reference.xml:2206 #: ../en/book/ch09-reference.xml:2370 ../en/book/ch09-reference.xml:2499 #: ../en/book/ch09-reference.xml:2683 ../en/book/ch09-reference.xml:2798 #: ../en/book/ch09-reference.xml:2918 ../en/book/ch09-reference.xml:3254 #: ../en/book/ch09-reference.xml:3347 ../en/book/ch09-reference.xml:3428 #: ../en/book/ch09-reference.xml:3542 ../en/book/ch09-reference.xml:3635 #: ../en/book/ch09-reference.xml:3717 ../en/book/ch09-reference.xml:3793 #: ../en/book/ch09-reference.xml:3891 ../en/book/ch09-reference.xml:4006 #: ../en/book/ch09-reference.xml:4181 ../en/book/ch09-reference.xml:4266 #: ../en/book/ch09-reference.xml:4356 ../en/book/ch09-reference.xml:4761 #: ../en/book/ch09-reference.xml:4953 ../en/book/ch09-reference.xml:5105 #: ../en/book/ch09-reference.xml:5274 ../en/book/ch09-reference.xml:5542 #: ../en/book/ch09-reference.xml:5612 ../en/book/ch09-reference.xml:5752 #: ../en/book/ch09-reference.xml:5923 ../en/book/ch09-reference.xml:5979 #: ../en/book/ch09-reference.xml:6042 ../en/book/ch09-reference.xml:6087 #: ../en/book/ch09-reference.xml:6136 ../en/book/ch09-reference.xml:6213 #: ../en/book/ch09-reference.xml:6262 ../en/book/ch09-reference.xml:6333 #: ../en/book/ch09-reference.xml:6385 ../en/book/ch09-reference.xml:6436 #: ../en/book/ch09-reference.xml:6505 ../en/book/ch09-reference.xml:6566 #: ../en/book/ch09-reference.xml:6728 ../en/book/ch09-reference.xml:6774 #: ../en/book/ch09-reference.xml:6880 ../en/book/ch09-reference.xml:6956 #: ../en/book/ch09-reference.xml:7005 ../en/book/ch09-reference.xml:7075 #: ../en/book/ch09-reference.xml:7162 ../en/book/ch09-reference.xml:7223 #: ../en/book/ch09-reference.xml:7273 ../en/book/ch09-reference.xml:7325 #: ../en/book/ch09-reference.xml:7379 ../en/book/ch09-reference.xml:7435 #: ../en/book/ch09-reference.xml:7551 ../en/book/ch09-reference.xml:7589 #: ../en/book/ch09-reference.xml:7799 ../en/book/ch09-reference.xml:7904 #: ../en/book/ch09-reference.xml:7987 ../en/book/ch09-reference.xml:8323 #: ../en/book/ch09-reference.xml:8543 msgid "Examples" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:775 #, fuzzy #| msgid "Update your working copy." msgid "To add a file to your working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:777 #, no-wrap msgid "" "\n" "$ svn add foo.c \n" "A foo.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:782 msgid "" "When adding a directory, the default behavior of <command>svn add</command> " "is to recurse:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:785 #, no-wrap msgid "" "\n" "$ svn add testdir\n" "A testdir\n" "A testdir/a\n" "A testdir/b\n" "A testdir/c\n" "A testdir/d\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:794 msgid "You can add a directory without adding its contents:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:797 #, no-wrap msgid "" "\n" "$ svn add --depth=empty otherdir\n" "A otherdir\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:802 msgid "" "Normally, the command <userinput>svn add *</userinput> will skip over any " "directories that are already under version control. Sometimes, however, you " "may want to add every unversioned object in your working copy, including " "those hiding deeper. Passing the <option>--force</option> option makes " "<command>svn add</command> recurse into versioned directories:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:811 #, no-wrap msgid "" "\n" "$ svn add * --force\n" "A foo.c\n" "A somedir/bar.c\n" "A (bin) otherdir/docs/baz.doc\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:831 msgid "svn blame" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:832 msgid "" "Show author and revision information inline for the specified files or URLs." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:837 #, no-wrap msgid "svn blame TARGET[@REV]..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:842 msgid "" "Show author and revision information inline for the specified files or " "URLs. Each line of text is annotated at the beginning with the author " "(username) and the revision number for the last change to that line." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:850 msgid "" "<command>praise</command>, <command>annotate</command>, <command>ann</" "command>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:855 ../en/book/ch09-reference.xml:990 #: ../en/book/ch09-reference.xml:1975 ../en/book/ch09-reference.xml:2288 #: ../en/book/ch09-reference.xml:2476 ../en/book/ch09-reference.xml:2661 #: ../en/book/ch09-reference.xml:2890 ../en/book/ch09-reference.xml:3330 #: ../en/book/ch09-reference.xml:4736 msgid "Nothing" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:866 #, no-wrap msgid "" "\n" "--extensions (-x) ARG\n" "--force\n" "--incremental\n" "--revision (-r) ARG\n" "--use-merge-history (-g)\n" "--verbose (-v)\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:908 msgid "" "If you want to see blame-annotated source for <filename>readme.txt</" "filename> in your test repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:911 #, no-wrap msgid "" "\n" "$ svn blame http://svn.red-bean.com/repos/test/readme.txt\n" " 3 sally This is a README file.\n" " 5 harry You should read this.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:917 msgid "" "Even if <command>svn blame</command> says that Harry last modified " "<filename>readme.txt</filename> in revision 5, you'll have to examine " "exactly what the revision changed to be sure that Harry changed the " "<emphasis>context</emphasis> of the line—he may have adjusted just the " "whitespace." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:925 msgid "" "If you use the <option>--xml</option> option, you can get XML output " "describing the blame annotations, but not the contents of the lines " "themselves:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:929 #, no-wrap msgid "" "\n" "$ svn blame --xml http://svn.red-bean.com/repos/test/readme.txt\n" "<?xml version=\"1.0\"?>\n" "<blame>\n" "<target\n" " path=\"sandwich.txt\">\n" "<entry\n" " line-number=\"1\">\n" "<commit\n" " revision=\"3\">\n" "<author>sally</author>\n" "<date>2008-05-25T19:12:31.428953Z</date>\n" "</commit>\n" "</entry>\n" "<entry\n" " line-number=\"2\">\n" "<commit\n" " revision=\"5\">\n" "<author>harry</author>\n" "<date>2008-05-29T03:26:12.293121Z</date>\n" "</commit>\n" "</entry>\n" "</target>\n" "</blame>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:968 msgid "Output the contents of the specified files or URLs." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:973 #, no-wrap msgid "svn cat TARGET[@REV]..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:978 msgid "" "Output the contents of the specified files or URLs. For listing the " "contents of directories, see <command>svn list</command> later in this " "chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1001 ../en/book/ch09-reference.xml:3341 #, no-wrap msgid "" "\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1009 msgid "" "If you want to view <filename>readme.txt</filename> in your repository " "without checking it out:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1011 #, no-wrap msgid "" "\n" "$ svn cat http://svn.red-bean.com/repos/test/readme.txt\n" "This is a README file.\n" "You should read this.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:1018 msgid "" "If your working copy is out of date (or you have local modifications) and " "you want to see the <literal>HEAD</literal> revision of a file in your " "working copy, <command>svn cat -r HEAD <replaceable>FILENAME</replaceable></" "command> will automatically fetch the <literal>HEAD</literal> revision of " "the specified path:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1026 #, no-wrap msgid "" "\n" "$ cat foo.c\n" "This file is in my local working copy \n" "and has changes that I've made.\n" "\n" "$ svn cat -r HEAD foo.c\n" "Latest revision fresh from the repository!\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:1047 msgid "svn changelist" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1048 msgid "Associate (or deassociate) local paths with a changelist." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1053 #, no-wrap msgid "changelist CLNAME TARGET..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1054 #, no-wrap msgid "changelist --remove TARGET..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1059 msgid "" "Used for dividing files in a working copy into a changelist (logical named " "grouping) in order to allow users to easily work on multiple file " "collections within a single working copy." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1068 #, fuzzy #| msgid "<command>svn copy</command>" msgid "<command>cl</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1084 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--remove\n" "--targets ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:1095 ../en/book/ch09-reference.xml:7495 #: ../en/book/ch09-reference.xml:8387 msgid "Example" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1097 msgid "" "Edit three files, add them to a changelist, then commit only files in that " "changelist:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1100 #, no-wrap msgid "" "\n" "$ svn cl issue1729 foo.c bar.c baz.c\n" "Path 'foo.c' is now a member of changelist 'issue1729'.\n" "Path 'bar.c' is now a member of changelist 'issue1729'.\n" "Path 'baz.c' is now a member of changelist 'issue1729'.\n" "\n" "$ svn status\n" "A someotherfile.c\n" "A test/sometest.c\n" "\n" "--- Changelist 'issue1729':\n" "A foo.c\n" "A bar.c\n" "A baz.c\n" "\n" "$ svn commit --changelist issue1729 -m \"Fixing Issue 1729.\"\n" "Adding bar.c\n" "Adding baz.c\n" "Adding foo.c\n" "Transmitting file data ...\n" "Committed revision 2.\n" "\n" "$ svn status\n" "A someotherfile.c\n" "A test/sometest.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1127 msgid "" "Note that only the files in changelist <replaceable>issue1729</replaceable> " "were committed." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:1143 #, fuzzy #| msgid "Initial Checkout" msgid "svn checkout" msgstr "Anfänglicher Checkout" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1144 msgid "Check out a working copy from a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1148 #, no-wrap msgid "svn checkout URL[@REV]... [PATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1153 msgid "" "Check out a working copy from a repository. If <replaceable>PATH</" "replaceable> is omitted, the basename of the URL will be used as the " "destination. If multiple URLs are given, each will be checked out into a " "subdirectory of <replaceable>PATH</replaceable>, with the name of the " "subdirectory being the basename of the URL." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1165 #, fuzzy #| msgid "<command>svn copy</command>" msgid "<command>co</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:1170 #, fuzzy #| msgid "Update your working copy." msgid "Creates a working copy" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1181 #, no-wrap msgid "" "\n" "--depth ARG\n" "--force\n" "--ignore-externals\n" "--quiet (-q)\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1193 msgid "" "Check out a working copy into a directory called <filename>mine</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1196 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos/test mine\n" "A mine/a\n" "A mine/b\n" "A mine/c\n" "A mine/d\n" "Checked out revision 20.\n" "$ ls\n" "mine\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1207 msgid "Check out two different directories into two separate working copies:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1210 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos/test file:///var/svn/repos/quiz\n" "A test/a\n" "A test/b\n" "A test/c\n" "A test/d\n" "Checked out revision 20.\n" "A quiz/l\n" "A quiz/m\n" "Checked out revision 13.\n" "$ ls\n" "quiz test\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1224 msgid "" "Check out two different directories into two separate working copies, but " "place both into a directory called <filename>working-copies</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1228 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos/test file:///var/svn/repos/quiz working-copies\n" "A working-copies/test/a\n" "A working-copies/test/b\n" "A working-copies/test/c\n" "A working-copies/test/d\n" "Checked out revision 20.\n" "A working-copies/quiz/l\n" "A working-copies/quiz/m\n" "Checked out revision 13.\n" "$ ls\n" "working-copies\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1242 msgid "" "If you interrupt a checkout (or something else interrupts your checkout, " "such as loss of connectivity, etc.), you can restart it either by issuing " "the identical checkout command again or by updating the incomplete working " "copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1248 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos/test mine\n" "A mine/a\n" "A mine/b\n" "^C\n" "svn: The operation was interrupted\n" "svn: caught SIGINT\n" "\n" "$ svn checkout file:///var/svn/repos/test mine\n" "A mine/c\n" "^C\n" "svn: The operation was interrupted\n" "svn: caught SIGINT\n" "\n" "$ svn update mine\n" "A mine/d\n" "Updated to revision 20.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1267 msgid "" "If you wish to check out some revision other than the most recent one, you " "can do so by providing the <option>--revision</option> (<option>-r</option>) " "option to the <command>svn checkout</command> command:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1272 #, no-wrap msgid "" "\n" "$ svn checkout -r 2 file:///var/svn/repos/test mine\n" "A mine/a\n" "Checked out revision 2.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:1290 msgid "svn cleanup" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1291 msgid "Recursively clean up the working copy" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1295 #, no-wrap msgid "svn cleanup [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1300 msgid "" "Recursively clean up the working copy, removing working copy locks and " "resuming unfinished operations. If you ever get a <literal>working copy " "locked</literal> error, run this command to remove stale locks and get your " "working copy into a usable state again." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1306 msgid "" "If, for some reason, an <command>svn update</command> fails due to a problem " "running an external diff program (e.g., user input or network failure), pass " "the <option>--diff3-cmd</option> to allow cleanup to complete any merging " "with your external diff program. You can also specify any configuration " "directory with the <option>--config-dir</option> option, but you should need " "these options extremely infrequently." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1335 #, no-wrap msgid "" "\n" "--diff3-cmd CMD\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1344 msgid "" "Well, there's not much to the examples here, as <command>svn cleanup</" "command> generates no output. If you pass no <replaceable>PATH</" "replaceable>, then <quote><filename>.</filename></quote> is used:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1349 #, no-wrap msgid "" "\n" "$ svn cleanup\n" "\n" "$ svn cleanup /var/svn/working-copy\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:1367 #, fuzzy #| msgid "svn import" msgid "svn commit" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1368 msgid "Send changes from your working copy to the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1372 #, no-wrap msgid "svn commit [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:1377 #, fuzzy #| msgid "" #| "If you fail to specify either the <option>--message</option> or <option>--" #| "file</option> option, Subversion will automatically launch your favorite " #| "editor (see the information on <literal>editor-cmd</literal> in <xref " #| "linkend=\"svn.advanced.confarea.opts.config\"/>) for composing a log " #| "message." msgid "" "Send changes from your working copy to the repository. If you do not supply " "a log message with your commit by using either the <option>--file</option> " "or <option>--message</option> option, <command>svn</command> will launch " "your editor for you to compose a commit message. See the <literal>editor-" "cmd</literal> list entry in <xref linkend=\"svn.advanced.confarea.opts.config" "\"/>." msgstr "" "Sollten Sie vergessen, entweder die Option <option>--message</option> oder " "die <option>--file</option>-Option anzugeben, startet Subversion automatisch " "Ihren Lieblingseditor (siehe die Information zu <literal>editor-cmd</" "literal> in <xref linkend=\"svn.advanced.confarea.opts.config\"/>), damit " "Sie einen Protokolleintrag erstellen können." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1386 msgid "" "<command>svn commit</command> will send any lock tokens that it finds and " "will release locks on all <replaceable>PATH</replaceable>s committed " "(recursively) unless <option>--no-unlock</option> is passed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:1392 msgid "" "If you begin a commit and Subversion launches your editor to compose the " "commit message, you can still abort without committing your changes. If you " "want to cancel your commit, just quit your editor without saving your commit " "message and Subversion will prompt you to either abort the commit, continue " "with no message, or edit the message again." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1407 msgid "" "<command>ci</command> (short for <quote>check in</quote>; not <command>co</" "command>, which is an alias for the <command>checkout</command> subcommand)" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:1414 #, fuzzy #| msgid "How Working Copies Track the Repository" msgid "Working copy; repository" msgstr "Wie Arbeitskopien das Repository verfolgen" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1425 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--editor-cmd ARG\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force-log\n" "--keep-changelists\n" "--message (-m) TEXT\n" "--no-unlock\n" "--quiet (-q)\n" "--targets FILENAME\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1444 msgid "" "Commit a simple modification to a file with the commit message on the " "command line and an implicit target of your current directory " "(<quote><filename>.</filename></quote>):" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:1449 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit -F logmsg\n" #| "Sending sandwich.txt\n" #| "Transmitting file data .\n" #| "Committed revision 4.\n" msgid "" "\n" "$ svn commit -m \"added howto section.\"\n" "Sending a\n" "Transmitting file data .\n" "Committed revision 3.\n" msgstr "" "\n" "$ svn commit -F logmsg\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 4.\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1456 msgid "" "Commit a modification to the file <filename>foo.c</filename> (explicitly " "specified on the command line) with the commit message in a file named " "<filename>msg</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:1461 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit -F logmsg\n" #| "Sending sandwich.txt\n" #| "Transmitting file data .\n" #| "Committed revision 4.\n" msgid "" "\n" "$ svn commit -F msg foo.c\n" "Sending foo.c\n" "Transmitting file data .\n" "Committed revision 5.\n" msgstr "" "\n" "$ svn commit -F logmsg\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 4.\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1468 msgid "" "If you want to use a file that's under version control for your commit " "message with <option>--file</option>, you need to pass the <option>--force-" "log</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1473 #, no-wrap msgid "" "\n" "$ svn commit --file file_under_vc.txt foo.c\n" "svn: The log message file is under version control\n" "svn: Log message file is a versioned file; use '--force-log' to override\n" "\n" "$ svn commit --force-log --file file_under_vc.txt foo.c\n" "Sending foo.c\n" "Transmitting file data .\n" "Committed revision 6.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1484 msgid "To commit a file scheduled for deletion:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:1486 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit -m \"Corrected number of cheese slices.\"\n" #| "Sending sandwich.txt\n" #| "Transmitting file data .\n" #| "Committed revision 3.\n" msgid "" "\n" "$ svn commit -m \"removed file 'c'.\"\n" "Deleting c\n" "\n" "Committed revision 7.\n" msgstr "" "\n" "$ svn commit -m \"Corrected number of cheese slices.\"\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 3.\n" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:1505 msgid "svn copy" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1506 msgid "Copy a file or directory in a working copy or in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1512 #, no-wrap msgid "svn copy SRC[@REV]... DST" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1518 msgid "" "Copy one or more files in a working copy or in the repository. When copying " "multiple sources, they will be added as children of <replaceable>DST</" "replaceable>, which must be a directory. <replaceable>SRC</replaceable> and " "<replaceable>DST</replaceable> can each be either a working copy (WC) path " "or URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1528 ../en/book/ch09-reference.xml:3492 msgid "WC → WC" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1530 msgid "Copy and schedule an item for addition (with history)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1536 msgid "WC → URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1538 msgid "Immediately commit a copy of WC to URL." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1543 msgid "URL → WC" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1545 msgid "Check out URL into WC and schedule it for addition." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1551 ../en/book/ch09-reference.xml:3500 msgid "URL → URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1553 msgid "Complete server-side copy. This is usually used to branch and tag." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1560 msgid "" "When copying multiple sources, they will be added as children of " "<replaceable>DST</replaceable>, which must be a directory." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1564 msgid "" "If no peg revision (i.e., <replaceable>@REV</replaceable>) is supplied, by " "default the <literal>BASE</literal> revision will be used for files copied " "from the working copy, while the <literal>HEAD</literal> revision will be " "used for files copied from a URL." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><note><para> #: ../en/book/ch09-reference.xml:1572 msgid "" "You can only copy files within a single repository. Subversion does not " "support cross-repository copying." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1580 #, fuzzy #| msgid "<command>svn copy</command>" msgid "<command>cp</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1585 msgid "" "Repository if destination is a URL; working copy if destination is a WC path" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1590 msgid "" "Yes, if source or destination is in the repository, or if needed to look up " "the source revision number." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1597 #, no-wrap msgid "" "\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force-log\n" "--message (-m) TEXT\n" "--parents\n" "--quiet (-q)\n" "--revision (-r) REV\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1613 msgid "" "Copy an item within your working copy (this schedules the copy—nothing " "goes into the repository until you commit):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1617 #, no-wrap msgid "" "\n" "$ svn copy foo.txt bar.txt\n" "A bar.txt\n" "$ svn status\n" "A + bar.txt\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1624 msgid "Copy several files in a working copy into a subdirectory:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1627 #, no-wrap msgid "" "\n" "$ svn cp bat.c baz.c qux.c src\n" "A src/bat.c\n" "A src/baz.c\n" "A src/qux.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1634 msgid "" "Copy revision 8 of <filename>bat.c</filename> into your working copy under a " "different name:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1637 #, no-wrap msgid "" "\n" "$ svn cp -r 8 bat.c ya-old-bat.c\n" "A ya-old-bat.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1642 msgid "" "Copy an item in your working copy to a URL in the repository (this is an " "immediate commit, so you must supply a commit message):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1646 #, no-wrap msgid "" "\n" "$ svn copy near.txt file:///var/svn/repos/test/far-away.txt -m \"Remote copy.\"\n" "\n" "Committed revision 8.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1652 msgid "" "Copy an item from the repository to your working copy (this just schedules " "the copy—nothing goes into the repository until you commit):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1656 #, no-wrap msgid "" "\n" "$ svn copy file:///var/svn/repos/test/far-away -r 6 near-here\n" "A near-here\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:1662 msgid "" "This is the recommended way to resurrect a dead file in your repository!" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1666 msgid "And finally, copy between two URLs:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1668 #, no-wrap msgid "" "\n" "$ svn copy file:///var/svn/repos/test/far-away \\\n" " file:///var/svn/repos/test/over-there -m \"remote copy.\"\n" "\n" "Committed revision 9.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1675 #, no-wrap msgid "" "\n" "$ svn copy file:///var/svn/repos/test/trunk \\\n" " file:///var/svn/repos/test/tags/0.6.32-prerelease -m \"tag tree\"\n" "\n" "Committed revision 12.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:1683 msgid "" "This is the easiest way to <quote>tag</quote> a revision in your " "repository—just <command>svn copy</command> that revision (usually " "<literal>HEAD</literal>) into your <filename>tags</filename> directory." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1689 msgid "" "And don't worry if you forgot to tag—you can always specify an older " "revision and tag anytime:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1692 #, no-wrap msgid "" "\n" "$ svn copy -r 11 file:///var/svn/repos/test/trunk \\\n" " file:///var/svn/repos/test/tags/0.6.32-prerelease \\\n" " -m \"Forgot to tag at rev 11\"\n" "\n" "Committed revision 13.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1711 #, fuzzy #| msgid "svndumpfilter" msgid "svn delete" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1712 msgid "Delete an item from a working copy or the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1717 #, no-wrap msgid "svn delete PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1718 #, no-wrap msgid "svn delete URL..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1723 msgid "" "Items specified by <replaceable>PATH</replaceable> are scheduled for " "deletion upon the next commit. Files (and directories that have not been " "committed) are immediately removed from the working copy unless the " "<option>--keep-local</option> option is given. The command will not remove " "any unversioned or modified items; use the <option>--force</option> option " "to override this behavior." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1732 msgid "" "Items specified by URL are deleted from the repository via an immediate " "commit. Multiple URLs are committed atomically." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1739 msgid "" "<command>del</command>, <command>remove</command>, <command>rm</command>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1744 msgid "Working copy if operating on files; repository if operating on URLs" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1750 ../en/book/ch09-reference.xml:2481 msgid "Only if operating on URLs" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1756 #, no-wrap msgid "" "\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force\n" "--force-log\n" "--keep-local\n" "--message (-m) TEXT\n" "--quiet (-q)\n" "--targets FILENAME\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1773 msgid "" "Using <command>svn</command> to delete a file from your working copy deletes " "your local copy of the file, but it merely schedules the file to be deleted " "from the repository. When you commit, the file is deleted in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:1779 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit -m \"Corrected number of cheese slices.\"\n" #| "Sending sandwich.txt\n" #| "Transmitting file data .\n" #| "Committed revision 3.\n" msgid "" "\n" "$ svn delete myfile\n" "D myfile\n" "\n" "$ svn commit -m \"Deleted file 'myfile'.\"\n" "Deleting myfile\n" "Transmitting file data .\n" "Committed revision 14.\n" msgstr "" "\n" "$ svn commit -m \"Corrected number of cheese slices.\"\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 3.\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1789 msgid "" "Deleting a URL, however, is immediate, so you have to supply a log message:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1792 #, no-wrap msgid "" "\n" "$ svn delete -m \"Deleting file 'yourfile'\" \\\n" " file:///var/svn/repos/test/yourfile\n" "\n" "Committed revision 15.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1799 msgid "" "Here's an example of how to force deletion of a file that has local mods:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1802 #, no-wrap msgid "" "\n" "$ svn delete over-there \n" "svn: Attempting restricted operation for modified resource\n" "svn: Use --force to override this restriction\n" "svn: 'over-there' has local modifications\n" "\n" "$ svn delete --force over-there \n" "D over-there\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1824 #, fuzzy #| msgid "svnadmin" msgid "svn diff" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1825 msgid "This displays the differences between two revisions or paths." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1829 #, no-wrap msgid "diff [-c M | -r N[:M]] [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1830 #, no-wrap msgid "diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1831 #, no-wrap msgid "diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1840 msgid "" "Display the differences between two paths. You can use <command>svn diff</" "command> in the following ways:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1845 msgid "" "Use just <command>svn diff</command> to display local modifications in a " "working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1850 msgid "" "Display the changes made to <replaceable>TARGET</replaceable>s as they are " "seen in <replaceable>REV</replaceable> between two revisions. " "<replaceable>TARGET</replaceable>s may be all working copy paths or all " "<replaceable>URL</replaceable>s. If <replaceable>TARGET</replaceable>s are " "working copy paths, <replaceable>N</replaceable> defaults to <literal>BASE</" "literal> and <replaceable>M</replaceable> to the working copy; if " "<replaceable>TARGET</replaceable>s are <replaceable>URL</replaceable>s, " "<replaceable>N</replaceable> must be specified and <replaceable>M</" "replaceable> defaults to <literal>HEAD</literal>. The <literal>-c M</" "literal> option is equivalent to <literal>-r N:M</literal> where <literal>N " "= M-1</literal>. Using <literal>-c -M</literal> does the reverse: <literal>-" "r M:N</literal> where <literal>N = M-1</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1870 msgid "" "Display the differences between <replaceable>OLD-TGT</replaceable> as it was " "seen in <replaceable>OLDREV</replaceable> and <replaceable>NEW-TGT</" "replaceable> as it was seen in <replaceable>NEWREV</replaceable>. " "<replaceable>PATH</replaceable>s, if given, are relative to <replaceable>OLD-" "TGT</replaceable> and <replaceable>NEW-TGT</replaceable> and restrict the " "output to differences for those paths. <replaceable>OLD-TGT</replaceable> " "and <replaceable>NEW-TGT</replaceable> may be working copy paths or " "<replaceable>URL[@REV]</replaceable>. <replaceable>NEW-TGT</replaceable> " "defaults to <replaceable>OLD-TGT</replaceable> if not specified. <literal>-" "r N</literal> makes <replaceable>OLDREV</replaceable> default to <literal>N</" "literal>; <literal>-r N:M</literal> makes <replaceable>OLDREV</replaceable> " "default to <replaceable>N</replaceable> and <replaceable>NEWREV</" "replaceable> default to <replaceable>M</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1895 msgid "" "<command>svn diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]</command> is shorthand " "for <command>svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV].</" "command>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1900 msgid "" "<command>svn diff -r N:M URL</command> is shorthand for <command>svn diff -r " "N:M --old=URL --new=URL</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1904 msgid "" "<command>svn diff [-r N[:M]] URL1[@N] URL2[@M]</command> is shorthand for " "<command>svn diff [-r N[:M]] --old=URL1 --new=URL2</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1908 msgid "" "If <replaceable>TARGET</replaceable> is a URL, then revs <literal>N</" "literal> and <literal>M</literal> can be given either via the <option>--" "revision</option> option or by using the <quote>@</quote> notation as " "described earlier." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1913 msgid "" "If <replaceable>TARGET</replaceable> is a working copy path, the <option>--" "revision</option> option means:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1920 msgid "<option>--revision N:M</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1922 msgid "" "The server compares <replaceable>TARGET@N</replaceable> and " "<replaceable>TARGET@M</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1930 msgid "<option>--revision N</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1932 msgid "" "The client compares <replaceable>TARGET@N</replaceable> against the working " "copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1939 msgid "(no <option>--revision</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1941 msgid "" "The client compares base and working copies of <replaceable>TARGET</" "replaceable>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1948 msgid "" "If the alternate syntax is used, the server compares <replaceable>URL1</" "replaceable> and <replaceable>URL2</replaceable> at revisions " "<replaceable>N</replaceable> and <replaceable>M</replaceable>, " "respectively. If either <replaceable>N</replaceable> or <replaceable>M</" "replaceable> is omitted, a value of <literal>HEAD</literal> is assumed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1957 msgid "" "By default, <command>svn diff</command> ignores the ancestry of files and " "merely compares the contents of the two files being compared. If you use " "<option>--notice-ancestry</option>, the ancestry of the paths in question " "will be taken into consideration when comparing revisions (i.e., if you run " "<command>svn diff</command> on two files with identical contents but " "different ancestry, you will see the entire contents of the file as having " "been removed and added again)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1970 #, fuzzy #| msgid "<command>svn diff</command>" msgid "<command>di</command>" msgstr "<command>svn diff</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1980 msgid "" "For obtaining differences against anything but <literal>BASE</literal> " "revision in your working copy" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1987 #, no-wrap msgid "" "\n" "--change (-c) ARG\n" "--changelist ARG\n" "--depth ARG\n" "--diff-cmd CMD\n" "--extensions (-x) \"ARGS\"\n" "--force\n" "--new ARG\n" "--no-diff-deleted\n" "--notice-ancestry\n" "--old ARG\n" "--revision (-r) ARG\n" "--summarize\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2007 msgid "" "Compare <literal>BASE</literal> and your working copy (one of the most " "popular uses of <command>svn diff</command>):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2011 #, no-wrap msgid "" "\n" "$ svn diff COMMITTERS \n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 4404)\n" "+++ COMMITTERS\t(working copy)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2019 msgid "" "See what changed in the file <filename>COMMITTERS</filename> revision 9115:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2022 #, no-wrap msgid "" "\n" "$ svn diff -c 9115 COMMITTERS \n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 3900)\n" "+++ COMMITTERS\t(working copy)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2031 msgid "" "See how your working copy's modifications compare against an older revision:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2034 #, no-wrap msgid "" "\n" "$ svn diff -r 3900 COMMITTERS \n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 3900)\n" "+++ COMMITTERS\t(working copy)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2042 msgid "Compare revision 3000 to revision 3500 using <quote>@</quote> syntax:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2045 #, no-wrap msgid "" "\n" "$ svn diff http://svn.collab.net/repos/svn/trunk/COMMITTERS@3000 \\\n" " http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500\n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 3000)\n" "+++ COMMITTERS\t(revision 3500)\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2055 msgid "" "Compare revision 3000 to revision 3500 using range notation (pass only the " "one URL in this case):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2059 #, no-wrap msgid "" "\n" "$ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk/COMMITTERS\n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 3000)\n" "+++ COMMITTERS\t(revision 3500)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2068 msgid "" "Compare revision 3000 to revision 3500 of all the files in <filename>trunk</" "filename> using range notation:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2071 #, no-wrap msgid "" "\n" "$ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2076 msgid "" "Compare revision 3000 to revision 3500 of only three files in " "<filename>trunk</filename> using range notation:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2080 #, no-wrap msgid "" "\n" "$ svn diff -r 3000:3500 --old http://svn.collab.net/repos/svn/trunk \\\n" " COMMITTERS README HACKING\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2085 msgid "" "If you have a working copy, you can obtain the differences without typing in " "the long URLs:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2088 #, no-wrap msgid "" "\n" "$ svn diff -r 3000:3500 COMMITTERS \n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 3000)\n" "+++ COMMITTERS\t(revision 3500)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2096 msgid "" "Use <option>--diff-cmd</option> <replaceable>CMD</replaceable> <option>-x</" "option> to pass arguments directly to the external diff program:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2101 #, no-wrap msgid "" "\n" "$ svn diff --diff-cmd /usr/bin/diff -x \"-i -b\" COMMITTERS \n" "Index: COMMITTERS\n" "===================================================================\n" "0a1,2\n" "> This is a test\n" "> \n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2110 msgid "" "Lastly, you can use the <option>--xml</option> option along with the " "<option>--summarize</option> option to view XML describing the changes that " "occurred between revisions, but not the contents of the diff itself:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2115 #, no-wrap msgid "" "\n" "$ svn diff --summarize --xml http://svn.red-bean.com/repos/test@r2 \\\n" " http://svn.red-bean.com/repos/test\n" "<?xml version=\"1.0\"?>\n" "<diff>\n" "<paths>\n" "<path\n" " props=\"none\"\n" " kind=\"file\"\n" " item=\"modified\">http://svn.red-bean.com/repos/test/sandwich.txt</path>\n" "<path\n" " props=\"none\"\n" " kind=\"file\"\n" " item=\"deleted\">http://svn.red-bean.com/repos/test/burrito.txt</path>\n" "<path\n" " props=\"none\"\n" " kind=\"dir\"\n" " item=\"added\">http://svn.red-bean.com/repos/test/snacks</path>\n" "</paths>\n" "</diff>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2149 #, fuzzy #| msgid "svn import" msgid "svn export" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2150 msgid "Export a clean directory tree." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2154 #, no-wrap msgid "svn export [-r REV] URL[@PEGREV] [PATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2155 #, no-wrap msgid "svn export [-r REV] PATH1[@PEGREV] [PATH2]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2160 msgid "" "The first form exports a clean directory tree from the repository specified " "by <replaceable>URL</replaceable>—at revision <replaceable>REV</" "replaceable> if it is given; otherwise, at <literal>HEAD</literal>, into " "<replaceable>PATH</replaceable>. If <replaceable>PATH</replaceable> is " "omitted, the last component of the <replaceable>URL</replaceable> is used " "for the local directory name." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2169 msgid "" "The second form exports a clean directory tree from the working copy " "specified by <replaceable>PATH1</replaceable> into <replaceable>PATH2</" "replaceable>. All local changes will be preserved, but files not under " "version control will not be copied." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2184 msgid "Local disk" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2189 msgid "Only if exporting from a URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2195 #, no-wrap msgid "" "\n" "--depth ARG\n" "--force\n" "--ignore-externals\n" "--native-eol EOL\n" "--quiet (-q)\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2208 msgid "Export from your working copy (doesn't print every file and directory):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2211 #, no-wrap msgid "" "\n" "$ svn export a-wc my-export\n" "Export complete.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2216 msgid "Export directly from the repository (prints every file and directory):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2219 #, no-wrap msgid "" "\n" "$ svn export file:///var/svn/repos my-export\n" "A my-export/test\n" "A my-export/quiz\n" "…\n" "Exported revision 15.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2227 msgid "" "When rolling operating-system-specific release packages, it can be useful to " "export a tree that uses a specific EOL character for line endings. The " "<option>--native-eol</option> option will do this, but it affects only files " "that have <literal>svn:eol-style = native</literal> properties attached to " "them. For example, to export a tree with all CRLF line endings (possibly " "for a Windows <filename>.zip</filename> file distribution):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2237 #, no-wrap msgid "" "\n" "$ svn export file:///var/svn/repos my-export --native-eol CRLF\n" "A my-export/test\n" "A my-export/quiz\n" "…\n" "Exported revision 15.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2245 msgid "" "You can specify <literal>LR</literal>, <literal>CR</literal>, or " "<literal>CRLF</literal> as a line-ending type with the <option>--native-eol</" "option> option." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:2264 msgid "svn help" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2269 #, no-wrap msgid "svn help [SUBCOMMAND...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2274 msgid "" "This is your best friend when you're using Subversion and this book isn't " "within reach!" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2280 ../en/book/ch09-reference.xml:5801 #: ../en/book/ch09-reference.xml:7120 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>?</command>, <command>h</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2281 msgid "" "The options <option>-?</option>, <option>-h</option>, and <option>--help</" "option> have the same effect as using the <command>help</command> subcommand." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2314 msgid "Commit an unversioned file or tree into the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2319 #, fuzzy, no-wrap #| msgid "svn import" msgid "svn import [PATH] URL" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2324 msgid "" "Recursively commit a copy of <replaceable>PATH</replaceable> to " "<replaceable>URL</replaceable>. If <replaceable>PATH</replaceable> is " "omitted, <quote><filename>.</filename></quote> is assumed. Parent " "directories are created in the repository as necessary. Unversionable items " "such as device files and pipes are ignored even if <option>--force</option> " "is specified." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:2342 #, fuzzy #| msgid "The Repository" msgid "Repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2353 #, no-wrap msgid "" "\n" "--auto-props\n" "--depth ARG\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force\n" "--force-log\n" "--message (-m) TEXT\n" "--no-auto-props\n" "--no-ignore\n" "--quiet (-q)\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2372 msgid "" "This imports the local directory <filename>myproj</filename> into " "<filename>trunk/misc</filename> in your repository. The directory " "<filename>trunk/misc</filename> need not exist before you import into " "it—<command>svn import</command> will recursively create directories " "for you." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2380 #, no-wrap msgid "" "\n" "$ svn import -m \"New import\" myproj \\\n" " http://svn.red-bean.com/repos/trunk/misc\n" "Adding myproj/sample.txt\n" "…\n" "Transmitting file data .........\n" "Committed revision 16.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2389 msgid "" "Be aware that this will <emphasis>not</emphasis> create a directory named " "<filename>myproj</filename> in the repository. If that's what you want, " "simply add <filename>myproj</filename> to the end of the URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2394 #, no-wrap msgid "" "\n" "$ svn import -m \"New import\" myproj \\\n" " http://svn.red-bean.com/repos/trunk/misc/myproj\n" "Adding myproj/sample.txt\n" "…\n" "Transmitting file data .........\n" "Committed revision 16.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:2403 #, fuzzy #| msgid "" #| "Note that after the import is finished, the original tree is " #| "<emphasis>not</emphasis> converted into a working copy. To start " #| "working, you still need to <command>svn checkout</command> a fresh " #| "working copy of the tree." msgid "" "After importing data, note that the original tree is <emphasis>not</" "emphasis> under version control. To start working, you still need to " "<command>svn checkout</command> a fresh working copy of the tree." msgstr "" "Beachten Sie, dass nach dem Import der Originalbaum <emphasis>nicht</" "emphasis> in eine Arbeitskopie umgewandelt wird. Vor Beginn der Arbeit " "müssen Sie noch <command>svn checkout</command> ausführen, um eine frische " "Arbeitskopie des Baums zu erhalten." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2420 #, fuzzy #| msgid "svn import" msgid "svn info" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2421 msgid "Display information about a local or remote item." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2426 #, no-wrap msgid "svn info [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2431 msgid "" "Print information about the working copy paths or URLs specified. The " "information shown for both may include:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2436 msgid "Path" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2437 msgid "Name" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2438 msgid "URL" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch09-reference.xml:2439 #, fuzzy #| msgid "Repository URLs" msgid "Repository root" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch09-reference.xml:2440 #, fuzzy #| msgid "Repository URLs" msgid "Repository UUID" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2441 #, fuzzy #| msgid "Revisions" msgid "Revision" msgstr "Revisionen" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2442 msgid "Node kind" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2443 msgid "Last changed author" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2444 msgid "Last changed revision" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:2445 #, fuzzy #| msgid "Locally changed, and out of date" msgid "Last changed date" msgstr "Lokal geändert und veraltet" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2446 msgid "Lock token" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2447 msgid "Lock owner" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2448 msgid "Lock created (date)" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2449 msgid "Lock expires (date)" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2452 msgid "" "Additional kinds of information available only for working copy paths are:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2456 msgid "Schedule" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2457 msgid "Copied from URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2458 msgid "Copied from rev" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2459 msgid "Text last updated" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2460 msgid "Properties last updated" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2461 msgid "Checksum" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2462 msgid "Conflict previous base file" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2463 msgid "Conflict previous working file" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2464 msgid "Conflict current base file" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2465 msgid "Conflict properties file" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2487 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--incremental\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--targets FILENAME\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2501 msgid "" "<command>svn info</command> will show you all the useful information that it " "has for items in your working copy. It will show information for files:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2505 #, no-wrap msgid "" "\n" "$ svn info foo.c\n" "Path: foo.c\n" "Name: foo.c\n" "URL: http://svn.red-bean.com/repos/test/foo.c\n" "Repository Root: http://svn.red-bean.com/repos/test\n" "Repository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25\n" "Revision: 4417\n" "Node Kind: file\n" "Schedule: normal\n" "Last Changed Author: sally\n" "Last Changed Rev: 20\n" "Last Changed Date: 2003-01-13 16:43:13 -0600 (Mon, 13 Jan 2003)\n" "Text Last Updated: 2003-01-16 21:18:16 -0600 (Thu, 16 Jan 2003)\n" "Properties Last Updated: 2003-01-13 21:50:19 -0600 (Mon, 13 Jan 2003)\n" "Checksum: d6aeb60b0662ccceb6bce4bac344cb66\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2523 msgid "It will also show information for directories:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2525 #, no-wrap msgid "" "\n" "$ svn info vendors\n" "Path: vendors\n" "URL: http://svn.red-bean.com/repos/test/vendors\n" "Repository Root: http://svn.red-bean.com/repos/test\n" "Repository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25\n" "Revision: 19\n" "Node Kind: directory\n" "Schedule: normal\n" "Last Changed Author: harry\n" "Last Changed Rev: 19\n" "Last Changed Date: 2003-01-16 23:21:19 -0600 (Thu, 16 Jan 2003)\n" "Properties Last Updated: 2003-01-16 23:39:02 -0600 (Thu, 16 Jan 2003)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2540 msgid "" "<command>svn info</command> also acts on URLs (also note that the file " "<filename>readme.doc</filename> in this example is locked, so lock " "information is also provided):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2545 #, no-wrap msgid "" "\n" "$ svn info http://svn.red-bean.com/repos/test/readme.doc\n" "Path: readme.doc\n" "Name: readme.doc\n" "URL: http://svn.red-bean.com/repos/test/readme.doc\n" "Repository Root: http://svn.red-bean.com/repos/test\n" "Repository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25\n" "Revision: 1\n" "Node Kind: file\n" "Schedule: normal\n" "Last Changed Author: sally\n" "Last Changed Rev: 42\n" "Last Changed Date: 2003-01-14 23:21:19 -0600 (Tue, 14 Jan 2003)\n" "Lock Token: opaquelocktoken:14011d4b-54fb-0310-8541-dbd16bd471b2\n" "Lock Owner: harry\n" "Lock Created: 2003-01-15 17:35:12 -0600 (Wed, 15 Jan 2003)\n" "Lock Comment (1 line):\n" "My test lock comment\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2565 msgid "" "Lastly, <command>svn info</command> output is available in XML format by " "passing the<option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2569 #, no-wrap msgid "" "\n" "$ svn info --xml http://svn.red-bean.com/repos/test\n" "<?xml version=\"1.0\"?>\n" "<info>\n" "<entry\n" " kind=\"dir\"\n" " path=\".\"\n" " revision=\"1\">\n" "<url>http://svn.red-bean.com/repos/test</url>\n" "<repository>\n" "<root>http://svn.red-bean.com/repos/test</root>\n" "<uuid>5e7d134a-54fb-0310-bd04-b611643e5c25</uuid>\n" "</repository>\n" "<wc-info>\n" "<schedule>normal</schedule>\n" "<depth>infinity</depth>\n" "</wc-info>\n" "<commit\n" " revision=\"1\">\n" "<author>sally</author>\n" "<date>2003-01-15T23:35:12.847647Z</date>\n" "</commit>\n" "</entry>\n" "</info>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2608 msgid "List directory entries in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2612 #, no-wrap msgid "svn list [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2617 msgid "" "List each <replaceable>TARGET</replaceable> file and the contents of each " "<replaceable>TARGET</replaceable> directory as they exist in the " "repository. If <replaceable>TARGET</replaceable> is a working copy path, " "the corresponding repository URL will be used." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2623 msgid "" "The default <replaceable>TARGET</replaceable> is <quote><filename>.</" "filename></quote>, meaning the repository URL of the current working copy " "directory." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2628 msgid "" "With <option>--verbose</option>, <command>svn list</command> shows the " "following fields for each item:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2633 msgid "Revision number of the last commit" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2636 msgid "Author of the last commit" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2638 msgid "" "If locked, the letter <quote>O</quote> (see the preceding section on <xref " "linkend=\"svn.ref.svn.c.info\"/> for details)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2641 msgid "Size (in bytes)" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2643 msgid "Date and time of the last commit" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2647 msgid "" "With <option>--xml</option>, output is in XML format (with a header and an " "enclosing document element unless <option>--incremental</option> is also " "specified). All of the information is present; the <option>--verbose</" "option> option is not accepted." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2656 #, fuzzy #| msgid "<command>svn add</command>" msgid "<command>ls</command>" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2672 #, no-wrap msgid "" "\n" "--depth ARG\n" "--incremental\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--verbose (-v)\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2685 msgid "" "<command>svn list</command> is most useful if you want to see what files a " "repository has without downloading a working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2689 #, no-wrap msgid "" "\n" "$ svn list http://svn.red-bean.com/repos/test/support\n" "README.txt\n" "INSTALL\n" "examples/\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2697 msgid "" "You can pass the <option>--verbose</option> option for additional " "information, rather like the Unix command <command>ls -l</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2701 #, no-wrap msgid "" "\n" "$ svn list --verbose file:///var/svn/repos\n" " 16 sally 28361 Jan 16 23:18 README.txt\n" " 27 sally 0 Jan 18 15:27 INSTALL\n" " 24 harry Jan 18 11:27 examples/\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2708 msgid "" "You can also get <command>svn list</command> output in XML format with the " "<option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2711 #, no-wrap msgid "" "\n" "$ svn list --xml http://svn.red-bean.com/repos/test\n" "<?xml version=\"1.0\"?>\n" "<lists>\n" "<list\n" " path=\"http://svn.red-bean.com/repos/test\">\n" "<entry\n" " kind=\"dir\">\n" "<name>examples</name>\n" "<size>0</size>\n" "<commit\n" " revision=\"24\">\n" "<author>harry</author>\n" "<date>2008-01-18T06:35:53.048870Z</date>\n" "</commit>\n" "</entry>\n" "...\n" "</list>\n" "</lists>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2732 msgid "" "For further details, see the earlier section <xref linkend=\"svn.tour." "history.browsing.list\"/>." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:2748 #, fuzzy #| msgid "svnlook" msgid "svn lock" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2749 msgid "" "Lock working copy paths or URLs in the repository so that no other user can " "commit changes to them." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2755 #, no-wrap msgid "svn lock TARGET..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2760 msgid "" "Lock each <replaceable>TARGET</replaceable>. If any <replaceable>TARGET</" "replaceable> is already locked by another user, print a warning and continue " "locking the rest of the <replaceable>TARGET</replaceable>s. Use <option>--" "force</option> to steal a lock from another user or working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2776 ../en/book/ch09-reference.xml:5087 #, fuzzy #| msgid "How Working Copies Track the Repository" msgid "Working copy, repository" msgstr "Wie Arbeitskopien das Repository verfolgen" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2787 #, no-wrap msgid "" "\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force\n" "--force-log\n" "--message (-m) TEXT\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:2800 #, fuzzy #| msgid "Update your working copy." msgid "Lock two files in your working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2802 #, no-wrap msgid "" "\n" "$ svn lock tree.jpg house.jpg\n" "'tree.jpg' locked by user 'harry'.\n" "'house.jpg' locked by user 'harry'.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2808 msgid "" "Lock a file in your working copy that is currently locked by another user:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2811 #, no-wrap msgid "" "\n" "$ svn lock tree.jpg\n" "svn: warning: Path '/tree.jpg is already locked by user 'sally in \\\n" " filesystem '/var/svn/repos/db'\n" "\n" "$ svn lock --force tree.jpg\n" "'tree.jpg' locked by user 'harry'.\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:2820 #, fuzzy #| msgid "Update your working copy." msgid "Lock a file without a working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2822 #, no-wrap msgid "" "\n" "$ svn lock http://svn.red-bean.com/repos/test/tree.jpg\n" "'tree.jpg' locked by user 'harry'.\n" msgstr "" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:2827 ../en/book/ch09-reference.xml:5132 #, fuzzy #| msgid "<xref linkend=\"svn.advanced\"/>" msgid "For further details, see <xref linkend=\"svn.advanced.locking\"/>." msgstr "<xref linkend=\"svn.advanced\"/>" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:2843 #, fuzzy #| msgid "svnlook" msgid "svn log" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2844 msgid "Display commit log messages." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2848 #, no-wrap msgid "svn log [PATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2849 #, no-wrap msgid "svn log URL[@REV] [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2854 msgid "" "Shows log messages from the repository. If no arguments are supplied, " "<command>svn log</command> shows the log messages for all files and " "directories inside (and including) the current working directory of your " "working copy. You can refine the results by specifying a path, one or more " "revisions, or any combination of the two. The default revision range for a " "local path is <literal>BASE:1</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2863 msgid "" "If you specify a URL alone, it prints log messages for everything the URL " "contains. If you add paths past the URL, only messages for those paths " "under that URL will be printed. The default revision range for a URL is " "<literal>HEAD:1</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2869 msgid "" "With <option>--verbose</option>, <command>svn log</command> will also print " "all affected paths with each log message. With <option>--quiet</option>, " "<command>svn log</command> will not print the log message body itself (this " "is compatible with <option>--verbose</option>)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2875 msgid "" "Each log message is printed just once, even if more than one of the affected " "paths for that revision were explicitly requested. Logs follow copy history " "by default. Use <option>--stop-on-copy</option> to disable this behavior, " "which can be useful for determining branch points." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2901 #, no-wrap msgid "" "\n" "--change (-c) ARG\n" "--incremental\n" "--limit (-l) NUM\n" "--quiet (-q)\n" "--revision (-r) REV\n" "--stop-on-copy\n" "--targets FILENAME\n" "--use-merge-history (-g)\n" "--verbose (-v)\n" "--with-all-revprops\n" "--with-revprop ARG\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2920 msgid "" "You can see the log messages for all the paths that changed in your working " "copy by running <userinput>svn log</userinput> from the top:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2924 #, no-wrap msgid "" "\n" "$ svn log\n" "------------------------------------------------------------------------\n" "r20 | harry | 2003-01-17 22:56:19 -0600 (Fri, 17 Jan 2003) | 1 line\n" "\n" "Tweak.\n" "------------------------------------------------------------------------\n" "r17 | sally | 2003-01-16 23:21:19 -0600 (Thu, 16 Jan 2003) | 2 lines\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2935 msgid "Examine all log messages for a particular file in your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2938 #, no-wrap msgid "" "\n" "$ svn log foo.c\n" "------------------------------------------------------------------------\n" "r32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n" "\n" "Added defines.\n" "------------------------------------------------------------------------\n" "r28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2949 msgid "If you don't have a working copy handy, you can log a URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2952 #, no-wrap msgid "" "\n" "$ svn log http://svn.red-bean.com/repos/test/foo.c\n" "------------------------------------------------------------------------\n" "r32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n" "\n" "Added defines.\n" "------------------------------------------------------------------------\n" "r28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2963 msgid "" "If you want several distinct paths underneath the same URL, you can use the " "<literal>URL [PATH...]</literal> syntax:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2967 #, no-wrap msgid "" "\n" "$ svn log http://svn.red-bean.com/repos/test/ foo.c bar.c\n" "------------------------------------------------------------------------\n" "r32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n" "\n" "Added defines.\n" "------------------------------------------------------------------------\n" "r31 | harry | 2003-01-10 12:25:08 -0600 (Fri, 10 Jan 2003) | 1 line\n" "\n" "Added new file bar.c\n" "------------------------------------------------------------------------\n" "r28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2982 msgid "" "The <option>--verbose</option> option causes <command>svn log</command> to " "include information about the paths that were changed in each displayed " "revision. These paths appear, one path per line of output, with action " "codes that indicate what type of change was made to the path." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2989 #, no-wrap msgid "" "\n" "$ svn log -v http://svn.red-bean.com/repos/test/ foo.c bar.c\n" "------------------------------------------------------------------------\n" "r32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n" "Changed paths:\n" " M /foo.c\n" "\n" "Added defines.\n" "------------------------------------------------------------------------\n" "r31 | harry | 2003-01-10 12:25:08 -0600 (Fri, 10 Jan 2003) | 1 line\n" "Changed paths:\n" " A /bar.c\n" "\n" "Added new file bar.c\n" "------------------------------------------------------------------------\n" "r28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3008 msgid "" "<command>svn log</command> uses just a handful of action codes, and they are " "similar to the ones the <command>svn update</command> command uses:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:3015 ../en/book/ch09-reference.xml:5176 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>A</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3016 msgid "The item was added." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:3019 ../en/book/ch09-reference.xml:5190 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>D</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3020 msgid "The item was deleted." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:3023 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>M</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3024 msgid "Properties or textual contents on the item were changed." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:3028 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>R</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3029 msgid "The item was replaced by a different one at the same location." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3034 msgid "" "In addition to the action codes which precede the changed paths, " "<command>svn log</command> with the <option>--verbose</option> option will " "note whether a path was added or replaced as the result of a copy " "operation. It does so by printing <literal>(from <replaceable>COPY-FROM-" "PATH</replaceable>:<replaceable>COPY-FROM-REV</replaceable>)</literal> after " "such paths." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3041 msgid "" "When you're concatenating the results of multiple calls to the log command, " "you may want to use the <option>--incremental</option> option. <command>svn " "log</command> normally prints out a dashed line at the beginning of a log " "message, after each subsequent log message, and following the final log " "message. If you ran <command>svn log</command> on a range of two revisions, " "you would get this:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3049 #, no-wrap msgid "" "\n" "$ svn log -r 14:15\n" "------------------------------------------------------------------------\n" "r14 | …\n" "\n" "------------------------------------------------------------------------\n" "r15 | …\n" "\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3060 msgid "" "However, if you wanted to gather two nonsequential log messages into a file, " "you might do something like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3064 #, no-wrap msgid "" "\n" "$ svn log -r 14 > mylog\n" "$ svn log -r 19 >> mylog\n" "$ svn log -r 27 >> mylog\n" "$ cat mylog\n" "------------------------------------------------------------------------\n" "r14 | …\n" "\n" "------------------------------------------------------------------------\n" "------------------------------------------------------------------------\n" "r19 | …\n" "\n" "------------------------------------------------------------------------\n" "------------------------------------------------------------------------\n" "r27 | …\n" "\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3083 msgid "" "You can avoid the clutter of the double dashed lines in your output by using " "the <option>--incremental</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3087 #, no-wrap msgid "" "\n" "$ svn log --incremental -r 14 > mylog\n" "$ svn log --incremental -r 19 >> mylog\n" "$ svn log --incremental -r 27 >> mylog\n" "$ cat mylog\n" "------------------------------------------------------------------------\n" "r14 | …\n" "\n" "------------------------------------------------------------------------\n" "r19 | …\n" "\n" "------------------------------------------------------------------------\n" "r27 | …\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3102 msgid "" "The <option>--incremental</option> option provides similar output control " "when using the <option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3106 #, no-wrap msgid "" "\n" "$ svn log --xml --incremental -r 1 sandwich.txt\n" "<logentry\n" " revision=\"1\">\n" "<author>harry</author>\n" "<date>2008-06-03T06:35:53.048870Z</date>\n" "<msg>Initial Import.</msg>\n" "</logentry>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:3117 msgid "" "If you run <command>svn log</command> on a specific path and provide a " "specific revision and get no output at all, as in the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><screen> #: ../en/book/ch09-reference.xml:3121 #, no-wrap msgid "" "\n" "$ svn log -r 20 http://svn.red-bean.com/untouched.txt\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:3126 msgid "" "that just means the path was not modified in that revision. If you log from " "the top of the repository or know the file that changed in that revision, " "you can specify it explicitly:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><screen> #: ../en/book/ch09-reference.xml:3131 #, no-wrap msgid "" "\n" "$ svn log -r 20 touched.txt \n" "------------------------------------------------------------------------\n" "r20 | sally | 2003-01-17 22:56:19 -0600 (Fri, 17 Jan 2003) | 1 line\n" "\n" "Made a change.\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:3153 #, fuzzy #| msgid "svnserve" msgid "svn merge" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3154 msgid "Apply the differences between two sources to a working copy path." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3159 #, no-wrap msgid "svn merge sourceURL1[@N] sourceURL2[@M] [WCPATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3160 #, no-wrap msgid "svn merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3161 #, no-wrap msgid "svn merge [[-c M]... | [-r N:M]...] [SOURCE[@REV] [WCPATH]]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3166 msgid "" "In the first form, the source URLs are specified at revisions " "<replaceable>N</replaceable> and <replaceable>M</replaceable>. These are " "the two sources to be compared. The revisions default to <literal>HEAD</" "literal> if omitted." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3171 msgid "" "In the second form, the URLs corresponding to the source working copy paths " "define the sources to be compared. The revisions must be specified." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3175 msgid "" "In the third form, <replaceable>SOURCE</replaceable> can be either a URL or " "a working copy path (in which case its corresponding URL is used). If not " "specified, <replaceable>SOURCE</replaceable> will be the same as " "<replaceable>WCPATH</replaceable>. <replaceable>SOURCE</replaceable> in " "revision <replaceable>REV</replaceable> is compared as it existed between " "revisions <replaceable>N</replaceable> and <replaceable>M</replaceable> for " "each revision range provided. If <replaceable>REV</replaceable> is not " "specified, <literal>HEAD</literal> is assumed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3187 msgid "" "<literal>-c M</literal> is equivalent to <literal>-r <M-1>:M</" "literal>, and <literal>-c -M</literal> does the reverse: <literal>-r M:<M-" "1></literal>. If no revision ranges are specified, the default range of " "<literal>1:HEAD</literal> is used. Multiple <literal>-c</literal> and/or " "<literal>-r</literal> instances may be specified, and mixing of forward and " "reverse ranges is allowed—the ranges are internally compacted to their " "minimum representation before merging begins (which may result in no-op)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3198 msgid "" "<replaceable>WCPATH</replaceable> is the working copy path that will receive " "the changes. If <replaceable>WCPATH</replaceable> is omitted, a default " "value of <quote><filename>.</filename></quote> is assumed, unless the " "sources have identical basenames that match a file within <quote><filename>." "</filename></quote>. In this case, the differences will be applied to that " "file." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3207 msgid "" "Subversion will internally track metadata about the merge operation only if " "the two sources are ancestrally related—if the first source is an " "ancestor of the second or vice versa. This is guaranteed to be the case " "when using the third form. Unlike <command>svn diff</command>, the merge " "command takes the ancestry of a file into consideration when performing a " "merge operation. This is very important when you're merging changes from " "one branch into another and you've renamed a file on one branch but not the " "other." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3231 msgid "Only if working with URLs" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3237 #, no-wrap msgid "" "\n" "--accept ARG\n" "--change (-c) REV\n" "--depth ARG\n" "--diff3-cmd CMD\n" "--dry-run\n" "--extensions (-x) ARG\n" "--force\n" "--ignore-ancestry\n" "--quiet (-q)\n" "--record-only\n" "--reintegrate\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3256 msgid "" "Merge a branch back into the trunk (assuming that you have an up-to-date " "working copy of the trunk):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3259 #, no-wrap msgid "" "\n" "$ svn merge --reintegrate \\\n" " http://svn.example.com/repos/calc/branches/my-calc-branch\n" "--- Merging differences between repository URLs into '.':\n" "U button.c\n" "U integer.c\n" "U Makefile\n" " U .\n" "\n" "$ # build, test, verify, ...\n" "\n" "$ svn commit -m \"Merge my-calc-branch back into trunk!\"\n" "Sending .\n" "Sending button.c\n" "Sending integer.c\n" "Sending Makefile\n" "Transmitting file data ..\n" "Committed revision 391.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3279 msgid "To merge changes to a single file:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3281 #, no-wrap msgid "" "\n" "$ cd myproj\n" "$ svn merge -r 30:31 thhgttg.txt \n" "U thhgttg.txt\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:3299 #, fuzzy #| msgid "svnversion" msgid "svn mergeinfo" msgstr "svnversion" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3300 msgid "" "Query merge-related information. See <xref linkend=\"svn.branchmerge." "basicmerging.mergeinfo\"/> for details." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3306 #, no-wrap msgid "svn mergeinfo SOURCE_URL[@REV] [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3311 msgid "" "Query information related to merges (or potential merges) between " "<replaceable>SOURCE-URL</replaceable> and <replaceable>TARGET</" "replaceable>. If the <option>--show-revs</option> option is not provided, " "display revisions which have been merged from <replaceable>SOURCE-URL</" "replaceable> to <replaceable>TARGET</replaceable>. Otherwise, display " "either <literal>merged</literal> or <literal>eligible</literal> revisions as " "specified by the <option>--show-revs</option> option." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3349 msgid "" "Find out which changesets your trunk directory has already received as well " "as what changesets it's still eligible to receive:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3353 #, no-wrap msgid "" "\n" "$ svn mergeinfo branches/test\n" "Path: branches/test\n" " Source path: /trunk\n" " Merged ranges: r2:13\n" " Eligible ranges: r13:15\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3374 #, fuzzy #| msgid "svn import" msgid "svn mkdir" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3375 msgid "Create a new directory under version control." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3379 #, no-wrap msgid "svn mkdir PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3380 #, no-wrap msgid "svn mkdir URL..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3385 msgid "" "Create a directory with a name given by the final component of the " "<replaceable>PATH</replaceable> or <replaceable>URL</replaceable>. A " "directory specified by a working copy <replaceable>PATH</replaceable> is " "scheduled for addition in the working copy. A directory specified by a URL " "is created in the repository via an immediate commit. Multiple directory " "URLs are committed atomically. In both cases, all the intermediate " "directories must already exist unless the <option>--parents</option> option " "is used." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3404 ../en/book/ch09-reference.xml:3516 msgid "Working copy; repository if operating on a URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3409 ../en/book/ch09-reference.xml:3521 #: ../en/book/ch09-reference.xml:3618 ../en/book/ch09-reference.xml:3697 #: ../en/book/ch09-reference.xml:3775 ../en/book/ch09-reference.xml:3872 #: ../en/book/ch09-reference.xml:3985 msgid "Only if operating on a URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3415 #, no-wrap msgid "" "\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force-log\n" "--message (-m) TEXT\n" "--parents\n" "--quiet (-q)\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:3430 #, fuzzy #| msgid "Update your working copy." msgid "Create a directory in your working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3432 #, no-wrap msgid "" "\n" "$ svn mkdir newdir\n" "A newdir\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3437 msgid "" "Create one in the repository (this is an instant commit, so a log message is " "required):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3440 #, no-wrap msgid "" "\n" "$ svn mkdir -m \"Making a new dir.\" http://svn.red-bean.com/repos/newdir\n" "\n" "Committed revision 26.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3458 #, fuzzy #| msgid "svn import" msgid "svn move" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3459 msgid "Move a file or directory." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3463 #, no-wrap msgid "svn move SRC... DST" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3468 msgid "" "This command moves files or directories in your working copy or in the " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:3472 msgid "" "This command is equivalent to an <command>svn copy</command> followed by " "<command>svn delete</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3477 msgid "" "When moving multiple sources, they will be added as children of " "<replaceable>DST</replaceable>, which must be a directory." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><note><para> #: ../en/book/ch09-reference.xml:3482 msgid "" "Subversion does not support moving between working copies and URLs. In " "addition, you can only move files within a single repository—" "Subversion does not support cross-repository moving. Subversion supports " "the following types of moves within a single repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3494 msgid "Move and schedule a file or directory for addition (with history)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3502 msgid "Complete server-side rename." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3511 msgid "" "<command>mv</command>, <command>rename</command>, <command>ren</command>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3527 #, no-wrap msgid "" "\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force\n" "--force-log\n" "--message (-m) TEXT\n" "--parents\n" "--quiet (-q)\n" "--revision (-r) REV\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:3544 #, fuzzy #| msgid "Update your working copy." msgid "Move a file in your working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3546 #, no-wrap msgid "" "\n" "$ svn move foo.c bar.c\n" "A bar.c\n" "D foo.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3552 msgid "Move several files in your working copy into a subdirectory:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3555 #, no-wrap msgid "" "\n" "$ svn move baz.c bat.c qux.c src\n" "A src/baz.c\n" "D baz.c\n" "A src/bat.c\n" "D bat.c\n" "A src/qux.c\n" "D qux.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3565 msgid "" "Move a file in the repository (this is an immediate commit, so it requires a " "commit message):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3568 #, no-wrap msgid "" "\n" "$ svn move -m \"Move a file\" http://svn.red-bean.com/repos/foo.c \\\n" " http://svn.red-bean.com/repos/bar.c\n" "\n" "Committed revision 27.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:3587 msgid "svn propdel" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3588 msgid "Remove a property from an item." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3592 #, no-wrap msgid "svn propdel PROPNAME [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3593 #, no-wrap msgid "svn propdel PROPNAME --revprop -r REV [TARGET]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3598 msgid "" "This removes properties from files, directories, or revisions. The first " "form removes versioned properties in your working copy, and the second " "removes unversioned remote properties on a repository revision " "(<replaceable>TARGET</replaceable> determines only which repository to " "access)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:3608 #, fuzzy #| msgid "<command>svn add</command>" msgid "<command>pdel</command>, <command>pd</command>" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3613 ../en/book/ch09-reference.xml:3692 #: ../en/book/ch09-reference.xml:3770 ../en/book/ch09-reference.xml:3867 #: ../en/book/ch09-reference.xml:3980 msgid "Working copy; repository only if operating on a URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3624 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--revprop\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3637 msgid "Delete a property from a file in your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3640 #, no-wrap msgid "" "\n" "$ svn propdel svn:mime-type some-script\n" "property 'svn:mime-type' deleted from 'some-script'.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3645 msgid "Delete a revision property:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3647 #, no-wrap msgid "" "\n" "$ svn propdel --revprop -r 26 release-date \n" "property 'release-date' deleted from repository revision '26'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3664 #, fuzzy #| msgid "svn import" msgid "svn propedit" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3665 msgid "" "Edit the property of one or more items under version control. See <xref " "linkend=\"svn.ref.svn.c.propset\"/> later in this chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3671 #, no-wrap msgid "svn propedit PROPNAME TARGET..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3672 #, no-wrap msgid "svn propedit PROPNAME --revprop -r REV [TARGET]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3677 msgid "" "Edit one or more properties using your favorite editor. The first form " "edits versioned properties in your working copy, and the second edits " "unversioned remote properties on a repository revision (<replaceable>TARGET</" "replaceable> determines only which repository to access)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:3687 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>pedit</command>, <command>pe</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3703 #, no-wrap msgid "" "\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) ARG\n" "--force\n" "--force-log\n" "--message (-m) ARG\n" "--revision (-r) REV\n" "--revprop\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3719 msgid "" "<command>svn propedit</command> makes it easy to modify properties that have " "multiple values:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3722 #, no-wrap msgid "" "\n" "$ svn propedit svn:keywords foo.c \n" " <svn will launch your favorite editor here, with a buffer open\n" " containing the current contents of the svn:keywords property. You\n" " can add multiple values to a property easily here by entering one\n" " value per line.>\n" "Set new value for property 'svn:keywords' on 'foo.c'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3743 #, fuzzy #| msgid "svn import" msgid "svn propget" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3744 msgid "Print the value of a property." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3748 #, no-wrap msgid "svn propget PROPNAME [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3749 #, no-wrap msgid "svn propget PROPNAME --revprop -r REV [URL]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3754 msgid "" "Print the value of a property on files, directories, or revisions. The " "first form prints the versioned property of an item or items in your working " "copy, and the second prints unversioned remote properties on a repository " "revision. See <xref linkend=\"svn.advanced.props\"/> for more information " "on properties." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:3765 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>pget</command>, <command>pg</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3781 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--revprop\n" "--strict\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3795 msgid "Examine a property of a file in your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3798 #, no-wrap msgid "" "\n" "$ svn propget svn:keywords foo.c\n" "Author\n" "Date\n" "Rev\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3805 msgid "The same goes for a revision property:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3807 #, no-wrap msgid "" "\n" "$ svn propget svn:log --revprop -r 20 \n" "Began journal.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3812 msgid "" "Lastly, you can get <command>svn propget</command> output in XML format with " "the <option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3816 #, no-wrap msgid "" "\n" "$ svn propget --xml svn:ignore .\n" "<?xml version=\"1.0\"?>\n" "<properties>\n" "<target\n" " path=\"\">\n" "<property\n" " name=\"svn:ignore\">*.o\n" "</property>\n" "</target>\n" "</properties>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3841 #, fuzzy #| msgid "svn import" msgid "svn proplist" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3842 msgid "List all properties." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3846 #, no-wrap msgid "svn proplist [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3847 #, no-wrap msgid "svn proplist --revprop -r REV [TARGET]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3852 msgid "" "List all properties on files, directories, or revisions. The first form " "lists versioned properties in your working copy, and the second lists " "unversioned remote properties on a repository revision (<replaceable>TARGET</" "replaceable> determines only which repository to access)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:3862 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>plist</command>, <command>pl</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3878 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--revprop\n" "--verbose (-v)\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3893 msgid "" "You can use <command>proplist</command> to see the properties on an item in " "your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3896 #, no-wrap msgid "" "\n" "$ svn proplist foo.c\n" "Properties on 'foo.c':\n" " svn:mime-type\n" " svn:keywords\n" " owner\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3904 msgid "" "But with the <option>--verbose</option> flag, <command>svn proplist</" "command> is extremely handy as it also shows you the values for the " "properties:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3908 #, no-wrap msgid "" "\n" "$ svn proplist --verbose foo.c\n" "Properties on 'foo.c':\n" " svn:mime-type : text/plain\n" " svn:keywords : Author Date Rev\n" " owner : sally\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3916 msgid "" "Lastly, you can get <command>svn proplist</command> output in xml format " "with the <option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3920 #, no-wrap msgid "" "\n" "$ svn proplist --xml \n" "<?xml version=\"1.0\"?>\n" "<properties>\n" "<target\n" " path=\".\">\n" "<property\n" " name=\"svn:ignore\"/>\n" "</target>\n" "</properties>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3944 #, fuzzy #| msgid "svn import" msgid "svn propset" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3945 msgid "" "Set <replaceable>PROPNAME</replaceable> to <replaceable>PROPVAL</" "replaceable> on files, directories, or revisions." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3949 #, no-wrap msgid "svn propset PROPNAME [PROPVAL | -F VALFILE] PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3950 #, no-wrap msgid "svn propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [TARGET]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3956 msgid "" "Set <replaceable>PROPNAME</replaceable> to <replaceable>PROPVAL</" "replaceable> on files, directories, or revisions. The first example creates " "a versioned, local property change in the working copy, and the second " "creates an unversioned, remote property change on a repository revision " "(<replaceable>TARGET</replaceable> determines only which repository to " "access)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:3966 msgid "" "Subversion has a number of <quote>special</quote> properties that affect its " "behavior. See <xref linkend=\"svn.ref.properties\"/> later in this chapter " "for more on these properties." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:3975 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "<replaceable>pset</replaceable>, <replaceable>ps</replaceable>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3991 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force\n" "--quiet (-q)\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--revprop\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4008 msgid "Set the MIME type for a file:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4010 #, no-wrap msgid "" "\n" "$ svn propset svn:mime-type image/jpeg foo.jpg \n" "property 'svn:mime-type' set on 'foo.jpg'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4015 msgid "" "On a Unix system, if you want a file to have the executable permission set:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4018 #, no-wrap msgid "" "\n" "$ svn propset svn:executable ON somescript\n" "property 'svn:executable' set on 'somescript'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4023 msgid "" "Perhaps you have an internal policy to set certain properties for the " "benefit of your coworkers:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4026 #, no-wrap msgid "" "\n" "$ svn propset owner sally foo.c\n" "property 'owner' set on 'foo.c'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4031 msgid "" "If you made a mistake in a log message for a particular revision and want to " "change it, use <option>--revprop</option> and set <literal>svn:log</literal> " "to the new log message:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4036 #, no-wrap msgid "" "\n" "$ svn propset --revprop -r 25 svn:log \"Journaled about trip to New York.\"\n" "property 'svn:log' set on repository revision '25'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4041 msgid "Or, if you don't have a working copy, you can provide a URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4044 #, no-wrap msgid "" "\n" "$ svn propset --revprop -r 26 svn:log \"Document nap.\" \\\n" " http://svn.red-bean.com/repos\n" "property 'svn:log' set on repository revision '25'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4050 msgid "" "Lastly, you can tell <command>propset</command> to take its input from a " "file. You could even use this to set the contents of a property to " "something binary:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4054 #, no-wrap msgid "" "\n" "$ svn propset owner-pic -F sally.jpg moo.c \n" "property 'owner-pic' set on 'moo.c'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><note><para> #: ../en/book/ch09-reference.xml:4060 msgid "" "By default, you cannot modify revision properties in a Subversion " "repository. Your repository administrator must explicitly enable revision " "property modifications by creating a hook named <literal>pre-revprop-change</" "literal>. See <xref linkend=\"svn.reposadmin.create.hooks\"/> for more " "information on hook scripts." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4081 #, fuzzy #| msgid "svnserve" msgid "svn resolve" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:4082 msgid "Resolve conflicts on working copy files or directories." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4087 #, no-wrap msgid "svn resolve PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4092 msgid "" "Resolve <quote>conflicted</quote> state on working copy files or " "directories. This routine does not semantically resolve conflict markers; " "however, it replaces <replaceable>PATH</replaceable> with the version " "specified by the <option>--accept</option> argument and then removes " "conflict-related artifact files. This allows <replaceable>PATH</" "replaceable> to be committed again—that is, it tells Subversion that " "the conflicts have been <quote>resolved.</quote>. You can pass the " "following arguments to the <option>--accept</option> command depending on " "your desired resolution:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4108 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>base</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4110 #, fuzzy #| msgid "" #| "This is the file that was the <literal>BASE</literal> revision before you " #| "updated your working copy. That is, the file that you checked out before " #| "you made your latest edits." msgid "" "Choose the file that was the <literal>BASE</literal> revision before you " "updated your working copy. That is, the file that you checked out before " "you made your latest edits." msgstr "" "Dies ist die Datei, die die <literal>BASE</literal>-Revision war bevor Sie " "Ihre Arbeitskopie aktualisiert haben; also die Datei, die Sie ausgecheckt " "hatten, bevor Sie Ihre letzten Änderungen machten." # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4119 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>working</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4121 msgid "" "Assuming that you've manually handled the conflict resolution, choose the " "version of the file as it currently stands in your working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4128 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>mine-full</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4130 msgid "" "Resolve all conflicted files with copies of the files as they stood " "immediately before you ran <command>svn update</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4137 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>theirs-full</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4139 msgid "" "Resolve all conflicted files with copies of the files that were fetched from " "the server when you ran <command>svn update</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4147 msgid "" "See <xref linkend=\"svn.tour.cycle.resolve\"/> for an in-depth look at " "resolving conflicts." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4171 #, no-wrap msgid "" "\n" "--accept ARG\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4183 msgid "" "Here's an example where, after a postponed conflict resolution during " "update, <command>svn resolve</command> replaces the all conflicts in file " "<filename>foo.c</filename> with your edits:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch09-reference.xml:4188 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn update\n" #| "Conflict discovered in 'sandwich.txt'.\n" #| "Select: (p) postpone, (df) diff-full, (e) edit,\n" #| " (h) help for more options: p\n" #| "C sandwich.txt\n" #| "Updated to revision 2.\n" #| "$ ls sandwich.*\n" #| "sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1\n" #| "$ svn resolve --accept theirs-full sandwich.txt\n" #| "Resolved conflicted state of 'sandwich.txt'\n" msgid "" "\n" "$ svn up\n" "Conflict discovered in 'foo.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options: p\n" "C foo.c\n" "Updated to revision 5.\n" "\n" "$ svn resolve --accept mine-full foo.c\n" "Resolved conflicted state of 'foo.c'\n" msgstr "" "\n" "$ svn update\n" "Conflict discovered in 'sandwich.txt'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options: p\n" "C sandwich.txt\n" "Updated to revision 2.\n" "$ ls sandwich.*\n" "sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1\n" "$ svn resolve --accept theirs-full sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4212 #, fuzzy #| msgid "svnserve" msgid "svn resolved" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:4213 msgid "" "<emphasis>Deprecated</emphasis>. Remove <quote>conflicted</quote> state on " "working copy files or directories." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4219 #, no-wrap msgid "svn resolved PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4224 msgid "" "This command has been deprecated in favor of running <userinput>svn resolve " "--accept working <replaceable>PATH</replaceable></userinput>. See <xref " "linkend=\"svn.ref.svn.c.resolve\"/> in the preceding section for details." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4229 msgid "" "Remove <quote>conflicted</quote> state on working copy files or " "directories. This routine does not semantically resolve conflict markers; " "it merely removes conflict-related artifact files and allows " "<replaceable>PATH</replaceable> to be committed again; that is, it tells " "Subversion that the conflicts have been <quote>resolved.</quote> See <xref " "linkend=\"svn.tour.cycle.resolve\"/> for an in-depth look at resolving " "conflicts." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4257 #, no-wrap msgid "" "\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4268 msgid "" "If you get a conflict on an update, your working copy will sprout three new " "files:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:4271 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn update\n" #| "U foo.c\n" #| "U bar.c\n" #| "Updated to revision 2.\n" msgid "" "\n" "$ svn update\n" "C foo.c\n" "Updated to revision 31.\n" "$ ls\n" "foo.c\n" "foo.c.mine\n" "foo.c.r30\n" "foo.c.r31\n" msgstr "" "\n" "$ svn update\n" "U foo.c\n" "U bar.c\n" "Updated to revision 2.\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4282 msgid "" "Once you've resolved the conflict and <filename>foo.c</filename> is ready to " "be committed, run <command>svn resolved</command> to let your working copy " "know you've taken care of everything." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:4288 msgid "" "You <emphasis>can</emphasis> just remove the conflict files and commit, but " "<command>svn resolved</command> fixes up some bookkeeping data in the " "working copy administrative area in addition to removing the conflict files, " "so we recommend that you use this command." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4308 #, fuzzy #| msgid "svnserve" msgid "svn revert" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:4309 msgid "Undo all local edits." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4313 #, no-wrap msgid "svn revert PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4318 msgid "" "Reverts any local changes to a file or directory and resolves any conflicted " "states. <command>svn revert</command> will revert not only the contents of " "an item in your working copy, but also any property changes. Finally, you " "can use it to undo any scheduling operations that you may have performed (e." "g., files scheduled for addition or deletion can be <quote>unscheduled</" "quote>)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4346 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4358 msgid "Discard changes to a file:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:4360 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn revert README\n" #| "Reverted 'README'\n" msgid "" "\n" "$ svn revert foo.c\n" "Reverted foo.c\n" msgstr "" "\n" "$ svn revert README\n" "Reverted 'README'\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4365 msgid "" "If you want to revert a whole directory of files, use the <option>--" "depth=infinity</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4368 #, no-wrap msgid "" "\n" "$ svn revert --depth=infinity .\n" "Reverted newdir/afile\n" "Reverted foo.c\n" "Reverted bar.txt\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4375 msgid "Lastly, you can undo any scheduling operations:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4378 #, no-wrap msgid "" "\n" "$ svn add mistake.txt whoops\n" "A mistake.txt\n" "A whoops\n" "A whoops/oopsie.c\n" "\n" "$ svn revert mistake.txt whoops\n" "Reverted mistake.txt\n" "Reverted whoops\n" "\n" "$ svn status\n" "? mistake.txt\n" "? whoops\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:4394 msgid "" "<command>svn revert</command> is inherently dangerous, since its entire " "purpose is to throw away data—namely, your uncommitted changes. Once " "you've reverted, Subversion provides <emphasis>no way</emphasis> to get back " "those uncommitted changes." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:4401 msgid "" "If you provide no targets to <command>svn revert</command>, it will do " "nothing—to protect you from accidentally losing changes in your " "working copy, <command>svn revert</command> requires you to provide at least " "one target." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:4420 msgid "svn status" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:4421 msgid "Print the status of working copy files and directories." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4425 #, no-wrap msgid "svn status [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4430 msgid "" "Print the status of working copy files and directories. With no arguments, " "it prints only locally modified items (no repository access). With " "<option>--show-updates</option>, it adds working revision and server out-of-" "date information. With <option>--verbose</option>, it prints full revision " "information on every item. With <option>--quiet</option>, it prints only " "summary information about locally modified items." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4440 msgid "" "The first six columns in the output are each one character wide, and each " "column gives you information about different aspects of each working copy " "item." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4444 msgid "" "The first column indicates that an item was added, deleted, or otherwise " "changed:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4450 ../en/book/ch09-reference.xml:4545 #: ../en/book/ch09-reference.xml:4577 ../en/book/ch09-reference.xml:4598 #: ../en/book/ch09-reference.xml:4620 ../en/book/ch09-reference.xml:4640 #: ../en/book/ch09-reference.xml:4699 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>' '</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4452 ../en/book/ch09-reference.xml:4547 msgid "No modifications." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4457 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'A'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4459 msgid "Item is scheduled for addition." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4464 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'D'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4466 msgid "Item is scheduled for deletion." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4471 ../en/book/ch09-reference.xml:4552 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'M'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4473 msgid "Item has been modified." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4478 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'R'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4480 msgid "" "Item has been replaced in your working copy. This means the file was " "scheduled for deletion, and then a new file with the same name was scheduled " "for addition in its place." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4488 ../en/book/ch09-reference.xml:4560 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'C'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4490 msgid "" "The contents (as opposed to the properties) of the item conflict with " "updates received from the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4497 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'X'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4499 msgid "Item is present because of an externals definition." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4504 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'I'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4506 msgid "" "Item is being ignored (e.g., with the <literal>svn:ignore</literal> " "property)." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4512 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'?'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4514 msgid "Item is not under version control." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4519 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'!'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4521 msgid "" "Item is missing (e.g., you moved or deleted it without using <command>svn</" "command>). This also indicates that a directory is incomplete (a checkout " "or update was interrupted)." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4529 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'~'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4531 msgid "" "Item is versioned as one kind of object (file, directory, link), but has " "been replaced by a different kind of object." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4539 msgid "" "The second column tells the status of a file's or directory's properties:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4554 #, fuzzy #| msgid "" #| "The contents of the file <filename>item</filename> have been modified." msgid "Properties for this item have been modified." msgstr "Der Inhalt der Datei <filename>item</filename> ist geändert worden." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4562 msgid "" "Properties for this item are in conflict with property updates received from " "the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4570 msgid "" "The third column is populated only if the working copy directory is locked " "(see <xref linkend=\"svn.tour.cleanup\"/>):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4579 msgid "Item is not locked." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4584 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'L'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4586 msgid "Item is locked." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4592 msgid "" "The fourth column is populated only if the item is scheduled for addition-" "with-history:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4600 msgid "No history scheduled with commit." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4605 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'+'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4607 msgid "History scheduled with commit." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4613 msgid "" "The fifth column is populated only if the item is switched relative to its " "parent (see <xref linkend=\"svn.branchmerge.switchwc\"/>):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4622 msgid "Item is a child of its parent directory." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4627 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'S'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4629 msgid "Item is switched." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4635 msgid "The sixth column is populated with lock information:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4642 msgid "" "When <option>--show-updates</option> is used, the file is not locked. If " "<option>--show-updates</option> is <emphasis>not</emphasis> used, this " "merely means that the file is not locked in this working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4651 msgid "K" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4653 msgid "File is locked in this working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4658 msgid "O" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4660 msgid "" "File is locked either by another user or in another working copy. This " "appears only when <option>--show-updates</option> is used." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4667 msgid "T" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4669 msgid "" "File was locked in this working copy, but the lock has been <quote>stolen</" "quote> and is invalid. The file is currently locked in the repository. " "This appears only when <option>--show-updates</option> is used." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4678 msgid "B" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4680 msgid "" "File was locked in this working copy, but the lock has been <quote>broken</" "quote> and is invalid. The file is no longer locked. This appears only " "when <option>--show-updates</option> is used." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4692 msgid "" "The out-of-date information appears in the seventh column (only if you pass " "the <option>--show-updates</option> option):" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:4701 #, fuzzy #| msgid "Update your working copy." msgid "The item in your working copy is up to date." msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4706 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'*'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4708 msgid "A newer revision of the item exists on the server." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4715 msgid "" "The remaining fields are variable width and delimited by spaces. The " "working revision is the next field if the <option>--show-updates</option> or " "<option>--verbose</option> option is passed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4720 msgid "" "If the <option>--verbose</option> option is passed, the last committed " "revision and last committed author are displayed next." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4724 msgid "" "The working copy path is always the final field, so it can include spaces." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:4731 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>stat</command>, <command>st</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4741 msgid "Only if using <option>--show-updates</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4747 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--ignore-externals\n" "--incremental\n" "--no-ignore\n" "--quiet (-q)\n" "--show-updates (-u)\n" "--verbose (-v)\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4763 msgid "" "This is the easiest way to find out what changes you have made to your " "working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4766 #, no-wrap msgid "" "\n" "$ svn status wc\n" " M wc/bar.c\n" "A + wc/qax.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4772 msgid "" "If you want to find out what files in your working copy are out of date, " "pass the <option>--show-updates</option> option (this will <emphasis>not</" "emphasis> make any changes to your working copy). Here you can see that " "<filename>wc/foo.c</filename> has changed in the repository since we last " "updated our working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4781 #, no-wrap msgid "" "\n" "$ svn status --show-updates wc\n" " M 965 wc/bar.c\n" " * 965 wc/foo.c\n" "A + 965 wc/qax.c\n" "Status against revision: 981\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><note><para> #: ../en/book/ch09-reference.xml:4790 msgid "" "<option>--show-updates</option> <emphasis>only</emphasis> places an asterisk " "next to items that are out of date (i.e., items that will be updated from " "the repository if you later use <command>svn update</command>). <option>--" "show-updates</option> does <emphasis>not</emphasis> cause the status listing " "to reflect the repository's version of the item (although you can see the " "revision number in the repository by passing the <option>--verbose</option> " "option)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4801 msgid "" "The most information you can get out of the status subcommand is as follows:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch09-reference.xml:4804 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn status -u -v\n" #| "M * 44 23 sally README\n" #| "M 44 20 harry bar.c\n" #| " * 44 35 harry stuff/trout.c\n" #| "D 44 19 ira stuff/fish.c\n" #| "A 0 ? ? stuff/things/bloo.h\n" #| "Status against revision: 46\n" msgid "" "\n" "$ svn status --show-updates --verbose wc\n" " M 965 938 sally wc/bar.c\n" " * 965 922 harry wc/foo.c\n" "A + 965 687 harry wc/qax.c\n" " 965 687 harry wc/zig.c\n" "Head revision: 981\n" msgstr "" "\n" "$ svn status -u -v\n" "M * 44 23 sally README\n" "M 44 20 harry bar.c\n" " * 44 35 harry stuff/trout.c\n" "D 44 19 ira stuff/fish.c\n" "A 0 ? ? stuff/things/bloo.h\n" "Status against revision: 46\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4813 msgid "" "Lastly, you can get <command>svn status</command> output in XML format with " "the <option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4817 #, no-wrap msgid "" "\n" "$ svn status --xml wc\n" "<?xml version=\"1.0\"?>\n" "<status>\n" "<target\n" " path=\"wc\">\n" "<entry\n" " path=\"qax.c\">\n" "<wc-status\n" " props=\"none\"\n" " item=\"added\"\n" " revision=\"0\">\n" "</wc-status>\n" "</entry>\n" "<entry\n" " path=\"bar.c\">\n" "<wc-status\n" " props=\"normal\"\n" " item=\"modified\"\n" " revision=\"965\">\n" "<commit\n" " revision=\"965\">\n" "<author>sally</author>\n" "<date>2008-05-28T06:35:53.048870Z</date>\n" "</commit>\n" "</wc-status>\n" "</entry>\n" "</target>\n" "</status>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4848 msgid "" "For many more examples of <command>svn status</command>, see <xref linkend=" "\"svn.tour.cycle.examine.status\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:4863 #, fuzzy #| msgid "svn import" msgid "svn switch" msgstr "svn import" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:4864 #, fuzzy #| msgid "Update your working copy." msgid "Update working copy to a different URL." msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4868 #, no-wrap msgid "svn switch URL[@PEGREV] [PATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4870 #, no-wrap msgid "switch --relocate FROM TO [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4877 msgid "" "The first variant of this subcommand (without the <option>--relocate</" "option> option) updates your working copy to point to a new URL—" "usually a URL that shares a common ancestor with your working copy, although " "not necessarily. This is the Subversion way to move a working copy to a new " "branch. If specified, <replaceable>PEGREV</replaceable> determines in which " "revision the target is first looked up. See <xref linkend=\"svn.branchmerge." "switchwc\"/> for an in-depth look at switching." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4888 msgid "" "If <option>--force</option> is used, unversioned obstructing paths in the " "working copy do not automatically cause a failure if the switch attempts to " "add the same path. If the obstructing path is the same type (file or " "directory) as the corresponding path in the repository, it becomes versioned " "but its contents are left untouched in the working copy. This means that an " "obstructing directory's unversioned children may also obstruct and become " "versioned. For files, any content differences between the obstruction and " "the repository are treated like a local modification to the working copy. " "All properties from the repository are applied to the obstructing path." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4902 msgid "" "As with most subcommands, you can limit the scope of the switch operation to " "a particular tree depth using the <option>--depth</option> option. " "Alternatively, you can use the <option>--set-depth</option> option to set a " "new <quote>sticky</quote> working copy depth on the switch target. " "Currently, the depth of a working copy directory can only be increased " "(telescoped more deeply); you cannot make a directory more shallow." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4911 msgid "" "The <option>--relocate</option> option causes <command>svn switch</command> " "to do something different: it updates your working copy to point to " "<emphasis>the same</emphasis> repository directory, only at a different URL " "(typically because an administrator has moved the repository to another " "server, or to another URL on the same server)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:4923 #, fuzzy #| msgid "<command>svn add</command>" msgid "<command>sw</command>" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4939 #, no-wrap msgid "" "\n" "--accept ARG\n" "--depth ARG\n" "--diff3-cmd CMD\n" "--force\n" "--ignore-externals\n" "--quiet (-q)\n" "--relocate\n" "--revision (-r) REV\n" "--set-depth ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4955 msgid "" "If you're currently inside the directory <filename>vendors</filename>, which " "was branched to <filename>vendors-with-fix</filename>, and you'd like to " "switch your working copy to that branch:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4960 #, no-wrap msgid "" "\n" "$ svn switch http://svn.red-bean.com/repos/branches/vendors-with-fix .\n" "U myproj/foo.txt\n" "U myproj/bar.txt\n" "U myproj/baz.c\n" "U myproj/qux.c\n" "Updated to revision 31.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4969 msgid "" "To switch back, just provide the URL to the location in the repository from " "which you originally checked out your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4973 #, no-wrap msgid "" "\n" "$ svn switch http://svn.red-bean.com/repos/trunk/vendors .\n" "U myproj/foo.txt\n" "U myproj/bar.txt\n" "U myproj/baz.c\n" "U myproj/qux.c\n" "Updated to revision 31.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:4983 msgid "" "You can switch just part of your working copy to a branch if you don't want " "to switch your entire working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4988 msgid "" "Sometimes an administrator might change the location (or apparent location) " "of your repository—in other words, the content of the repository " "doesn't change, but the repository's root URL does. For example, the " "hostname may change, the URL scheme may change, or any part of the URL that " "leads to the repository itself may change. Rather than check out a new " "working copy, you can have the <command>svn switch</command> command " "<quote>rewrite</quote> your working copy's administrative metadata to refer " "to the new repository location. If you use the <option>--relocate</option> " "option to <command>svn switch</command>, Subversion will contact the " "repository to validate the relocation request (looking for the repository at " "the new URL, of course), and then do this metadata rewriting. No file " "contents will be changed as the result of this type of switch " "operation—this is a metadata-only modification to the working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5006 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos test\n" "A test/a\n" "A test/b\n" "…\n" "\n" "$ mv repos newlocation\n" "$ cd test/\n" "\n" "$ svn update\n" "svn: Unable to open an ra_local session to URL\n" "svn: Unable to open repository 'file:///var/svn/repos'\n" "\n" "$ svn switch --relocate file:///var/svn/repos file:///tmp/newlocation .\n" "$ svn update\n" "At revision 3.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:5025 msgid "" "Be careful when using the <option>--relocate</option> option. If you " "mistype the argument, you might end up creating nonsensical URLs within your " "working copy that render the whole workspace unusable and tricky to fix. " "It's also important to understand exactly when one should or shouldn't use " "<option>--relocate</option>. Here's the rule of thumb:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:5035 msgid "" "If the working copy needs to reflect a new directory <emphasis>within</" "emphasis> the repository, use just <command>svn switch</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:5040 msgid "" "If the working copy still reflects the same repository directory, but the " "location of the repository itself has changed, use <command>svn switch</" "command> with the <option>--relocate</option> option." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5060 #, fuzzy #| msgid "svnlook" msgid "svn unlock" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5061 msgid "Unlock working copy paths or URLs." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5065 #, no-wrap msgid "svn unlock TARGET..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5070 msgid "" "Unlock each <replaceable>TARGET</replaceable>. If any <replaceable>TARGET</" "replaceable> is locked by another user or no valid lock token exists in the " "working copy, print a warning and continue unlocking the rest of the " "<replaceable>TARGET</replaceable>s. Use <option>--force</option> to break a " "lock belonging to another user or working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5098 #, no-wrap msgid "" "\n" "--force\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:5107 #, fuzzy #| msgid "Update your working copy." msgid "Unlock two files in your working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5109 #, no-wrap msgid "" "\n" "$ svn unlock tree.jpg house.jpg\n" "'tree.jpg' unlocked.\n" "'house.jpg' unlocked.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5115 msgid "" "Unlock a file in your working copy that is currently locked by another user:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5118 #, no-wrap msgid "" "\n" "$ svn unlock tree.jpg\n" "svn: 'tree.jpg' is not locked in this working copy\n" "$ svn unlock --force tree.jpg\n" "'tree.jpg' unlocked.\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:5125 #, fuzzy #| msgid "Update your working copy." msgid "Unlock a file without a working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5127 #, no-wrap msgid "" "\n" "$ svn unlock http://svn.red-bean.com/repos/test/tree.jpg\n" "'tree.jpg unlocked.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5148 #, fuzzy #| msgid "svndumpfilter" msgid "svn update" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5153 #, no-wrap msgid "svn update [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5158 msgid "" "<command>svn update</command> brings changes from the repository into your " "working copy. If no revision is given, it brings your working copy up to " "date with the <literal>HEAD</literal> revision. Otherwise, it synchronizes " "the working copy to the revision given by the <option>--revision</option> " "option. As part of the synchronization, <command>svn update</command> also " "removes any stale locks (see <xref linkend=\"svn.tour.cleanup\"/>) found in " "the working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5169 msgid "" "For each updated item, it prints a line that starts with a character " "reporting the action taken. These characters have the following meaning:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5178 msgid "Added" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:5183 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>B</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5185 msgid "Broken lock (third column only)" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5192 msgid "Deleted" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:5197 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>U</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5199 msgid "Updated" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:5204 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>C</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5206 msgid "Conflicted" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:5211 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>G</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5213 msgid "Merged" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:5218 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>E</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5220 msgid "Existed" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5226 msgid "" "A character in the first column signifies an update to the actual file, " "whereas updates to the file's properties are shown in the second column. " "Lock information is printed in the third column." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5231 msgid "" "As with most subcommands, you can limit the scope of the update operation to " "a particular tree depth using the <option>--depth</option> option. " "Alternatively, you can use the <option>--set-depth</option> option to set a " "new <quote>sticky</quote> working copy depth on the update target. " "Currently, the depth of a working copy directory can only be increased " "(telescoped more deeply); you cannot make a directory more shallow." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:5243 #, fuzzy #| msgid "<command>svn update</command>" msgid "<command>up</command>" msgstr "<command>svn update</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5259 #, no-wrap msgid "" "\n" "--accept ARG\n" "--changelist\n" "--depth ARG\n" "--diff3-cmd CMD\n" "--editor-cmd ARG\n" "--force\n" "--ignore-externals\n" "--quiet (-q)\n" "--revision (-r) REV\n" "--set-depth ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5276 msgid "Pick up repository changes that have happened since your last update:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5279 #, no-wrap msgid "" "\n" "$ svn update\n" "A newdir/toggle.c\n" "A newdir/disclose.c\n" "A newdir/launch.c\n" "D newdir/README\n" "Updated to revision 32.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5288 msgid "" "You can also <quote>update</quote> your working copy to an older revision " "(Subversion doesn't have the concept of <quote>sticky</quote> files like CVS " "does; see <xref linkend=\"svn.forcvs\"/>):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5293 #, no-wrap msgid "" "\n" "$ svn update -r30\n" "A newdir/README\n" "D newdir/toggle.c\n" "D newdir/disclose.c\n" "D newdir/launch.c\n" "U foo.c\n" "Updated to revision 30.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:5304 msgid "" "If you want to examine an older revision of a single file, you may want to " "use <command>svn cat</command> instead—it won't change your working " "copy." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:5322 msgid "" "<command>svnadmin</command> is the administrative tool for monitoring and " "repairing your Subversion repository. For detailed information on " "repository administration, see the maintenance section for <xref linkend=" "\"svn.reposadmin.maint.tk.svnadmin\"/>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:5327 msgid "" "Since <command>svnadmin</command> works via direct repository access (and " "thus can only be used on the machine that holds the repository), it refers " "to the repository with a path, not a URL." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:5333 #, fuzzy #| msgid "<command>svn add</command>" msgid "<command>svnadmin</command> Options" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:5335 msgid "" "Options in <command>svmadin</command> are global, just as they are in " "<command>svn</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5341 msgid "<option>--bdb-log-keep</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5343 msgid "" "(Berkeley DB-specific.) Disable automatic log removal of database logfiles. " "Having these logfiles around can be convenient if you need to restore from a " "catastrophic repository failure." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5351 msgid "<option>--bdb-txn-nosync</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5354 msgid "" "(Berkeley DB-specific.) Disables fsync when committing database " "transactions. Used with the <command>svnadmin create</command> command to " "create a Berkeley DB-backed repository with <literal>DB_TXN_NOSYNC</literal> " "enabled (which improves speed but has some risks associated with it)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5364 msgid "<option>--bypass-hooks</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5366 msgid "Bypass the repository hook system." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5371 msgid "<option>--clean-logs</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5373 msgid "Remove unused Berkeley DB logs." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5381 msgid "<option>--force-uuid</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5383 msgid "" "By default, when loading data into repository that already contains " "revisions, <command>svnadmin</command> will ignore the <literal>UUID</" "literal> from the dump stream. This option will cause the repository's " "<literal>UUID</literal> to be set to the <literal>UUID</literal> from the " "stream." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5393 msgid "<option>--ignore-uuid</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5395 msgid "" "By default, when loading an empty repository, <command>svnadmin</command> " "will ignore the <literal>UUID</literal> from the dump stream. This option " "will force that UUID to be ignored (useful for overriding your configuration " "file if it has <option>--force-uuid</option> set)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5407 msgid "" "Dump a revision only as a diff against the previous revision, instead of the " "usual fulltext." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5414 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "<option>--parent-dir <replaceable>DIR</replaceable></option>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5417 msgid "" "When loading a dump file, root paths at <replaceable>DIR</replaceable> " "instead of <filename>/</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5424 msgid "<option>--pre-1.4-compatible</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5426 msgid "" "When creating a new repository, use a format that is compatible with " "versions of Subversion earlier than Subversion 1.4." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5433 msgid "<option>--pre-1.5-compatible</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5435 msgid "" "When creating a new repository, use a format that is compatible with " "versions of Subversion earlier than Subversion 1.5." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5442 msgid "" "<option>--revision</option> (<option>-r</option>) <replaceable>ARG</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5445 msgid "Specify a particular revision to operate on." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5451 ../en/book/ch09-reference.xml:8269 msgid "<option>--quiet</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5453 msgid "Do not show normal progress—show only errors." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5459 msgid "<option>--use-post-commit-hook</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5461 msgid "" "When loading a dump file, runs the repository's <literal>post-commit</" "literal> hook after finalizing each newly loaded revision." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5468 msgid "<option>--use-post-revprop-change-hook</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5470 msgid "" "When changing a revision property, runs the repository's <literal>post-" "revprop-change</literal> hook after changing the revision property." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5477 msgid "<option>--use-pre-commit-hook</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5479 msgid "" "When loading a dump file, runs the repository's <literal>pre-commit</" "literal> hook before finalizing each newly loaded revision. If the hook " "fails, aborts the commit and terminates the load process." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5487 msgid "<option>--use-pre-revprop-change-hook</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5489 msgid "" "When changing a revision property, runs the repository's <literal>pre-" "revprop-change</literal> hook before changing the revision property. If the " "hook fails, aborts the modification and terminates." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:5501 msgid "svnadmin Subcommands" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:5503 msgid "" "Here are the various subcommands for the <command>svnadmin</command> program." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5515 #, fuzzy #| msgid "svnadmin" msgid "svnadmin crashtest" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5516 msgid "Simulate a process that crashes." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5520 #, no-wrap msgid "svnadmin crashtest REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5525 msgid "" "Open the repository at <replaceable>REPOS_PATH</replaceable>, then abort, " "thus simulating a process that crashes while holding an open repository " "handle. This is used for testing automatic repository recovery (a new " "feature in Berkeley DB 4.4). It's unlikely that you'll need to run this " "command." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5544 #, no-wrap msgid "" "\n" "$ svnadmin crashtest /var/svn/repos\n" "Aborted\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5549 msgid "Exciting, isn't it?" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5563 #, fuzzy #| msgid "svnadmin" msgid "svnadmin create" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5564 msgid "Create a new, empty repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5568 #, no-wrap msgid "svnadmin create REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para><footnote> #: ../en/book/ch09-reference.xml:5573 msgid "" "Create a new, empty repository at the path provided. If the provided " "directory does not exist, it will be created for you. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para><footnote><para> #: ../en/book/ch09-reference.xml:5577 msgid "" "Remember, <command>svnadmin</command> works only with local <emphasis>paths</" "emphasis>, not <emphasis>URLs</emphasis>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5580 msgid "" "</footnote> As of Subversion 1.2, <command>svnadmin</command> creates new " "repositories with the <literal>FSFS</literal> filesystem backend by default." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5586 msgid "" "While <command>svnadmin create</command> will create the base directory for " "a new repository, it will not create intermediate directories. For example, " "if you have an empty directory named <filename>/var/svn</filename>, creating " "<filename>/var/svn/repos</filename> will work, while attempting to create " "<filename>/var/svn/subdirectory/repos</filename> will fail with an error." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5601 #, no-wrap msgid "" "\n" "--bdb-log-keep\n" "--bdb-txn-nosync\n" "--config-dir DIR\n" "--fs-type TYPE\n" "--pre-1.4-compatible\n" "--pre-1.5-compatible\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5614 msgid "Creating a new repository is this easy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5616 #, no-wrap msgid "" "\n" "$ svnadmin create /var/svn/repos\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5620 msgid "" "In Subversion 1.0, a Berkeley DB repository is always created. In " "Subversion 1.1, a Berkeley DB repository is the default repository type, but " "an FSFS repository can be created using the <option>--fs-type</option> " "option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5626 #, no-wrap msgid "" "\n" "$ svnadmin create /var/svn/repos --fs-type fsfs\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5642 #, fuzzy #| msgid "svnadmin" msgid "svnadmin deltify" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5643 msgid "Deltify changed paths in a revision range." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5647 #, no-wrap msgid "svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5652 msgid "" "<command>svnadmin deltify</command> exists in current versions of Subversion " "only for historical reasons. This command is deprecated and no longer " "needed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5656 msgid "" "It dates from a time when Subversion offered administrators greater control " "over compression strategies in the repository. This turned out to be a lot " "of complexity for <emphasis>very</emphasis> little gain, and this " "<quote>feature</quote> was deprecated." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5666 #, no-wrap msgid "" "\n" "--quiet (-q)\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5682 #, fuzzy #| msgid "svnadmin" msgid "svnadmin dump" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5683 #, fuzzy #| msgid "" #| "The contents of the file <filename>item</filename> have been modified." msgid "Dump the contents of the filesystem to <filename>stdout</filename>." msgstr "Der Inhalt der Datei <filename>item</filename> ist geändert worden." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5687 #, no-wrap msgid "svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5692 msgid "" "Dump the contents of the filesystem to <filename>stdout</filename> in a " "<quote>dump file</quote> portable format, sending feedback to " "<filename>stderr</filename>. Dump revisions <replaceable>LOWER</" "replaceable> rev through <replaceable>UPPER</replaceable> rev. If no " "revisions are given, dump all revision trees. If only <replaceable>LOWER</" "replaceable> is given, dump that one revision tree. See <xref linkend=\"svn." "reposadmin.maint.migrate\"/> for a practical use." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5702 msgid "" "By default, the Subversion dump stream contains a single revision (the first " "revision in the requested revision range) in which every file and directory " "in the repository in that revision is presented as though that whole tree " "was added at once, followed by other revisions (the remainder of the " "revisions in the requested range), which contain only the files and " "directories that were modified in those revisions. For a modified file, the " "complete full-text representation of its contents, as well as all of its " "properties, are presented in the dump file; for a directory, all of its " "properties are presented." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5714 msgid "" "Two useful options modify the dump file generator's behavior. The first is " "the <option>--incremental</option> option, which simply causes that first " "revision in the dump stream to contain only the files and directories " "modified in that revision, instead of being presented as the addition of a " "new tree, and in exactly the same way that every other revision in the dump " "file is presented. This is useful for generating a relatively small dump " "file to be loaded into another repository that already has the files and " "directories that exist in the original repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5726 msgid "" "The second useful option is <option>--deltas</option>. This option causes " "<command>svnadmin dump</command> to, instead of emitting full-text " "representations of file contents and property lists, emit only deltas of " "those items against their previous versions. This reduces (in some cases, " "drastically) the size of the dump file that <command>svnadmin dump</command> " "creates. There are, however, disadvantages to using this option—" "deltified dump files are more CPU-intensive to create, cannot be operated on " "by <command>svndumpfilter</command>, and tend not to compress as well as " "their nondeltified counterparts when using third-party tools such as " "<command>gzip</command> and <command>bzip2</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5743 #, no-wrap msgid "" "\n" "--deltas\n" "--incremental\n" "--quiet (-q)\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5754 msgid "Dump your whole repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5756 #, no-wrap msgid "" "\n" "$ svnadmin dump /var/svn/repos > full.dump\n" "* Dumped revision 0.\n" "* Dumped revision 1.\n" "* Dumped revision 2.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5764 msgid "Incrementally dump a single transaction from your repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5767 #, no-wrap msgid "" "\n" "$ svnadmin dump /var/svn/repos -r 21 --incremental > incr.dump\n" "* Dumped revision 21.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5784 #, fuzzy #| msgid "svnadmin" msgid "svnadmin help" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5788 #, no-wrap msgid "svnadmin help [SUBCOMMAND...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5794 msgid "" "This subcommand is useful when you're trapped on a desert island with " "neither a Net connection nor a copy of this book." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5815 #, fuzzy #| msgid "svnadmin" msgid "svnadmin hotcopy" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5816 msgid "Make a hot copy of a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5820 #, no-wrap msgid "svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5826 msgid "" "This subcommand makes a full <quote>hot</quote> backup of your repository, " "including all hooks, configuration files, and, of course, database files. " "If you pass the <option>--clean-logs</option> option, <command>svnadmin</" "command> will perform a hot copy of your repository, and then remove unused " "Berkeley DB logs from the original repository. You can run this command at " "any time and make a safe copy of the repository, regardless of whether other " "processes are using the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5841 #, no-wrap msgid "" "\n" "--clean-logs\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:5846 msgid "" "As described in <xref linkend=\"svn.reposadmin.basics.backends.bdb\"/>, hot-" "copied Berkeley DB repositories are <emphasis>not</emphasis> portable across " "operating systems, nor will they work on machines with a different " "<quote>endianness</quote> than the machine where they were created." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:5867 msgid "svnadmin list-dblogs" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5868 msgid "" "Ask Berkeley DB which logfiles exist for a given Subversion repository " "(applies only to repositories using the <literal>bdb</literal> backend)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5874 #, no-wrap msgid "svnadmin list-dblogs REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5879 ../en/book/ch09-reference.xml:5912 msgid "" "Berkeley DB creates logs of all changes to the repository, which allow it to " "recover in the face of catastrophe. Unless you enable " "<literal>DB_LOG_AUTOREMOVE</literal>, the logfiles accumulate, although most " "are no longer used and can be deleted to reclaim disk space. See <xref " "linkend=\"svn.reposadmin.maint.diskspace\"/> for more information." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:5900 msgid "svnadmin list-unused-dblogs" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5901 msgid "" "Ask Berkeley DB which logfiles can be safely deleted (applies only to " "repositories using the <literal>bdb</literal> backend)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5907 #, no-wrap msgid "svnadmin list-unused-dblogs REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5925 msgid "Remove all unused logfiles from the repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5927 #, no-wrap msgid "" "\n" "$ svnadmin list-unused-dblogs /var/svn/repos\n" "/var/svn/repos/log.0000000031\n" "/var/svn/repos/log.0000000032\n" "/var/svn/repos/log.0000000033\n" "\n" "$ svnadmin list-unused-dblogs /var/svn/repos | xargs rm\n" "## disk space reclaimed!\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5949 #, fuzzy #| msgid "svnadmin" msgid "svnadmin load" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5949 msgid "Read a repository dump stream from <filename>stdin</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5955 #, no-wrap msgid "svnadmin load REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5960 msgid "" "Read a repository dump stream from <filename>stdin</filename>, committing " "new revisions into the repository's filesystem. Send progress feedback to " "<filename>stdout</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5968 #, no-wrap msgid "" "\n" "--force-uuid\n" "--ignore-uuid\n" "--parent-dir\n" "--quiet (-q)\n" "--use-post-commit-hook\n" "--use-pre-commit-hook\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5981 msgid "" "This shows the beginning of loading a repository from a backup file (made, " "of course, with <command>svnadmin dump</command>):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5985 #, no-wrap msgid "" "\n" "$ svnadmin load /var/svn/restored < repos-backup\n" "<<< Started new txn, based on original revision 1\n" " * adding path : test ... done.\n" " * adding path : test/a ... done.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5993 msgid "Or if you want to load into a subdirectory:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5995 #, no-wrap msgid "" "\n" "$ svnadmin load --parent-dir new/subdir/for/project \\\n" " /var/svn/restored < repos-backup\n" "<<< Started new txn, based on original revision 1\n" " * adding path : test ... done.\n" " * adding path : test/a ... done.\n" "…\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6016 #, fuzzy #| msgid "svnadmin" msgid "svnadmin lslocks" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6017 msgid "Print descriptions of all locks." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6021 #, no-wrap msgid "svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6026 msgid "" "Print descriptions of all locks in repository <replaceable>REPOS_PATH</" "replaceable> underneath the path <replaceable>PATH-IN-REPOS</replaceable>. " "If <replaceable>PATH-IN-REPOS</replaceable> is not provided, it defaults to " "the root directory of the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6045 msgid "" "This lists the one locked file in the repository at <filename>/var/svn/" "repos</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6048 #, no-wrap msgid "" "\n" "$ svnadmin lslocks /var/svn/repos\n" "Path: /tree.jpg\n" "UUID Token: opaquelocktoken:ab00ddf0-6afb-0310-9cd0-dda813329753\n" "Owner: harry\n" "Created: 2005-07-08 17:27:36 -0500 (Fri, 08 Jul 2005)\n" "Expires: \n" "Comment (1 line):\n" "Rework the uppermost branches on the bald cypress in the foreground.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6070 #, fuzzy #| msgid "svnadmin" msgid "svnadmin lstxns" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6071 msgid "Print the names of all uncommitted transactions." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6075 #, no-wrap msgid "svnadmin lstxns REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6080 msgid "" "Print the names of all uncommitted transactions. See <xref linkend=\"svn." "reposadmin.maint.diskspace.deadtxns\" /> for information on how uncommitted " "transactions are created and what you should do with them." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6089 msgid "List all outstanding transactions in a repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6092 #, no-wrap msgid "" "\n" "$ svnadmin lstxns /var/svn/repos/ \n" "1w\n" "1x\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6110 #, fuzzy #| msgid "svnadmin" msgid "svnadmin recover" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6112 msgid "" "Bring a repository database back into a consistent state (applies only to " "repositories using the <literal>bdb</literal> backend). In addition, if " "<filename>repos/conf/passwd</filename> does not exist, it will create a " "default passwordfile ." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6121 #, no-wrap msgid "svnadmin recover REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6126 msgid "" "Run this command if you get an error indicating that your repository needs " "to be recovered." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6131 #, no-wrap msgid "" "\n" "--wait\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6138 msgid "Recover a hung repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6140 #, no-wrap msgid "" "\n" "$ svnadmin recover /var/svn/repos/ \n" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" "\n" "Recovery completed.\n" "The latest repos revision is 34.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6149 msgid "" "Recovering the database requires an exclusive lock on the repository. (This " "is a <quote>database lock</quote>; see the sidebar <xref linkend=\"svn." "advanced.locking.meanings\"/>.) If another process is accessing the " "repository, then <command>svnadmin recover</command> will error:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6154 #, no-wrap msgid "" "\n" "$ svnadmin recover /var/svn/repos\n" "svn: Failed to get exclusive repository access; perhaps another process\n" "such as httpd, svnserve or svn has it open?\n" "\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6162 msgid "" "The <option>--wait</option> option, however, will cause <command>svnadmin " "recover</command> to wait indefinitely for other processes to disconnect:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6166 #, no-wrap msgid "" "\n" "$ svnadmin recover /var/svn/repos --wait\n" "Waiting on repository lock; perhaps another process has it open?\n" "\n" "### time goes by…\n" "\n" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" "\n" "Recovery completed.\n" "The latest repos revision is 34.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6192 #, fuzzy #| msgid "svnadmin" msgid "svnadmin rmlocks" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6193 msgid "Unconditionally remove one or more locks from a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6198 #, no-wrap msgid "svnadmin rmlocks REPOS_PATH LOCKED_PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6203 msgid "" "Remove one or more locks from each <replaceable>LOCKED_PATH</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:6215 #, fuzzy #| msgid "" #| "The previous example copied the contents of directory <filename>mytree</" #| "filename> under the directory <filename>some/project</filename> in the " #| "repository:" msgid "" "This deletes the locks on <filename>tree.jpg</filename> and <filename>house." "jpg</filename> in the repository at <filename>/var/svn/repos</filename>:" msgstr "" "Im vorstehenden Beispiel wurde der Inhalt des Verzeichnisses " "<filename>mytree</filename> unter dem Verzeichnis <filename>some/project</" "filename> im Repository abgelegt:" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6220 #, no-wrap msgid "" "\n" "$ svnadmin rmlocks /var/svn/repos tree.jpg house.jpg\n" "Removed lock on '/tree.jpg.\n" "Removed lock on '/house.jpg.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6238 #, fuzzy #| msgid "svnadmin" msgid "svnadmin rmtxns" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6239 msgid "Delete transactions from a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6243 #, no-wrap msgid "svnadmin rmtxns REPOS_PATH TXN_NAME..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6248 msgid "" "Delete outstanding transactions from a repository. This is covered in " "detail in <xref linkend=\"svn.reposadmin.maint.diskspace.deadtxns\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6256 #, no-wrap msgid "" "\n" "--quiet (-q)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6264 msgid "Remove named transactions:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6266 #, no-wrap msgid "" "\n" "$ svnadmin rmtxns /var/svn/repos/ 1w 1x\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6270 msgid "" "Fortunately, the output of <command>lstxns</command> works great as the " "input for <command>rmtxns</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6273 #, no-wrap msgid "" "\n" "$ svnadmin rmtxns /var/svn/repos/ `svnadmin lstxns /var/svn/repos/`\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6277 msgid "This removes all uncommitted transactions from your repository." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6293 #, fuzzy #| msgid "svnadmin" msgid "svnadmin setlog" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6294 msgid "Set the log message on a revision." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6298 #, no-wrap msgid "svnadmin setlog REPOS_PATH -r REVISION FILE" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6303 msgid "" "Set the log message on revision <replaceable>REVISION</replaceable> to the " "contents of <replaceable>FILE</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6307 msgid "" "This is similar to using <command>svn propset</command> with the <option>--" "revprop</option> option to set the <literal>svn:log</literal> property on a " "revision, except that you can also use the option <option>--bypass-hooks</" "option> to avoid running any pre- or post-commit hooks, which is useful if " "the modification of revision properties has not been enabled in the " "<literal>pre-revprop-change</literal> hook." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:6316 msgid "" "Revision properties are not under version control, so this command will " "permanently overwrite the previous log message." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6326 #, no-wrap msgid "" "\n" "--bypass-hooks\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6335 msgid "" "Set the log message for revision 19 to the contents of the file " "<filename>msg</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6338 #, no-wrap msgid "" "\n" "$ svnadmin setlog /var/svn/repos/ -r 19 msg\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:6354 msgid "svnadmin setrevprop" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6355 msgid "Set a property on a revision." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6359 #, no-wrap msgid "svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6364 msgid "" "Set the property <replaceable>NAME</replaceable> on revision " "<replaceable>REVISION</replaceable> to the contents of <replaceable>FILE</" "replaceable>. Use <option>--use-pre-revprop-change-hook</option> or " "<option>--use-post-revprop-change-hook</option> to trigger the revision " "property-related hooks (e.g., if you want an email notification sent from " "your <literal>post-revprop-change-hook</literal>)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6377 #, no-wrap msgid "" "\n" "--revision (-r) ARG\n" "--use-post-revprop-change-hook\n" "--use-pre-revprop-change-hook\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6387 msgid "" "The following sets the revision property <literal>repository-photo</literal> " "to the contents of the file <filename>sandwich.png</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6391 #, no-wrap msgid "" "\n" "$svnadmin setrevprop /var/svn/repos -r 0 repository-photo sandwich.png\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6395 msgid "" "As you can see, <command>svnadmin setrevprop</command> has no output upon " "success." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6410 #, fuzzy #| msgid "svnadmin" msgid "svnadmin setuuid" msgstr "svnadmin" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:6411 #, fuzzy #| msgid "The Repository" msgid "Reset the repository UUID." msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6415 #, no-wrap msgid "svnadmin setuuid REPOS_PATH [NEW_UUID]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6420 msgid "" "Reset the repository UUID for the repository located at " "<replaceable>REPOS_PATH</replaceable>. If <replaceable>NEW_UUID</" "replaceable> is provided, use that as the new repository UUID; otherwise, " "generate a brand-new UUID for the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6438 msgid "" "If you've <command>svnsync</command>ed <filename>/var/svn/repos</filename> " "to <filename>/var/svn/repos-new</filename> and intend to use <filename>repos-" "new</filename> as your canonical repository, you may want to change the UUID " "for <filename>repos-new</filename> to the UUID of <filename>repos</filename> " "so that your users don't have to check out a new working copy to accommodate " "the change:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6445 #, no-wrap msgid "" "\n" "$ svnadmin setuuid /var/svn/repos-new 2109a8dd-854f-0410-ad31-d604008985ab\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6449 msgid "" "As you can see, <command>svnadmin setuuid</command> has no output upon " "success." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6464 #, fuzzy #| msgid "svnadmin" msgid "svnadmin upgrade" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6465 msgid "Upgrade a repository to the latest supported schema version." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6470 #, no-wrap msgid "svnadmin upgrade REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6475 msgid "" "Upgrade the repository located at <replaceable>REPOS_PATH</replaceable> to " "the latest supported schema version." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6479 msgid "" "This functionality is provided as a convenience for repository " "administrators who wish to make use of new Subversion functionality without " "having to undertake a potentially costly full repository dump and load " "operation. As such, the upgrade performs only the minimum amount of work " "needed to accomplish this while still maintaining the integrity of the " "repository. While a dump and subsequent load guarantee the most optimized " "repository state, <command>svnadmin upgrade</command> does not." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:6491 msgid "" "You should <emphasis>always</emphasis> back up your repository before " "upgrading." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6507 msgid "Upgrade the repository at path <filename>/var/repos/svn</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6510 #, no-wrap msgid "" "\n" "$ svnadmin upgrade /var/repos/svn\n" "Repository lock acquired.\n" "Please wait; upgrading the repository may take some time...\n" "\n" "Upgrade completed.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6532 #, fuzzy #| msgid "svnadmin" msgid "svnadmin verify" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6533 msgid "Verify the data stored in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6537 #, no-wrap msgid "svnadmin verify REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6542 msgid "" "Run this command if you wish to verify the integrity of your repository. " "This basically iterates through all revisions in the repository by " "internally dumping all revisions and discarding the output—it's a good " "idea to run this on a regular basis to guard against latent hard disk " "failures and <quote>bitrot.</quote> If this command fails—which it " "will do at the first sign of a problem—that means your repository has " "at least one corrupted revision, and you should restore the corrupted " "revision from a backup (you did make a backup, didn't you?)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6559 #, no-wrap msgid "" "\n" "--quiet (-q)\n" "--revision (-r) ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6568 msgid "Verify a hung repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6570 #, no-wrap msgid "" "\n" "$ svnadmin verify /var/svn/repos/ \n" "* Verified revision 1729.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:6588 msgid "" "<command>svnlook</command> is a command-line utility for examining different " "aspects of a Subversion repository. It does not make any changes to the " "repository—it's just used for <quote>peeking.</quote> " "<command>svnlook</command> is typically used by the repository hooks, but a " "repository administrator might find it useful for diagnostic purposes." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:6596 msgid "" "Since <command>svnlook</command> works via direct repository access (and " "thus can be used only on the machine that holds the repository), it refers " "to the repository with a path, not a URL." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:6600 msgid "" "If no revision or transaction is specified, <command>svnlook</command> " "defaults to the youngest (most recent) revision of the repository." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6606 #, fuzzy #| msgid "svnlook" msgid "svnlook Options" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:6608 msgid "" "Options in <command>svnlook</command> are global, just as they are in " "<command>svn</command> and <command>svnadmin</command>; however, most " "options apply to only one subcommand since the functionality of " "<command>svnlook</command> is (intentionally) limited in scope:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6618 msgid "<option>--copy-info</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6620 msgid "" "Causes <command>svnlook changed</command> to show detailed copy source " "information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6628 msgid "" "Prevents <command>svnlook diff</command> from printing differences for " "deleted files. The default behavior when a file is deleted in a transaction/" "revision is to print the same differences that you would see if you had left " "the file but removed all the content." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6637 msgid "<option>--no-diff-added</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6639 msgid "" "Prevents <command>svnlook diff</command> from printing differences for added " "files. The default behavior when you add a file is to print the same " "differences that you would see if you had added the entire contents of an " "existing (empty) file." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6648 msgid "<option>--revision</option> (<option>-r</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6651 msgid "Specifies a particular revision number that you wish to examine." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6668 msgid "<option>--transaction</option> (<option>-t</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6671 msgid "Specifies a particular transaction ID that you wish to examine." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6677 msgid "<option>--show-ids</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6679 msgid "" "Shows the filesystem node revision IDs for each path in the filesystem tree." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:6690 msgid "svnlook Subcommands" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:6692 msgid "" "Here are the various subcommands for the <command>svnlook</command> program." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6704 #, fuzzy #| msgid "svnlook" msgid "svnlook author" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6705 msgid "Print the author." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6709 #, no-wrap msgid "svnlook author REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6714 msgid "Print the author of a revision or transaction in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6721 ../en/book/ch09-reference.xml:6767 #: ../en/book/ch09-reference.xml:6949 ../en/book/ch09-reference.xml:7068 #: ../en/book/ch09-reference.xml:7216 ../en/book/ch09-reference.xml:7318 #, no-wrap msgid "" "\n" "--revision (-r) REV\n" "--transaction (-t) TXN\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6730 msgid "<command>svnlook author</command> is handy, but not very exciting:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6733 #, no-wrap msgid "" "\n" "$ svnlook author -r 40 /var/svn/repos \n" "sally\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6750 #, fuzzy #| msgid "svnlook" msgid "svnlook cat" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6751 ../en/book/ch09-reference.xml:6760 msgid "Print the contents of a file." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6755 #, no-wrap msgid "svnlook cat REPOS_PATH PATH_IN_REPOS" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6776 msgid "" "This shows the contents of a file in transaction <literal>ax8</literal>, " "located at <filename>/trunk/README</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6780 #, no-wrap msgid "" "\n" "$ svnlook cat -t ax8 /var/svn/repos /trunk/README\n" "\n" " Subversion, a version control system.\n" " =====================================\n" "\n" "$LastChangedDate: 2003-07-17 10:45:25 -0500 (Thu, 17 Jul 2003) $\n" "\n" "Contents:\n" "\n" " I. A FEW POINTERS\n" " II. DOCUMENTATION\n" " III. PARTICIPATING IN THE SUBVERSION COMMUNITY\n" "…\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6808 #, fuzzy #| msgid "svnlook" msgid "svnlook changed" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6809 msgid "Print the paths that were changed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6813 #, no-wrap msgid "svnlook changed REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6818 msgid "" "Print the paths that were changed in a particular revision or transaction, " "as well as <quote>svn update-style</quote> status letters in the first two " "columns:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:6826 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'A '</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6828 msgid "Item added to repository" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:6833 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'D '</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6835 msgid "Item deleted from repository" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:6840 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'U '</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6842 msgid "File contents changed" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:6847 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'_U'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6849 msgid "Properties of item changed; note the leading underscore" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:6854 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'UU'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6856 msgid "File contents and properties changed" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6862 msgid "" "Files and directories can be distinguished, as directory paths are displayed " "with a trailing <quote><literal>/</literal></quote> character." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6872 #, no-wrap msgid "" "\n" "--copy-info\n" "--revision (-r) REV\n" "--transaction (-t) TXN\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6882 msgid "" "This shows a list of all the changed files and directories in revision 39 of " "a test repository. Note that the first changed item is a directory, as " "evidenced by the trailing <literal>/</literal>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6887 #, no-wrap msgid "" "\n" "$ svnlook changed -r 39 /var/svn/repos\n" "A trunk/vendors/deli/\n" "A trunk/vendors/deli/chips.txt\n" "A trunk/vendors/deli/sandwich.txt\n" "A trunk/vendors/deli/pickle.txt\n" "U trunk/vendors/baker/bagel.txt\n" "_U trunk/vendors/baker/croissant.txt\n" "UU trunk/vendors/baker/pretzel.txt\n" "D trunk/vendors/baker/baguette.txt\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6899 msgid "Here's an example that shows a revision in which a file was renamed:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6902 #, no-wrap msgid "" "\n" "$ svnlook changed -r 64 /var/svn/repos\n" "A trunk/vendors/baker/toast.txt\n" "D trunk/vendors/baker/bread.txt\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6908 msgid "" "Unfortunately, nothing in the preceding output reveals the connection " "between the deleted and added files. Use the <option>--copy-info</option> " "option to make this relationship more apparent:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6913 #, no-wrap msgid "" "\n" "$ svnlook changed -r 64 --copy-info /var/svn/repos\n" "A + trunk/vendors/baker/toast.txt\n" " (from trunk/vendors/baker/bread.txt:r63)\n" "D trunk/vendors/baker/bread.txt\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6932 #, fuzzy #| msgid "svnlook" msgid "svnlook date" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6933 msgid "Print the datestamp." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6937 #, no-wrap msgid "svnlook date REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6942 msgid "Print the datestamp of a revision or transaction in a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6958 msgid "This shows the date of revision 40 of a test repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6961 #, no-wrap msgid "" "\n" "$ svnlook date -r 40 /var/svn/repos/\n" "2003-02-22 17:44:49 -0600 (Sat, 22 Feb 2003)\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6978 #, fuzzy #| msgid "svnlook" msgid "svnlook diff" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6979 msgid "Print differences of changed files and properties." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6983 #, no-wrap msgid "svnlook diff REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6988 msgid "" "Print GNU-style differences of changed files and properties in a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6995 #, no-wrap msgid "" "\n" "--diff-copy-from\n" "--no-diff-added\n" "--no-diff-deleted\n" "--revision (-r) REV\n" "--transaction (-t) TXN\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7007 msgid "" "This shows a newly added (empty) file, a deleted file, and a copied file:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7010 #, no-wrap msgid "" "\n" "$ svnlook diff -r 40 /var/svn/repos/\n" "Copied: egg.txt (from rev 39, trunk/vendors/deli/pickle.txt)\n" "\n" "Added: trunk/vendors/deli/soda.txt\n" "==============================================================================\n" "\n" "Modified: trunk/vendors/deli/sandwich.txt\n" "==============================================================================\n" "--- trunk/vendors/deli/sandwich.txt\t(original)\n" "+++ trunk/vendors/deli/sandwich.txt\t2003-02-22 17:45:04.000000000 -0600\n" "@@ -0,0 +1 @@\n" "+Don't forget the mayo!\n" "\n" "Modified: trunk/vendors/deli/logo.jpg\n" "==============================================================================\n" "(Binary files differ)\n" "\n" "Deleted: trunk/vendors/deli/chips.txt\n" "==============================================================================\n" "\n" "Deleted: trunk/vendors/deli/pickle.txt\n" "==============================================================================\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7035 msgid "" "If a file has a nontextual <literal>svn:mime-type</literal> property, the " "differences are not explicitly shown." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:7050 msgid "svnlook dirs-changed" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7051 msgid "Print the directories that were themselves changed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7055 #, no-wrap msgid "svnlook dirs-changed REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7060 msgid "" "Print the directories that were themselves changed (property edits) or whose " "file children were changed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7077 msgid "" "This shows the directories that changed in revision 40 in our sample " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7080 #, no-wrap msgid "" "\n" "$ svnlook dirs-changed -r 40 /var/svn/repos\n" "trunk/vendors/deli/\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7097 #, fuzzy #| msgid "svnlook" msgid "svnlook help" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7101 #, no-wrap msgid "Also svnlook -h and svnlook -?." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7106 msgid "" "Displays the help message for <command>svnlook</command>. This command, " "like its brother, <command>svn help</command>, is also your friend, even " "though you never call it anymore and forgot to invite it to your last party." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7134 #, fuzzy #| msgid "svnlook" msgid "svnlook history" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7135 ../en/book/ch09-reference.xml:7146 msgid "" "Print information about the history of a path in the repository (or the root " "directory if no path is supplied)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7141 #, no-wrap msgid "svnlook history REPOS_PATH [PATH_IN_REPOS]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7154 #, no-wrap msgid "" "\n" "--limit (-l) ARG\n" "--revision (-r) REV\n" "--show-ids\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7164 msgid "" "This shows the history output for the path <filename>/branches/bookstore</" "filename> as of revision 13 in our sample repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7168 #, no-wrap msgid "" "\n" "$ svnlook history -r 13 /var/svn/repos /branches/bookstore --show-ids\n" "REVISION PATH <ID>\n" "-------- ---------\n" " 13 /branches/bookstore <1.1.r13/390>\n" " 12 /branches/bookstore <1.1.r12/413>\n" " 11 /branches/bookstore <1.1.r11/0>\n" " 9 /trunk <1.0.r9/551>\n" " 8 /trunk <1.0.r8/131357096>\n" " 7 /trunk <1.0.r7/294>\n" " 6 /trunk <1.0.r6/353>\n" " 5 /trunk <1.0.r5/349>\n" " 4 /trunk <1.0.r4/332>\n" " 3 /trunk <1.0.r3/335>\n" " 2 /trunk <1.0.r2/295>\n" " 1 /trunk <1.0.r1/532>\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7198 #, fuzzy #| msgid "svnlook" msgid "svnlook info" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7199 msgid "Print the author, datestamp, log message size, and log message." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7204 #, no-wrap msgid "svnlook info REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7209 msgid "" "Print the author, datestamp, log message size (in bytes), and log message, " "followed by a newline character." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7225 msgid "This shows the info output for revision 40 in our sample repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7228 #, no-wrap msgid "" "\n" "$ svnlook info -r 40 /var/svn/repos\n" "sally\n" "2003-02-22 17:44:49 -0600 (Sat, 22 Feb 2003)\n" "16\n" "Rearrange lunch.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7249 #, fuzzy #| msgid "svnlook" msgid "svnlook lock" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7250 msgid "If a lock exists on a path in the repository, describe it." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7255 #, no-wrap msgid "svnlook lock REPOS_PATH PATH_IN_REPOS" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7260 msgid "" "Print all information available for the lock at <replaceable>PATH_IN_REPOS</" "replaceable>. If <replaceable>PATH_IN_REPOS</replaceable> is not locked, " "print nothing." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7275 #, fuzzy #| msgid "" #| "The contents of the file <filename>item</filename> have been modified." msgid "This describes the lock on the file <filename>tree.jpg</filename>:" msgstr "Der Inhalt der Datei <filename>item</filename> ist geändert worden." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7278 #, no-wrap msgid "" "\n" "$ svnlook lock /var/svn/repos tree.jpg\n" "UUID Token: opaquelocktoken:ab00ddf0-6afb-0310-9cd0-dda813329753\n" "Owner: harry\n" "Created: 2005-07-08 17:27:36 -0500 (Fri, 08 Jul 2005)\n" "Expires: \n" "Comment (1 line):\n" "Rework the uppermost branches on the bald cypress in the foreground.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7301 #, fuzzy #| msgid "svnlook" msgid "svnlook log" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7302 msgid "Print the log message, followed by a newline character." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7307 #, no-wrap msgid "svnlook log REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7312 msgid "Print the log message." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7327 msgid "This shows the log output for revision 40 in our sample repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7330 #, no-wrap msgid "" "\n" "$ svnlook log /var/svn/repos/\n" "Rearrange lunch.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7347 #, fuzzy #| msgid "svnlook" msgid "svnlook propget" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7348 msgid "Print the raw value of a property on a path in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7353 #, no-wrap msgid "svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7358 msgid "List the value of a property on a path in the repository." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:7365 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>pg</command>, <command>pget</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7371 #, no-wrap msgid "" "\n" "--revision (-r) REV\n" "--revprop\n" "--transaction (-t) TXN\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7381 msgid "" "This shows the value of the <quote>seasonings</quote> property on the file " "<filename>/trunk/sandwich</filename> in the <literal>HEAD</literal> revision:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:7385 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn list file:///var/svn/repos\n" #| "/trunk\n" #| "/branches\n" #| "/tags\n" msgid "" "\n" "$ svnlook pg /var/svn/repos seasonings /trunk/sandwich\n" "mustard\n" msgstr "" "\n" "$ svn list file:///var/svn/repos\n" "/trunk\n" "/branches\n" "/tags\n" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7402 #, fuzzy #| msgid "svnlook" msgid "svnlook proplist" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7403 msgid "Print the names and values of versioned file and directory properties." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7408 #, no-wrap msgid "svnlook proplist REPOS_PATH [PATH_IN_REPOS]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7413 msgid "" "List the properties of a path in the repository. With <option>--verbose</" "option>, show the property values too." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:7420 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>pl</command>, <command>plist</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7426 #, no-wrap msgid "" "\n" "--revision (-r) REV\n" "--revprop\n" "--transaction (-t) TXN\n" "--verbose (-v)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7437 msgid "" "This shows the names of properties set on the file <filename>/trunk/README</" "filename> in the <literal>HEAD</literal> revision:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7441 #, no-wrap msgid "" "\n" "$ svnlook proplist /var/svn/repos /trunk/README\n" " original-author\n" " svn:mime-type\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7447 msgid "" "This is the same command as in the preceding example, but this time showing " "the property values as well:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7450 #, no-wrap msgid "" "\n" "$ svnlook --verbose proplist /var/svn/repos /trunk/README\n" " original-author : harry\n" " svn:mime-type : text/plain\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7467 #, fuzzy #| msgid "svnlook" msgid "svnlook tree" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7468 msgid "Print the tree." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7472 #, no-wrap msgid "svnlook tree REPOS_PATH [PATH_IN_REPOS]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7476 msgid "" "Print the tree, starting at <replaceable>PATH_IN_REPOS</replaceable> (if " "supplied; at the root of the tree otherwise), optionally showing node " "revision IDs." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7485 #, no-wrap msgid "" "\n" "--full-paths\n" "--non-recursive (-N)\n" "--revision (-r) REV\n" "--show-ids\n" "--transaction (-t) TXN\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7497 msgid "" "This shows the tree output (with nodeIDs) for revision 13 in our sample " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7500 #, no-wrap msgid "" "\n" "$ svnlook tree -r 13 /var/svn/repos --show-ids\n" "/ <0.0.r13/811>\n" " trunk/ <1.0.r9/551>\n" " button.c <2.0.r9/238>\n" " Makefile <3.0.r7/41>\n" " integer.c <4.0.r6/98>\n" " branches/ <5.0.r13/593>\n" " bookstore/ <1.1.r13/390>\n" " button.c <2.1.r12/85>\n" " Makefile <3.0.r7/41>\n" " integer.c <4.1.r13/109>\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7526 #, fuzzy #| msgid "svnlook" msgid "svnlook uuid" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7527 msgid "Print the repository's <literal>UUID</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7532 #, no-wrap msgid "svnlook uuid REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7537 msgid "" "Print the <literal>UUID</literal> for the repository. The <literal>UUID</" "literal> is the repository's <emphasis>u</emphasis>niversal <emphasis>u</" "emphasis>nique <emphasis>id</emphasis>entifier. The Subversion client uses " "this identifier to differentiate between one repository and another." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7553 #, no-wrap msgid "" "\n" "$ svnlook uuid /var/svn/repos\n" "e7fe1b91-8cd5-0310-98dd-2f12e793c5e8\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7570 #, fuzzy #| msgid "svnlook" msgid "svnlook youngest" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7571 msgid "Print the youngest revision number." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7575 #, no-wrap msgid "svnlook youngest REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7580 msgid "Print the youngest revision number of a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7591 msgid "This shows the youngest revision of our sample repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7594 #, no-wrap msgid "" "\n" "$ svnlook youngest /var/svn/repos/ \n" "42\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:7612 msgid "" "<command>svnsync</command> is the Subversion remote repository mirroring " "tool. Put simply, it allows you to replay the revisions of one repository " "into another one." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:7616 msgid "" "In any mirroring scenario, there are two repositories: the source " "repository, and the mirror (or <quote>sink</quote>) repository. The source " "repository is the repository from which <command>svnsync</command> pulls " "revisions. The mirror repository is the destination for the revisions " "pulled from the source repository. Each of the repositories may be local or " "remote—they are only ever addressed by their URLs." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:7624 msgid "" "The <command>svnsync</command> process requires only read access to the " "source repository; it never attempts to modify it. But obviously, " "<command>svnsync</command> requires both read and write access to the mirror " "repository." msgstr "" # type: Content of: <chapter><sect1><warning><para> #: ../en/book/ch09-reference.xml:7630 msgid "" "<command>svnsync</command> is very sensitive to changes made in the mirror " "repository that weren't made as part of a mirroring operation. To prevent " "this from happening, it's best if the <command>svnsync</command> process is " "the only process permitted to modify the mirror repository." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7639 #, fuzzy #| msgid "svnsync" msgid "svnsync Options" msgstr "svnsync" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:7641 msgid "" "Options in <command>svnsync</command> are global, just as they are in " "<command>svn</command> and <command>svnadmin</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7670 msgid "" "In the case of an authentication failure or insufficient credentials, " "prevents prompting for credentials (e.g., username or password). This is " "useful if you're running Subversion inside an automated script and it's more " "appropriate to have Subversion fail than to prompt for more information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7688 msgid "<option>--source-password</option> <replaceable>PASSWD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7691 msgid "" "Specifies the password for the Subversion server from which you are " "syncing. If not provided, or if incorrect, Subversion will prompt you for " "this information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7699 msgid "<option>--source-username</option> <replaceable>NAME</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7702 msgid "" "Specifies the username for the Subversion server from which you are " "syncing. If not provided, or if incorrect, Subversion will prompt you for " "this information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7710 msgid "<option>--sync-password</option> <replaceable>PASSWD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7713 msgid "" "Specifies the password for the Subversion server to which you are syncing. " "If not provided, or if incorrect, Subversion will prompt you for this " "information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7721 msgid "<option>--sync-username</option> <replaceable>NAME</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7724 msgid "" "Specifies the username for the Subversion server to which you are syncing. " "If not provided, or if incorrect, Subversion will prompt you for this " "information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:7737 msgid "svnsync Subcommands" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:7739 msgid "" "Here are the various subcommands for the <command>svnsync</command> program." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:7751 msgid "svnsync copy-revprops" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7752 msgid "" "Copy all revision properties for a particular revision (or range of " "revisions) from the source repository to the mirror repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7758 #, no-wrap msgid "svnsync copy-revprops DEST_URL [REV[:REV2]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7763 msgid "" "Because Subversion revision properties can be changed at any time, it's " "possible that the properties for some revision might be changed after that " "revision has already been synchronized to another repository. Because the " "<command>svnsync synchronize</command> command operates only on the range of " "revisions that have not yet been synchronized, it won't notice a revision " "property change outside that range. Left as is, this causes a deviation in " "the values of that revision's properties between the source and mirror " "repositories. <command>svnsync copy-revprops</command> is the answer to " "this problem. Use it to resynchronize the revision properties for a " "particular revision or range of revisions." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:7779 ../en/book/ch09-reference.xml:7841 #: ../en/book/ch09-reference.xml:7884 ../en/book/ch09-reference.xml:7967 msgid "Alternate name" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7786 ../en/book/ch09-reference.xml:7891 #: ../en/book/ch09-reference.xml:7974 #, no-wrap msgid "" "\n" "--config-dir DIR\n" "--no-auth-cache\n" "--non-interactive\n" "--quiet (-q)\n" "--source-password ARG\n" "--source-username ARG\n" "--sync-password ARG\n" "--sync-username ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7801 msgid "Resynchronize revision properties for a single revision:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7803 #, no-wrap msgid "" "\n" "$ svnsync copy-revprops file:///var/svn/repos-mirror 6\n" "Copied properties for revision 6.\n" "$\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7821 ../en/book/ch09-reference.xml:7826 #, fuzzy, no-wrap #| msgid "svnsync" msgid "svnsync help" msgstr "svnsync" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7831 msgid "" "This subcommand is useful when you're trapped in a foreign prison with " "neither a Net connection nor a copy of this book, but you do have a local Wi-" "Fi network running and you'd like to sync a copy of your repository over to " "the backup server that Ira The Knife is running over in cell block D." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:7861 msgid "svnsync initialize" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7862 msgid "" "Initialize a mirror repository for synchronization from the source " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7867 #, no-wrap msgid "svnsync initialize MIRROR_URL SOURCE_URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7872 msgid "" "<command>svnsync initialize</command> verifies that a repository meets the " "requirements of a new mirror repository—that it has no previous " "existing version history and that it allows revision property " "modifications—and records the initial administrative information that " "associates the mirror repository with the source repository. This is the " "first <command>svnsync</command> operation you run on a would-be mirror " "repository." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:7885 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>init</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7906 msgid "" "Fail to initialize a mirror repository due to inability to modify revision " "properties:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7909 #, no-wrap msgid "" "\n" "$ svnsync initialize file:///var/svn/repos-mirror http://svn.example.com/repos\n" "svnsync: Repository has not been enabled to accept revision propchanges;\n" "ask the administrator to create a pre-revprop-change hook\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7916 msgid "" "Initialize a repository as a mirror, having already created a <literal>pre-" "revprop-change</literal> hook that permits all revision property changes:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7920 #, no-wrap msgid "" "\n" "$ svnsync initialize file:///var/svn/repos-mirror http://svn.example.com/repos\n" "Copied properties for revision 0.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:7938 msgid "svnsync synchronize" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7939 msgid "" "Transfer all pending revisions from the source repository to the mirror " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7944 #, no-wrap msgid "svnsync synchronize DEST_URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7949 msgid "" "The <command>svnsync synchronize</command> command does all the heavy " "lifting of a repository mirroring operation. After consulting with the " "mirror repository to see which revisions have already been copied into it, " "it then begins to copy any not-yet-mirrored revisions from the source " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7956 msgid "" "<command>svnsync synchronize</command> can be gracefully canceled and " "restarted." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7959 msgid "" "As of Subversion 1.5, you can limit <command>svnsync</command> to a " "subdirectory of the source repository by specifying the subdirectory as part " "of the <replaceable>SOURCE_URL</replaceable>." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:7968 #, fuzzy #| msgid "<command>svn copy</command>" msgid "<command>sync</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7989 msgid "" "Copy unsynchronized revisions from the source repository to the mirror " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7992 #, no-wrap msgid "" "\n" "$ svnsync synchronize file:///var/svn/repos-mirror\n" "Committed revision 1.\n" "Copied properties for revision 1.\n" "Committed revision 2.\n" "Copied properties for revision 2.\n" "Committed revision 3.\n" "Copied properties for revision 3.\n" "…\n" "Committed revision 45.\n" "Copied properties for revision 45.\n" "Committed revision 46.\n" "Copied properties for revision 46.\n" "Committed revision 47.\n" "Copied properties for revision 47.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:8024 msgid "" "<command>svnserve</command> allows access to Subversion repositories using " "Subversion's custom network protocol." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:8027 msgid "" "You can run <command>svnserve</command> as a standalone server process (for " "clients that are using the <literal>svn://</literal> access method); you can " "have a daemon such as <command>inetd</command> or <command>xinetd</command> " "launch it for you on demand (also for <literal>svn://</literal>), or you can " "have <command>sshd</command> launch it on demand for the <literal>svn+ssh://" "</literal> access method." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:8036 msgid "" "Regardless of the access method, once the client has selected a repository " "by transmitting its URL, <command>svnserve</command> reads a file named " "<filename>conf/svnserve.conf</filename> in the repository directory to " "determine repository-specific settings such as what authentication database " "to use and what authorization policies to apply. See <xref linkend=\"svn." "serverconfig.svnserve\"/> for details of the <filename>svnserve.conf</" "filename> file." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8048 #, fuzzy #| msgid "svnserve" msgid "svnserve Options" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:8050 msgid "" "Unlike the previous commands we've described, <command>svnserve</command> " "has no subcommands—it is controlled exclusively by options." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8058 msgid "<option>--daemon</option> (<option>-d</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8060 msgid "" "Causes <command>svnserve</command> to run in daemon mode. " "<command>svnserve</command> backgrounds itself and accepts and serves TCP/IP " "connections on the <literal>svn</literal> port (3690, by default)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8069 msgid "<option>--foreground</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8071 msgid "" "When used together with <option>-d</option>, causes <command>svnserve</" "command> to stay in the foreground. This is mainly useful for debugging." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8078 msgid "<option>--inetd</option> (<option>-i</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8080 msgid "" "Causes <command>svnserve</command> to use the <filename>stdin</filename> and " "<filename>stdout</filename> file descriptors, as is appropriate for a daemon " "running out of <command>inetd</command>." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8087 ../en/book/ch09-reference.xml:8525 msgid "<option>--help</option> (<option>-h</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8089 msgid "Displays a usage summary and exits." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8094 msgid "<option>--listen-host</option>=<replaceable>HOST</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8096 msgid "" "Causes <command>svnserve</command> to listen on the interface specified by " "<replaceable>HOST</replaceable>, which may be either a hostname or an IP " "address." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8103 msgid "<option>--listen-once</option> (<option>-X</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8105 msgid "" "Causes <command>svnserve</command> to accept one connection on the " "<literal>svn</literal> port, serve it, and exit. This option is mainly " "useful for debugging." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8113 msgid "<option>--listen-port</option>=<replaceable>PORT</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8115 msgid "" "Causes <command>svnserve</command> to listen on <replaceable>PORT</" "replaceable> when run in daemon mode. (FreeBSD daemons listen only on tcp6 " "by default—this option tells them to also listen on tcp4.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8123 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "<option>--pid-file <replaceable>FILENAME</replaceable></option>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8125 msgid "" "Causes <command>svnserve</command> to write its process ID to " "<replaceable>FILENAME</replaceable>, which must be writable by the user " "under which <command>svnserve</command> is running." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8133 msgid "" "<option>--root</option>=<replaceable>ROOT</replaceable> (<option>-r</" "option>=<replaceable>ROOT</replaceable>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8136 msgid "" "Sets the virtual root for repositories served by <command>svnserve</" "command>. The pathname in URLs provided by the client will be interpreted " "relative to this root and will not be allowed to escape this root." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8145 msgid "<option>--threads</option> (<option>-T</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8147 msgid "" "When running in daemon mode, causes <command>svnserve</command> to spawn a " "thread instead of a process for each connection (e.g., for when running on " "Windows). The <command>svnserve</command> process still backgrounds itself " "at startup time." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8156 msgid "<option>--tunnel</option> (<option>-t</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8158 msgid "" "Causes <command>svnserve</command> to run in tunnel mode, which is just like " "the <command>inetd</command> mode of operation (both modes serve one " "connection over <filename>stdin</filename>/<filename>stdout</filename>, and " "then exit), except that the connection is considered to be preauthenticated " "with the username of the current UID. This flag is automatically passed for " "you by the client when running over a tunnel agent such as <command>ssh</" "command>. That means there's rarely any need for <emphasis>you</emphasis> " "to pass this option to <command>svnserve</command>. So, if you find " "yourself typing <literal>svnserve --tunnel</literal> on the command line and " "wondering what to do next, see <xref linkend=\"svn.serverconfig.svnserve." "sshauth\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8177 msgid "<option>--tunnel-user NAME</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8179 msgid "" "Used in conjunction with the <option>--tunnel</option> option, tells " "<command>svnserve</command> to assume that <replaceable>NAME</replaceable> " "is the authenticated user, rather than the UID of the <command>svnserve</" "command> process. This is useful for users wishing to share a single system " "account over SSH, but to maintain separate commit identities." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8192 msgid "" "Displays version information and a list of repository backend modules " "available, and then exits." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:8209 msgid "" "<command>svndumpfilter</command> is a command-line utility for removing " "history from a Subversion dump file by either excluding or including paths " "beginning with one or more named prefixes. For details, see <xref linkend=" "\"svn.reposadmin.maint.tk.svndumpfilter\"/>." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8217 #, fuzzy #| msgid "svndumpfilter" msgid "svndumpfilter Options" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:8219 msgid "" "Options in <command>svndumpfilter</command> are global, just as they are in " "<command>svn</command> and <command>svnadmin</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8228 msgid "" "If filtering causes any revision to be empty (i.e., causes no change to the " "repository), removes these revisions from the final dump file." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8237 msgid "Renumbers revisions that remain after filtering." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8243 msgid "<option>--skip-missing-merge-sources</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8245 msgid "" "Skips merge sources that have been removed as part of the filtering. " "Without this option, <command>svndumpfilter</command> will exit with an " "error if the merge source for a retained path is removed by filtering." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8256 msgid "" "If all nodes in a revision are removed by filtering and <option>--drop-empty-" "revs</option> is not passed, the default behavior of <command>svndumpfilter</" "command> is to remove all revision properties except for the date and the " "log message (which will merely indicate that the revision is empty). " "Passing ths option will preserve existing revision properties (which may or " "may not make sense since the related content is no longer present in the " "dump file)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8271 msgid "Does not display filtering statistics." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8281 #, fuzzy #| msgid "svndumpfilter" msgid "svndumpfilter Subcommands" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:8283 msgid "" "Here are the various subcommands for the <command>svndumpfilter</command> " "program." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8295 #, fuzzy #| msgid "svndumpfilter" msgid "svndumpfilter exclude" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:8296 msgid "Filter out nodes with given prefixes from the dump stream." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:8300 #, no-wrap msgid "svndumpfilter exclude PATH_PREFIX..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8305 msgid "" "This can be used to exclude nodes that begin with one or more " "<replaceable>PATH_PREFIX</replaceable>es from a filtered dump file." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8313 ../en/book/ch09-reference.xml:8377 #, no-wrap msgid "" "\n" "--drop-empty-revs\n" "--preserve-revprops\n" "--quiet\n" "--renumber-revs\n" "--skip-missing-merge-sources\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8325 msgid "" "If we have a dump file from a repository with a number of different picnic-" "related directories in it, but we want to keep everything <emphasis>except</" "emphasis> the <filename>sandwiches</filename> part of the repository, we'll " "exclude only that path:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8331 #, no-wrap msgid "" "\n" "$ svndumpfilter exclude sandwiches < dumpfile > filtered-dumpfile\n" "Excluding prefixes:\n" " '/sandwiches'\n" "\n" "Revision 0 committed as 0.\n" "Revision 1 committed as 1.\n" "Revision 2 committed as 2.\n" "Revision 3 committed as 3.\n" "Revision 4 committed as 4.\n" "\n" "Dropped 1 node(s):\n" " '/sandwiches'\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8358 #, fuzzy #| msgid "svndumpfilter" msgid "svndumpfilter include" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:8359 msgid "Filter out nodes without given prefixes from dump stream." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:8364 #, no-wrap msgid "svndumpfilter include PATH_PREFIX..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8369 msgid "" "Can be used to include nodes that begin with one or more " "<replaceable>PATH_PREFIX</replaceable>es in a filtered dump file (thus " "excluding all other paths)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8389 msgid "" "If we have a dump file from a repository with a number of different picnic-" "related directories in it, but want to keep only the <filename>sandwiches</" "filename> part of the repository, we'll include only that path:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8394 #, no-wrap msgid "" "\n" "$ svndumpfilter include sandwiches < dumpfile > filtered-dumpfile\n" "Including prefixes:\n" " '/sandwiches'\n" "\n" "Revision 0 committed as 0.\n" "Revision 1 committed as 1.\n" "Revision 2 committed as 2.\n" "Revision 3 committed as 3.\n" "Revision 4 committed as 4.\n" "\n" "Dropped 3 node(s):\n" " '/drinks'\n" " '/snacks'\n" " '/supplies'\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8423 #, fuzzy #| msgid "svndumpfilter" msgid "svndumpfilter help" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:8424 #, fuzzy #| msgid "Help!" msgid "Help!." msgstr "Hilfe!" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:8428 #, no-wrap msgid "svndumpfilter help [SUBCOMMAND...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8433 msgid "" "Displays the help message for <command>svndumpfilter</command>. Unlike " "other help commands documented in this chapter, there is no witty commentary " "for this help command. The authors of this book deeply regret the omission." msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:8465 msgid "Summarize the local revision(s) of a working copy." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:8471 #, no-wrap msgid "svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8477 msgid "" "<command>svnversion</command> is a program for summarizing the revision " "mixture of a working copy. The resultant revision number, or revision " "range, is written to standard output." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8482 msgid "" "It's common to use this output in your build process when defining the " "version number of your program." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8485 msgid "" "<replaceable>TRAIL_URL</replaceable>, if present, is the trailing portion of " "the URL used to determine whether <replaceable>WC_PATH</replaceable> itself " "is switched (detection of switches within <replaceable>WC_PATH</replaceable> " "does not rely on <replaceable>TRAIL_URL</replaceable>)." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8492 msgid "" "When <replaceable>WC_PATH</replaceable> is not defined, the current " "directory will be used as the working copy path. <replaceable>TRAIL_URL</" "replaceable> cannot be defined if <replaceable>WC_PATH</replaceable> is not " "explicitly given." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8503 msgid "" "Like <command>svnserve</command>, <command>svnversion</command> has no " "subcommands—only options:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8510 msgid "<option>--no-newline</option> (<option>-n</option>)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8512 msgid "Omits the usual trailing newline from the output." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8517 msgid "<option>--committed</option> (<option>-c</option>)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8519 msgid "" "Uses the last-changed revisions rather than the current (i.e., highest " "locally available) revisions." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8527 msgid "Prints a help summary." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8534 msgid "" "Prints the version of <command>svnversion</command> and exit with no error." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8545 msgid "" "If the working copy is all at the same revision (e.g., immediately after an " "update), then that revision is printed out:" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8549 #, fuzzy, no-wrap #| msgid "svnversion" msgid "" "\n" "$ svnversion\n" "4168\n" msgstr "svnversion" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8554 msgid "" "You can add <replaceable>TRAIL_URL</replaceable> to make sure the working " "copy is not switched from what you expect. Note that the " "<replaceable>WC_PATH</replaceable> is required in this command:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8559 #, no-wrap msgid "" "\n" "$ svnversion . /var/svn/trunk\n" "4168\n" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8564 msgid "" "For a mixed-revision working copy, the range of revisions present is printed:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8567 #, no-wrap msgid "" "\n" "$ svnversion\n" "4123:4168\n" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8572 msgid "If the working copy contains modifications, a trailing \"M\" is added:" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8575 #, fuzzy, no-wrap #| msgid "svnversion" msgid "" "\n" "$ svnversion\n" "4168M\n" msgstr "svnversion" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8580 msgid "If the working copy is switched, a trailing \"S\" is added:" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8583 #, fuzzy, no-wrap #| msgid "svnversion" msgid "" "\n" "$ svnversion\n" "4168S\n" msgstr "svnversion" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8588 msgid "" "Thus, here is a mixed-revision, switched working copy containing some local " "modifications:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8591 #, no-wrap msgid "" "\n" "$ svnversion\n" "4212:4168MS\n" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8596 msgid "" "If invoked on a directory that is not a working copy, <command>svnversion</" "command> assumes it is an exported working copy and prints \"exported\":" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8600 #, fuzzy, no-wrap #| msgid "svnversion" msgid "" "\n" "$ svnversion\n" "exported\n" msgstr "svnversion" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:8620 msgid "mod_dav_svn Configuration Directives" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:8621 msgid "" "Apache configuration directives for serving Subversion repositories through " "the Apache HTTP Server." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8630 msgid "" "This section briefly describes each Subversion Apache configuration " "directive. For an in-depth description of configuring Apache with " "Subversion, see <xref linkend=\"svn.serverconfig.httpd\"/>.)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:8638 ../en/book/ch09-reference.xml:9032 msgid "Directives" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8640 msgid "" "These are the <filename>httpd.conf</filename> directives that apply to " "<command>mod_dav_svn</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8646 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>DAV svn</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8649 msgid "" "Must be included in any <literal>Directory</literal> or <literal>Location</" "literal> block for a Subversion repository. It tells <command>httpd</" "command> to use the Subversion backend for <literal>mod_dav</literal> to " "handle all requests." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8660 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>SVNAllowBulkUpdates On|Off</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8663 msgid "" "Toggles support for all-inclusive responses to update-style <literal>REPORT</" "literal> requests. Subversion clients use <literal>REPORT</literal> " "requests to get information about directory tree checkouts and updates from " "<command>mod_dav_svn</command>. They can ask the server to send that " "information in one of two ways: with the entirety of the tree's information " "in one massive response, or with a <firstterm>skelta</firstterm> (a skeletal " "representation of a tree delta) which contains just enough information for " "the client to know what <emphasis>additional</emphasis> data to request from " "the server. When this directive is included with a value of <literal>Off</" "literal>, <command>mod_dav_svn</command> will only ever respond to these " "<literal>REPORT</literal> requests with skelta responses, regardless of the " "type of responses requested by the client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8683 msgid "" "Most folks won't need to use this directive at all. It primarily exists for " "administrators who wish—for security or auditing reasons—to " "force Subversion clients to fetch individually all the files and directories " "needed for updates and checkouts, thus leaving an audit trail of " "<literal>GET</literal> and <literal>PROPFIND</literal> requests in Apache's " "logs. The default value of this directive is <literal>On</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8696 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>SVNAutoversioning On|Off</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8699 msgid "" "When its value is <literal>On</literal>, allows write requests from WebDAV " "clients to result in automatic commits. A generic log message is auto-" "generated and attached to each revision. If you enable autoversioning, " "you'll likely want to set <literal>ModMimeUsePathInfo On</literal> so that " "<literal>mod_mime</literal> can set <literal>svn:mime-type</literal> to the " "correct MIME type automatically (as best as <literal>mod_mime</literal> is " "able to, of course). For more information, see <xref linkend=\"svn.webdav\"/" ">. The default value of this directive is <literal>Off</literal>." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8717 msgid "<literal>SVNPath <replaceable>directory-path</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8721 msgid "" "Specifies the location in the filesystem for a Subversion repository's " "files. In a configuration block for a Subversion repository, either this " "directive or <literal>SVNParentPath</literal> must be present, but not both." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8732 msgid "<literal>SVNSpecialURI <replaceable>component</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8736 msgid "" "Specifies the URI component (namespace) for special Subversion resources. " "The default is <literal>!svn</literal>, and most administrators will never " "use this directive. Set this only if there is a pressing need to have a " "file named <filename>!svn</filename> in your repository. If you change this " "on a server already in use, it will break all of the outstanding working " "copies, and your users will hunt you down with pitchforks and flaming " "torches." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8751 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "<literal>SVNReposName <replaceable>name</replaceable></literal>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8755 msgid "" "Specifies the name of a Subversion repository for use in <literal>HTTP GET</" "literal> responses. This value will be prepended to the title of all " "directory listings (which are served when you navigate to a Subversion " "repository with a web browser). This directive is optional." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8766 msgid "" "<literal>SVNIndexXSLT <replaceable>directory-path</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8770 msgid "" "Specifies the URI of an XSL transformation for directory indexes. This " "directive is optional." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8777 msgid "" "<literal>SVNParentPath <replaceable>directory-path</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8781 msgid "" "Specifies the location in the filesystem of a parent directory whose child " "directories are Subversion repositories. In a configuration block for a " "Subversion repository, either this directive or <literal>SVNPath</literal> " "must be present, but not both." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8792 msgid "<literal>SVNPathAuthz On|Off|short_circuit</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8795 msgid "" "Controls path-based authorization by enabling subrequests (<literal>On</" "literal>), disabling subrequests (<literal>Off</literal>; see <xref linkend=" "\"svn.serverconfig.httpd.authz.pathauthzoff\"/>), or querying " "<command>mod_authz_svn</command> directly (<literal>short_circuit</" "literal>). The default value of this directive is <literal>On</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8807 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>SVNListParentPath On|Off</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8810 msgid "" "When set to <literal>On</literal>, allows a <literal>GET</literal> of " "<literal>SVNParentPath</literal>, which results in a listing of all " "repositories under that path. The default setting is <literal>Off</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8821 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "<literal>SVNMasterURI <replaceable>url</replaceable></literal>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8825 msgid "" "Specifies a URI to the master Subversion repository (used for a write-" "through proxy)." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8832 msgid "" "<literal>SVNActivitiesDB <replaceable>directory-path</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8836 msgid "" "Specifies the location in the filesystem where the activities database " "should be stored. By default, <command>mod_dav_svn</command> creates and " "uses a directory in the repository called <filename>dav/activities.d</" "filename>. The path specified with this option must be an absolute path." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8844 msgid "" "If specified for an <literal>SVNParentPath</literal> area, " "<command>mod_dav_svn</command> appends the basename of the repository to the " "path specified here. For example:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><screen> #: ../en/book/ch09-reference.xml:8849 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" "\n" " # any \"/svn/foo\" URL will map to a repository in \n" " # /net/svn.nfs/repositories/foo\n" " SVNParentPath \"/net/svn.nfs/repositories\"\n" "\n" " # any \"/svn/foo\" URL will map to an activities db in\n" " # /var/db/svn/activities/foo\n" " SVNActivitiesDB \"/var/db/svn/activities\"\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:8870 msgid "High-level logging" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8872 msgid "" "This is a list of Subversion action log messages produced by Apache's high-" "level logging mechanism, followed by an example of the log message. See " "<xref linkend=\"svn.serverconfig.httpd.extra.logging\"/> for details on " "logging." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8881 msgid "Checkout or export" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8883 msgid "<literal>checkout-or-export /path r62 depth=infinity</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8889 msgid "Commit" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8891 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>commit harry r100</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8896 msgid "Diffs" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8898 msgid "<literal>diff /path r15:20 depth=infinity ignore-ancestry</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8899 msgid "" "<literal>diff /path1@15 /path2@20 depth=infinity ignore-ancestry</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8904 msgid "Fetch a directory" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8906 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>get-dir /trunk r17 text</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8911 msgid "Fetch a file" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8913 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>get-file /path r20 props</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8918 msgid "Fetch a file revision" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8920 msgid "<literal>get-file-revs /path r12:15 include-merged-revisions</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8925 msgid "Fetch merge information" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8927 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>get-mergeinfo (/path1 /path2)</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8932 msgid "Lock" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8934 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>lock /path steal</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8939 msgid "Log" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8941 msgid "" "<literal>log (/path1,/path2,/path3) r20:90 discover-changed-paths revprops=()" "</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8947 msgid "Replay revisions (svnsync)" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8949 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>replay /path r19</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8954 msgid "Revision property change" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8956 msgid "<literal>change-rev-prop r50 propertyname</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8962 msgid "Revision property list" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8964 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>rev-proplist r34</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8971 msgid "<literal>status /path r62 depth=infinity</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8977 msgid "Switch" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8979 msgid "<literal>switch /pathA /pathB@50 depth=infinity</literal>" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8984 #, fuzzy #| msgid "svnlook" msgid "Unlock" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8986 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>unlock /path break</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8993 msgid "<literal>update /path r17 send-copyfrom-args</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9014 msgid "mod_authz_svn Configuration Directives" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9015 msgid "" "Apache configuration directives for configuring path-based authorization for " "Subversion repositories served through the Apache HTTP Server." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9024 msgid "" "This section briefly describes each Apache configuration directive offered " "by <command>mod_authz_svn</command>. For an in-depth description of using " "path-based authorization in Subversion, see <xref linkend=\"svn.serverconfig." "pathbasedauthz\"/>.)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9034 msgid "" "These are the <filename>httpd.conf</filename> directives that apply to " "<command>mod_authz_svn</command>:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:9040 msgid "" "<literal>AuthzSVNAccessFile <replaceable>file-path</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9044 msgid "" "Consult <replaceable>file-path</replaceable> for access rules describing the " "permissions for paths in Subversion repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9052 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>AuthzSVNAnonymous On|Off</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9055 msgid "" "Set to <literal>Off</literal> to disable two special-case behaviours of this " "module: interaction with the <literal>Satisfy Any</literal> directive and " "enforcement of the authorization policy even when no <literal>Require</" "literal> directives are present. The default value of this directive is " "<literal>On</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9067 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>AuthzSVNAuthoritative On|Off</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9070 msgid "" "Set to <literal>Off</literal> to allow access control to be passed along to " "lower modules. The default value of this directive is <literal>On</literal>." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:9079 msgid "<literal>AuthzSVNNoAuthWhenAnonymousAllowed On|Off</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9082 msgid "" "Set to <literal>On</literal> to suppress authentication and authorization " "for requests which anonymous users are allowed to perform. The default " "value of this directive is <literal>On</literal>." msgstr "" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch09-reference.xml:9102 #, fuzzy #| msgid "Subversion's Components" msgid "Subversion Properties" msgstr "Die Komponenten von Subversion" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:9104 msgid "" "Subversion allows users to invent arbitrarily named versioned properties on " "files and directories, as well as unversioned properties on revisions. The " "only restriction is on properties whose names begin with <literal>svn:</" "literal> (those are reserved for Subversion's own use). While these " "properties may be set by users to control Subversion's behavior, users may " "not invent new <literal>svn:</literal> properties." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:9113 msgid "Versioned Properties" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:9115 msgid "" "These are the versioned properties that Subversion reserves for its own use:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9121 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:executable</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9124 msgid "" "If present on a file, the client will make the file executable in Unix-" "hosted working copies. See <xref linkend=\"svn.advanced.props.special." "executable\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9133 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:mime-type</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9136 msgid "" "If present on a file, the value indicates the file's MIME type. This allows " "the client to decide whether line-based contextual merging is safe to " "perform during updates, and can also affect how the file behaves when " "fetched via a web browser. See <xref linkend=\"svn.advanced.props.special." "mime-type\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9148 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:ignore</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9151 msgid "" "If present on a directory, the value is a list of <emphasis>unversioned</" "emphasis> file patterns to be ignored by <command>svn status</command> and " "other subcommands. See <xref linkend=\"svn.advanced.props.special.ignore\"/" ">." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9162 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:keywords</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9165 msgid "" "If present on a file, the value tells the client how to expand particular " "keywords within the file. See <xref linkend=\"svn.advanced.props.special." "keywords\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9175 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:eol-style</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9178 msgid "" "If present on a file, the value tells the client how to manipulate the " "file's line-endings in the working copy and in exported trees. See <xref " "linkend=\"svn.advanced.props.special.eol-style\"/> and <xref linkend=\"svn." "ref.svn.c.export\" /> earlier in this chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9188 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:externals</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9191 msgid "" "If present on a directory, the value is a multiline list of other paths and " "URLs the client should check out. See <xref linkend=\"svn.advanced.externals" "\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9200 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:special</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote> #: ../en/book/ch09-reference.xml:9203 msgid "" "If present on a file, indicates that the file is not an ordinary file, but a " "symbolic link or other special object. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote><para> #: ../en/book/ch09-reference.xml:9207 msgid "" "As of this writing, symbolic links are indeed the only <quote>special</" "quote> objects. But there might be more in future releases of Subversion." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9218 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:needs-lock</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9221 msgid "" "If present on a file, tells the client to make the file read-only in the " "working copy, as a reminder that the file should be locked before editing " "begins. See <xref linkend=\"svn.advanced.locking.lock-communication\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9231 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:mergeinfo</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9234 msgid "" "Used by Subversion to track merge data. See <xref linkend=\"svn.branchmerge." "basicmerging.mergeinfo\"/> for details, but you should never edit this " "property unless you <emphasis>really</emphasis> know what you're doing." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:9247 msgid "Unversioned Properties" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:9249 msgid "" "These are the unversioned properties tht Subversion reserves for its own use:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9255 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:author</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9258 msgid "" "If present, contains the authenticated username of the person who created " "the revision. (If not present, the revision was committed anonymously.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9266 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:date</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9269 msgid "" "Contains the UTC time the revision was created, in ISO 8601 format. The " "value comes from the <emphasis>server</emphasis> machine's clock, not the " "client's." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9278 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:log</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9281 msgid "Contains the log message describing the revision." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9288 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:autoversioned</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9291 msgid "" "If present, the revision was created via the autoversioning feature. See " "<xref linkend=\"svn.webdav.autoversioning\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch09-reference.xml:9308 #, fuzzy #| msgid "Repository URLs" msgid "Repository Hooks" msgstr "Repository URLs" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:9310 msgid "These are the repository hooks that Subversion provides:" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:9316 ../en/book/ch09-reference.xml:9379 #: ../en/book/ch09-reference.xml:9434 ../en/book/ch09-reference.xml:9490 #: ../en/book/ch09-reference.xml:9562 ../en/book/ch09-reference.xml:9637 #: ../en/book/ch09-reference.xml:9696 ../en/book/ch09-reference.xml:9754 #: ../en/book/ch09-reference.xml:9814 #, fuzzy #| msgid "The Repository" msgid "repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9322 msgid "start-commit" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9323 msgid "Notification of the beginning of a commit." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9329 msgid "" "The start-commit hook is run before the commit transaction is even created. " "It is typically used to decide whether the user has commit privileges at all." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9333 msgid "" "If the start-commit hook program returns a nonzero exit value, the commit is " "stopped before the commit transaction is even created, and anything printed " "to <filename>stderr</filename> is marshalled back to the client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:9341 msgid "Input Parameter(s)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9343 ../en/book/ch09-reference.xml:9410 #: ../en/book/ch09-reference.xml:9466 ../en/book/ch09-reference.xml:9522 #: ../en/book/ch09-reference.xml:9598 ../en/book/ch09-reference.xml:9668 #: ../en/book/ch09-reference.xml:9725 ../en/book/ch09-reference.xml:9786 #: ../en/book/ch09-reference.xml:9843 msgid "The command-line arguments passed to the hook program, in order, are:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch09-reference.xml:9348 ../en/book/ch09-reference.xml:9415 #: ../en/book/ch09-reference.xml:9471 ../en/book/ch09-reference.xml:9527 #: ../en/book/ch09-reference.xml:9603 ../en/book/ch09-reference.xml:9673 #: ../en/book/ch09-reference.xml:9730 ../en/book/ch09-reference.xml:9791 #: ../en/book/ch09-reference.xml:9848 #, fuzzy #| msgid "Repository URLs" msgid "Repository path" msgstr "Repository URLs" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9351 msgid "Authenticated username attempting the commit" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9354 msgid "" "Colon-separated list of capabilities that a client passes to the server, " "including <literal>depth</literal>, <literal>mergeinfo</literal>, and " "<literal>log-revprops</literal> (new in Subversion 1.5)." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:9364 ../en/book/ch09-reference.xml:9424 #: ../en/book/ch09-reference.xml:9480 ../en/book/ch09-reference.xml:9552 #: ../en/book/ch09-reference.xml:9627 ../en/book/ch09-reference.xml:9686 #: ../en/book/ch09-reference.xml:9744 ../en/book/ch09-reference.xml:9804 #: ../en/book/ch09-reference.xml:9862 msgid "Common uses" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9366 msgid "Access control (e.g., temporarily lock out commits for some reason)." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9369 msgid "" "A means to allow access only from clients that have certain capabilities." msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9385 msgid "pre-commit" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9386 msgid "Notification just prior to commit completion." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9392 msgid "" "The <literal>pre-commit</literal> hook is run just before a commit " "transaction is promoted to a new revision. Typically, this hook is used to " "protect against commits that are disallowed due to content or location (e." "g., your site might require that all commits to a certain branch include a " "ticket number from the bug tracker, or that the incoming log message is " "nonempty)." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9400 msgid "" "If the <literal>pre-commit</literal> hook program returns a nonzero exit " "value, the commit is aborted, the commit transaction is removed, and " "anything printed to <filename>stderr</filename> is marshalled back to the " "client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:9408 ../en/book/ch09-reference.xml:9464 #: ../en/book/ch09-reference.xml:9520 ../en/book/ch09-reference.xml:9596 #: ../en/book/ch09-reference.xml:9666 ../en/book/ch09-reference.xml:9723 #: ../en/book/ch09-reference.xml:9784 ../en/book/ch09-reference.xml:9841 msgid "Input parameter(s)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9418 msgid "Commit transaction name" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9425 msgid "Change validation and control" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9440 msgid "post-commit" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9441 msgid "Notification of a successful commit." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9447 msgid "" "The <literal>post-commit</literal> hook is run after the transaction is " "committed and a new revision is created. Most people use this hook to send " "out descriptive emails about the commit or to notify some other tool (such " "as an issue tracker) that a commit has happened. Some configurations also " "use this hook to trigger backup processes." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9454 msgid "" "If the <literal>post-commit</literal> hook returns a nonzero exit status, " "the commit <emphasis>will not</emphasis> be aborted since it has already " "completed. However, anything that the hook printed to <filename>stderr</" "filename> will be marshalled back to the client, making it easier to " "diagnose hook failures." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9474 msgid "Revision number created by the commit" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9481 msgid "Commit notification; tool integration" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9496 msgid "pre-revprop-change" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9497 msgid "Notification of a revision property change attempt." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9504 msgid "" "The <literal>pre-revprop-change</literal> hook is run immediately prior to " "the modification of a revision property when performed outside the scope of " "a normal commit. Unlike the other hooks, the default state of this one is " "to deny the proposed action. The hook must actually exist and return a zero " "exit value before a revision property modification can happen." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9512 msgid "" "If the <literal>pre-revprop-change</literal> hook doesn't exist, isn't " "executable, or returns a nonzero exit value, no change to the property will " "be made, and anything printed to <filename>stderr</filename> is marshalled " "back to the client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9530 msgid "Revision whose property is about to be modified" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9533 msgid "Authenticated username attempting the property change" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9536 ../en/book/ch09-reference.xml:9612 msgid "Name of the property changed" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9539 ../en/book/ch09-reference.xml:9615 msgid "" "Change description: <literal>A</literal> (added), <literal>D</literal> " "(deleted), or <literal>M</literal> (modified)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9545 msgid "" "Additionally, Subversion passes the intended new value of the property to " "the hook program via standard input." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9553 msgid "Access control; change validation and control" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9568 msgid "post-revprop-change" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9569 msgid "Notification of a successful revision property change." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9576 msgid "" "The <literal>post-revprop-change</literal> hook is run immediately after the " "modification of a revision property when performed outside the scope of a " "normal commit. As you can derive from the description of its counterpart, " "the <literal>pre-revprop-change</literal> hook, this hook will not run at " "all unless the <literal>pre-revprop-change</literal> hook is implemented. " "It is typically used to send email notification of the property change." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9586 msgid "" "If the <literal>post-revprop-change</literal> hook returns a nonzero exit " "status, the change <emphasis>will not</emphasis> be aborted since it has " "already completed. However, anything that the hook printed to " "<filename>stderr</filename> will be marshalled back to the client, making it " "easier to diagnose hook failures." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9606 msgid "Revision whose property was modified" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9609 msgid "Authenticated username of the person making the change" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9621 msgid "" "Additionally, Subversion passes to the hook program, via standard input, the " "previous value of the property." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9628 msgid "Property change notification" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9643 msgid "pre-lock" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9644 msgid "Notification of a path lock attempt." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9650 msgid "" "The <literal>pre-lock</literal> hook runs whenever someone attempts to lock " "a path. It can be used to prevent locks altogether or to create a more " "complex policy specifying exactly which users are allowed to lock particular " "paths. If the hook notices a preexisting lock, it can also decide whether a " "user is allowed to <quote>steal</quote> the existing lock." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9658 msgid "" "If the <literal>pre-lock</literal> hook program returns a nonzero exit " "value, the lock action is aborted and anything printed to <filename>stderr</" "filename> is marshalled back to the client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9676 msgid "Versioned path that is to be locked" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9679 ../en/book/ch09-reference.xml:9797 msgid "Authenticated username of the person attempting the lock" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><thead><row><entry> #: ../en/book/ch09-reference.xml:9687 ../en/book/ch09-reference.xml:9805 #, fuzzy #| msgid "Access method" msgid "Access control" msgstr "Zugriffsmethode" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9702 msgid "post-lock" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9703 msgid "Notification of a successful path lock." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9709 msgid "" "The <literal>post-lock</literal> hook runs after one or more paths have been " "locked. It is typically used to send email notification of the lock event." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9713 msgid "" "If the <literal>post-lock</literal> hook returns a nonzero exit status, the " "lock <emphasis>will not</emphasis> be aborted since it has already " "completed. However, anything that the hook printed to <filename>stderr</" "filename> will be marshalled back to the client, making it easier to " "diagnose hook failures." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9733 msgid "Authenticated username of the person who locked the paths" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9738 msgid "" "Additionally, the list of paths locked is passed to the hook program via " "standard input, one path per line." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9745 msgid "Lock notification" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9760 msgid "pre-unlock" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9761 msgid "Notification of a path unlock attempt." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9767 msgid "" "The <literal>pre-unlock</literal> hook runs whenever someone attempts to " "remove a lock on a file. It can be used to create policies that specify " "which users are allowed to unlock particular paths. It's particularly " "important for determining policies about lock breakage. If user A locks a " "file, is user B allowed to break the lock? What if the lock is more than a " "week old? These sorts of things can be decided and enforced by the hook." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9776 msgid "" "If the <literal>pre-unlock</literal> hook program returns a nonzero exit " "value, the unlock action is aborted and anything printed to " "<filename>stderr</filename> is marshalled back to the client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9794 msgid "Versioned path which is to be locked" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9820 msgid "post-unlock" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9821 msgid "Notification of a successful path unlock." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9827 msgid "" "The <literal>post-unlock</literal> hook runs after one or more paths have " "been unlocked. It is typically used to send email notification of the " "unlock event." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9831 msgid "" "If the <literal>post-unlock</literal> hook returns a nonzero exit status, " "the unlock <emphasis>will not</emphasis> be aborted since it has already " "completed. However, anything that the hook printed to <filename>stderr</" "filename> will be marshalled back to the client, making it easier to " "diagnose hook failures." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9851 msgid "Authenticated username of the person who unlocked the paths" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9856 msgid "" "Additionally, the list of paths unlocked is passed to the hook program via " "standard input, one path per line." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9863 msgid "Unlock notification" msgstr "" # type: Content of: <appendix><title> #: ../en/book/copyright.xml:2 msgid "Copyright" msgstr "" # type: Content of: <appendix><programlisting> #: ../en/book/copyright.xml:4 #, no-wrap msgid "" "\n" "\n" "Copyright (c) 2002-2007\n" "Ben Collins-Sussman, Brian W. Fitzpatrick, C. Michael Pilato. \n" "\n" "This work is licensed under the Creative Commons Attribution License.\n" "To view a copy of this license, visit\n" "http://creativecommons.org/licenses/by/2.0/ or send a letter to\n" "Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305,\n" "USA.\n" "\n" "A summary of the license is given below, followed by the full legal\n" "text.\n" "\n" "--------------------------------------------------------------------\n" "\n" "You are free:\n" "\n" " * to copy, distribute, display, and perform the work\n" " * to make derivative works\n" " * to make commercial use of the work\n" "\n" "Under the following conditions:\n" "\t\n" "Attribution. You must give the original author credit.\n" "\n" " * For any reuse or distribution, you must make clear to others the\n" " license terms of this work.\n" "\n" " * Any of these conditions can be waived if you get permission from\n" " the author.\n" "\n" "Your fair use and other rights are in no way affected by the above.\n" "\n" "The above is a summary of the full license below.\n" "\n" "====================================================================\n" "\n" "Creative Commons Legal Code\n" "Attribution 2.0\n" "\n" "CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE\n" "LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN\n" "ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS\n" "INFORMATION ON AN \"AS-IS\" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES\n" "REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR\n" "DAMAGES RESULTING FROM ITS USE.\n" "\n" "License\n" "\n" "THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS\n" "CREATIVE COMMONS PUBLIC LICENSE (\"CCPL\" OR \"LICENSE\"). THE WORK IS\n" "PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE\n" "WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS\n" "PROHIBITED.\n" "\n" "BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND\n" "AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS\n" "YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF\n" "SUCH TERMS AND CONDITIONS.\n" "\n" "1. Definitions\n" "\n" " a. \"Collective Work\" means a work, such as a periodical issue,\n" " anthology or encyclopedia, in which the Work in its entirety in\n" " unmodified form, along with a number of other contributions,\n" " constituting separate and independent works in themselves, are\n" " assembled into a collective whole. A work that constitutes a\n" " Collective Work will not be considered a Derivative Work (as\n" " defined below) for the purposes of this License.\n" "\n" " b. \"Derivative Work\" means a work based upon the Work or upon the\n" " Work and other pre-existing works, such as a translation,\n" " musical arrangement, dramatization, fictionalization, motion\n" " picture version, sound recording, art reproduction, abridgment,\n" " condensation, or any other form in which the Work may be recast,\n" " transformed, or adapted, except that a work that constitutes a\n" " Collective Work will not be considered a Derivative Work for the\n" " purpose of this License. For the avoidance of doubt, where the\n" " Work is a musical composition or sound recording, the\n" " synchronization of the Work in timed-relation with a moving\n" " image (\"synching\") will be considered a Derivative Work for the\n" " purpose of this License.\n" "\n" " c. \"Licensor\" means the individual or entity that offers the Work\n" " under the terms of this License.\n" "\n" " d. \"Original Author\" means the individual or entity who created the Work.\n" "\n" " e. \"Work\" means the copyrightable work of authorship offered under\n" " the terms of this License.\n" "\n" " f. \"You\" means an individual or entity exercising rights under this\n" " License who has not previously violated the terms of this\n" " License with respect to the Work, or who has received express\n" " permission from the Licensor to exercise rights under this\n" " License despite a previous violation.\n" "\n" "2. Fair Use Rights. Nothing in this license is intended to reduce,\n" " limit, or restrict any rights arising from fair use, first sale or\n" " other limitations on the exclusive rights of the copyright owner\n" " under copyright law or other applicable laws.\n" "\n" "3. License Grant. Subject to the terms and conditions of this License,\n" " Licensor hereby grants You a worldwide, royalty-free,\n" " non-exclusive, perpetual (for the duration of the applicable\n" " copyright) license to exercise the rights in the Work as stated\n" " below:\n" "\n" " a. to reproduce the Work, to incorporate the Work into one or more\n" " Collective Works, and to reproduce the Work as incorporated in\n" " the Collective Works;\n" "\n" " b. to create and reproduce Derivative Works;\n" "\n" " c. to distribute copies or phonorecords of, display publicly,\n" " perform publicly, and perform publicly by means of a digital\n" " audio transmission the Work including as incorporated in\n" " Collective Works;\n" "\n" " d. to distribute copies or phonorecords of, display publicly,\n" " perform publicly, and perform publicly by means of a digital\n" " audio transmission Derivative Works.\n" "\n" " e.\n" "\n" " For the avoidance of doubt, where the work is a musical composition:\n" "\n" " i. Performance Royalties Under Blanket Licenses. Licensor\n" " waives the exclusive right to collect, whether\n" " individually or via a performance rights society\n" " (e.g. ASCAP, BMI, SESAC), royalties for the public\n" " performance or public digital performance (e.g. webcast)\n" " of the Work.\n" "\n" " ii. Mechanical Rights and Statutory Royalties. Licensor waives\n" " the exclusive right to collect, whether individually or\n" " via a music rights agency or designated agent (e.g. Harry\n" " Fox Agency), royalties for any phonorecord You create from\n" " the Work (\"cover version\") and distribute, subject to the\n" " compulsory license created by 17 USC Section 115 of the US\n" " Copyright Act (or the equivalent in other jurisdictions).\n" "\n" " f. Webcasting Rights and Statutory Royalties. For the avoidance of\n" " doubt, where the Work is a sound recording, Licensor waives the\n" " exclusive right to collect, whether individually or via a\n" " performance-rights society (e.g. SoundExchange), royalties for\n" " the public digital performance (e.g. webcast) of the Work,\n" " subject to the compulsory license created by 17 USC Section 114\n" " of the US Copyright Act (or the equivalent in other\n" " jurisdictions).\n" "\n" "The above rights may be exercised in all media and formats whether now\n" "known or hereafter devised. The above rights include the right to make\n" "such modifications as are technically necessary to exercise the rights\n" "in other media and formats. All rights not expressly granted by\n" "Licensor are hereby reserved.\n" "\n" "4. Restrictions.The license granted in Section 3 above is expressly\n" " made subject to and limited by the following restrictions:\n" "\n" " a. You may distribute, publicly display, publicly perform, or\n" " publicly digitally perform the Work only under the terms of this\n" " License, and You must include a copy of, or the Uniform Resource\n" " Identifier for, this License with every copy or phonorecord of\n" " the Work You distribute, publicly display, publicly perform, or\n" " publicly digitally perform. You may not offer or impose any\n" " terms on the Work that alter or restrict the terms of this\n" " License or the recipients' exercise of the rights granted\n" " hereunder. You may not sublicense the Work. You must keep intact\n" " all notices that refer to this License and to the disclaimer of\n" " warranties. You may not distribute, publicly display, publicly\n" " perform, or publicly digitally perform the Work with any\n" " technological measures that control access or use of the Work in\n" " a manner inconsistent with the terms of this License\n" " Agreement. The above applies to the Work as incorporated in a\n" " Collective Work, but this does not require the Collective Work\n" " apart from the Work itself to be made subject to the terms of\n" " this License. If You create a Collective Work, upon notice from\n" " any Licensor You must, to the extent practicable, remove from\n" " the Collective Work any reference to such Licensor or the\n" " Original Author, as requested. If You create a Derivative Work,\n" " upon notice from any Licensor You must, to the extent\n" " practicable, remove from the Derivative Work any reference to\n" " such Licensor or the Original Author, as requested.\n" "\n" " b. If you distribute, publicly display, publicly perform, or\n" " publicly digitally perform the Work or any Derivative Works or\n" " Collective Works, You must keep intact all copyright notices for\n" " the Work and give the Original Author credit reasonable to the\n" " medium or means You are utilizing by conveying the name (or\n" " pseudonym if applicable) of the Original Author if supplied; the\n" " title of the Work if supplied; to the extent reasonably\n" " practicable, the Uniform Resource Identifier, if any, that\n" " Licensor specifies to be associated with the Work, unless such\n" " URI does not refer to the copyright notice or licensing\n" " information for the Work; and in the case of a Derivative Work,\n" " a credit identifying the use of the Work in the Derivative Work\n" " (e.g., \"French translation of the Work by Original Author,\" or\n" " \"Screenplay based on original Work by Original Author\"). Such\n" " credit may be implemented in any reasonable manner; provided,\n" " however, that in the case of a Derivative Work or Collective\n" " Work, at a minimum such credit will appear where any other\n" " comparable authorship credit appears and in a manner at least as\n" " prominent as such other comparable authorship credit.\n" "\n" "5. Representations, Warranties and Disclaimer\n" "\n" "UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING,\n" "LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR\n" "WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED,\n" "STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF\n" "TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE,\n" "NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY,\n" "OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT\n" "DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED\n" "WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.\n" "\n" "6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY\n" " APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY\n" " LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE\n" " OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE\n" " WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\n" " DAMAGES.\n" "\n" "7. Termination\n" "\n" " a. This License and the rights granted hereunder will terminate\n" " automatically upon any breach by You of the terms of this\n" " License. Individuals or entities who have received Derivative\n" " Works or Collective Works from You under this License, however,\n" " will not have their licenses terminated provided such\n" " individuals or entities remain in full compliance with those\n" " licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any\n" " termination of this License.\n" "\n" " b. Subject to the above terms and conditions, the license granted\n" " here is perpetual (for the duration of the applicable copyright\n" " in the Work). Notwithstanding the above, Licensor reserves the\n" " right to release the Work under different license terms or to\n" " stop distributing the Work at any time; provided, however that\n" " any such election will not serve to withdraw this License (or\n" " any other license that has been, or is required to be, granted\n" " under the terms of this License), and this License will continue\n" " in full force and effect unless terminated as stated above.\n" "\n" "8. Miscellaneous\n" "\n" " a. Each time You distribute or publicly digitally perform the Work\n" " or a Collective Work, the Licensor offers to the recipient a\n" " license to the Work on the same terms and conditions as the\n" " license granted to You under this License.\n" "\n" " b. Each time You distribute or publicly digitally perform a\n" " Derivative Work, Licensor offers to the recipient a license to\n" " the original Work on the same terms and conditions as the\n" " license granted to You under this License.\n" "\n" " c. If any provision of this License is invalid or unenforceable\n" " under applicable law, it shall not affect the validity or\n" " enforceability of the remainder of the terms of this License,\n" " and without further action by the parties to this agreement,\n" " such provision shall be reformed to the minimum extent necessary\n" " to make such provision valid and enforceable.\n" "\n" " d. No term or provision of this License shall be deemed waived and\n" " no breach consented to unless such waiver or consent shall be in\n" " writing and signed by the party to be charged with such waiver\n" " or consent.\n" "\n" " e. This License constitutes the entire agreement between the\n" " parties with respect to the Work licensed here. There are no\n" " understandings, agreements or representations with respect to\n" " the Work not specified here. Licensor shall not be bound by any\n" " additional provisions that may appear in any communication from\n" " You. This License may not be modified without the mutual written\n" " agreement of the Licensor and You.\n" "\n" "Creative Commons is not a party to this License, and makes no warranty\n" "whatsoever in connection with the Work. Creative Commons will not be\n" "liable to You or any party on any legal theory for any damages\n" "whatsoever, including without limitation any general, special,\n" "incidental or consequential damages arising in connection to this\n" "license. Notwithstanding the foregoing two (2) sentences, if Creative\n" "Commons has expressly identified itself as the Licensor hereunder, it\n" "shall have all rights and obligations of Licensor.\n" "\n" "Except for the limited purpose of indicating to the public that the\n" "Work is licensed under the CCPL, neither party will use the trademark\n" "\"Creative Commons\" or any related trademark or logo of Creative\n" "Commons without the prior written consent of Creative Commons. Any\n" "permitted use will be in compliance with Creative Commons'\n" "then-current trademark usage guidelines, as may be published on its\n" "website or otherwise made available upon request from time to time.\n" "\n" "Creative Commons may be contacted at http://creativecommons.org/.\n" "\n" "====================================================================\n" msgstr "" # type: Content of: <preface><prefaceinfo> #: ../en/book/foreword.xml:9 msgid "<author> <firstname>Karl</firstname> <surname>Fogel</surname> </author>" msgstr "" "<author> <firstname>Karl</firstname> <surname>Fogel</surname> </author>" # type: Content of: <preface><prefaceinfo><pubdate> #: ../en/book/foreword.xml:13 msgid "Chicago, March 14, 2004." msgstr "Chicago, 14, März 2004." # type: Content of: <preface><title> #: ../en/book/foreword.xml:16 msgid "Foreword" msgstr "Geleitwort" # type: Content of: <preface><para> #: ../en/book/foreword.xml:18 msgid "" "A bad Frequently Asked Questions (FAQ) sheet is one that is composed not of " "the questions people actually ask, but of the questions the FAQ's author " "<emphasis>wishes</emphasis> people would ask. Perhaps you've seen the type " "before:" msgstr "" "Eine schlechte FAQ (Frequently Asked Questions) ist eine, die nicht aus den " "Fragen besteht, die wirklich gefragt wurden, sondern aus denen, die der " "Autor sich von den Fragenden <emphasis>gewünscht</emphasis> hätte. " "Vielleicht haben Sie solche schon gesehen:" # type: Content of: <preface><blockquote><para> #: ../en/book/foreword.xml:24 msgid "Q: How can I use Glorbosoft XYZ to maximize team productivity?" msgstr "" "F: Wie kann ich Glorbosoft XYZ einsetzen, um die Team-Produktivität zu " "maximieren?" # type: Content of: <preface><blockquote><para> #: ../en/book/foreword.xml:29 msgid "" "A: Many of our customers want to know how they can maximize productivity " "through our patented office groupware innovations. The answer is simple. " "First, click on the <literal>File</literal> menu, scroll down to " "<literal>Increase Productivity</literal>, then…" msgstr "" "A: Viele unserer Kunden wollen wissen, wie sie Ihre Produktivität mit " "unseren patentierten Office Groupware Innovationen maximieren können. Die " "Antwort ist einfach: zuerst klicken Sie auf das Menü <quote><literal>Datei</" "literal></quote>, fahren hinunter zum Eintrag <quote><literal>Erhöhe " "Produktivität</literal></quote>, und dann …" # type: Content of: <preface><para> #: ../en/book/foreword.xml:37 msgid "" "The problem with such FAQs is that they are not, in a literal sense, FAQs at " "all. No one ever called the tech support line and asked, <quote>How can we " "maximize productivity?</quote> Rather, people asked highly specific " "questions, such as <quote>How can we change the calendaring system to send " "reminders two days in advance instead of one?</quote> and so on. But it's a " "lot easier to make up imaginary Frequently Asked Questions than it is to " "discover the real ones. Compiling a true FAQ sheet requires a sustained, " "organized effort: over the lifetime of the software, incoming questions must " "be tracked, responses monitored, and all gathered into a coherent, " "searchable whole that reflects the collective experience of users in the " "wild. It calls for the patient, observant attitude of a field naturalist. " "No grand hypothesizing, no visionary pronouncements here—open eyes and " "accurate note-taking are what's needed most." msgstr "" "Das Problem mit solchen FAQs ist, dass sie keine FAQs im eigentlichen Sinne " "sind. Niemand fragt den technischen Support: <quote>Wie können wir unsere " "Produktivität steigern?</quote> Üblicherweise fragen Leute sehr spezifische " "Fragen, wie: <quote>Wie können wir das Kalendersystem so ändern, dass es die " "Erinnerungen zwei Tage statt einen Tag im Voraus aussendet?</quote> und so " "weiter. Aber es ist viel leichter, häufig gestellte Fragen zu erfinden, als " "die richtigen Fragen zu entdecken. Eine sinnvolle FAQ-Sammlung " "zusammenzustellen, erfordert eine ausdauernde, planvolle Anstrengung: über " "die Lebensdauer einer Software müssen hereinkommende Anfragen ausgewertet " "und Rückmeldungen evaluiert werden und zu einem konsistenten und " "benutzerfreundlichen Ganzen zusammengeführt werden, das die gesammelte " "Erfahrung der Anwendenden wiedergibt. Es erfordert die geduldige, " "aufmerksame Einstellung eines Naturforschers. Nicht großartige Hypothesen " "und visionäre Vorhersagen, sondern hauptsächlich offene Augen und genaue " "Aufzeichnungen sind gefragt." # type: Content of: <preface><para> #: ../en/book/foreword.xml:54 msgid "" "What I love about this book is that it grew out of just such a process, and " "shows it on every page. It is the direct result of the authors' encounters " "with users. It began with Ben Collins-Sussman's observation that people " "were asking the same basic questions over and over on the Subversion mailing " "lists: what are the standard workflows to use with Subversion? Do branches " "and tags work the same way as in other version control systems? How can I " "find out who made a particular change?" msgstr "" "Was ich an diesem Buch liebe, ist, dass es genau aus einem solchen Prozess " "gewachsen ist und dies auf jeder Seite sichtbar ist. Es ist das direkte " "Ergebnis der Begegnungen der Autoren mit Benutzern. Es begann mit Ben " "Collins-Sussmans Beobachtung, dass Leute immer wieder die gleichen " "grundlegenden Fragen auf der Subversion-Mailingliste stellten: Was sind die " "Standard-Arbeitsabläufe mit Subversion? Funktionieren Branches und Tags " "genau so wie in anderen Versionskontrollsystemen? Wie finde ich heraus, wer " "eine bestimmte Änderung durchgeführt hat?" # type: Content of: <preface><para> #: ../en/book/foreword.xml:63 msgid "" "Frustrated at seeing the same questions day after day, Ben worked intensely " "over a month in the summer of 2002 to write <citetitle>The Subversion " "Handbook</citetitle>, a 60-page manual that covered all the basics of using " "Subversion. The manual made no pretense of being complete, but it was " "distributed with Subversion and got users over that initial hump in the " "learning curve. When O'Reilly decided to publish a full-length Subversion " "book, the path of least resistance was obvious: just expand the Subversion " "handbook." msgstr "" "Frustriert davon, Tag für Tag immer wieder die gleichen Fragen zu sehen, " "arbeitete Ben im Sommer 2002 über einen Monat intensiv daran, <citetitle>The " "Subversion Handbook</citetitle> zu schreiben, eine 60-seitige Anleitung, die " "die Grundlagen der Benutzung von Subversion beschrieb. Die Anleitung erhob " "keinen Anspruch auf Vollständigkeit, aber sie wurde mit Subversion verteilt " "und half vielen über die ersten Buckel der Lernkurve. Als O'Reilly and " "Associates sich entschieden, ein vollständiges Buch über Subversion " "herauszugeben, war der Weg des geringsten Widerstandes offensichtlich: " "<citetitle>The Subversion Handbook</citetitle> muss erweitert werden." # type: Content of: <preface><para> #: ../en/book/foreword.xml:74 msgid "" "The three coauthors of the new book were thus presented with an unusual " "opportunity. Officially, their task was to write a book top-down, starting " "from a table of contents and an initial draft. But they also had access to " "a steady stream—indeed, an uncontrollable geyser—of bottom-up " "source material. Subversion was already in the hands of thousands of early " "adopters, and those users were giving tons of feedback, not only about " "Subversion, but also about its existing documentation." msgstr "" "Die drei Co-Autoren des neuen Buches erhielten somit eine seltene " "Gelegenheit. Eigentlich war es ihre Aufgabe, ein Buch beginnend mit dem " "Inhaltsverzeichnis und einem Rohkonzept zu schreiben; jedoch hatten sie auch " "Zugang zu einem ständigen Strom – ja einem unkontrollierbaren Geysir " "– aus Quellmaterial. Subversion wurde bereits von tausenden " "experimentierfreudigen Menschen benutzt, und diese gaben Unmengen an " "Rückmeldungen – nicht nur über Subversion, sondern auch über die " "bestehende Dokumentation." # type: Content of: <preface><para> #: ../en/book/foreword.xml:84 msgid "" "During the entire time they wrote this book, Ben, Mike, and Brian haunted " "the Subversion mailing lists and chat rooms incessantly, carefully noting " "the problems users were having in real-life situations. Monitoring such " "feedback was part of their job descriptions at CollabNet anyway, and it gave " "them a huge advantage when they set out to document Subversion. The book " "they produced is grounded firmly in the bedrock of experience, not in the " "shifting sands of wishful thinking; it combines the best aspects of user " "manual and FAQ sheet. This duality might not be noticeable on a first " "reading. Taken in order, front to back, the book is simply a " "straightforward description of a piece of software. There's the overview, " "the obligatory guided tour, the chapter on administrative configuration, " "some advanced topics, and of course, a command reference and troubleshooting " "guide. Only when you come back to it later, seeking the solution to some " "specific problem, does its authenticity shine out: the telling details that " "can only result from encounters with the unexpected, the examples honed from " "genuine use cases, and most of all the sensitivity to the user's needs and " "the user's point of view." msgstr "" "Während der gesamten Zeit, in der sie dieses Buch schrieben, durchstöberten " "Ben, Mike und Brian unablässig die Subversion-Mailinglisten und Chaträume " "und notierten die Probleme, die Benutzer im echten Leben hatten. Die " "Beobachtung derartiger Rückmeldungen war ohnehin ein Teil ihrer Arbeit bei " "CollabNet, was ihnen einen Riesenvorteil verschaffte, als sie sich " "entschlossen, Subversion zu dokumentieren. Das Buch, das sie schrieben, " "gründet auf dem festen Fels der Erfahrung und nicht auf dem Treibsand des " "Wunschdenkens. Es vereint die Vorteile von Bedienungsanleitung und FAQ. " "Diese Zweigleisigkeit ist vielleicht nicht gleich zu erkennen. Von vorne " "nach hinten gelesen ist das Buch einfach eine Beschreibung einer Software. " "Es gibt die Übersicht, den obligatorischen Rundgang, das Kapitel über " "Administration, einige fortgeschrittene Themen und natürlich eine " "Funktionsübersicht sowie eine Anleitung zur Problemlösung. Erst wenn Sie es " "später wieder zur Hand nehmen, um die Lösung für ein bestimmtes Problem zu " "suchen, wird die Zuverlässigkeit des Buches offenbar: in den beschriebenen " "Details,die nur aus der Erfahrung mit dem Unerwarteten erwachsen konnten, in " "den Beispielen, die aus dem tatsächlichem Einsatz gebildet wurden, und am " "meisten durch das Gefühl für die Bedürfnisse und den Blickwinkel der " "Benutzer." # type: Content of: <preface><para> #: ../en/book/foreword.xml:105 msgid "" "Of course, no one can promise that this book will answer every question you " "have about Subversion. Sometimes the precision with which it anticipates " "your questions will seem eerily telepathic; yet occasionally, you will " "stumble into a hole in the community's knowledge and come away empty-" "handed. When this happens, the best thing you can do is email " "<email>users@subversion.tigris.org</email> and present your problem. The " "authors are still there and still watching, and the authors include not just " "the three listed on the cover, but many others who contributed corrections " "and original material. From the community's point of view, solving your " "problem is merely a pleasant side effect of a much larger project—" "namely, slowly adjusting this book, and ultimately Subversion itself, to " "more closely match the way people actually use it. They are eager to hear " "from you, not only because they can help you, but because you can help " "them. With Subversion, as with all active free software projects, " "<emphasis>you are not alone</emphasis>." msgstr "" "Natürlich kann niemand versprechen, dass dieses Buch alle Fragen " "beantwortet, die Sie über Subversion haben. Manchmal wird die Genauigkeit, " "mit der es Ihre Fragen erwartet, unheimlich und telepathisch erscheinen; " "gelegentlich werden Sie jedoch in ein Loch im Wissen der Gemeinschaft " "stolpern und mit leeren Händen dastehen. Wenn das passiert schreiben Sie am " "besten eine E-Mail an <email>users@subversion.tigris.org</email> und " "schildern Ihr Problem. Die Autoren sind nach wie vor dort und beobachten. " "Und das betrifft nicht nur die drei, die auf dem Umschlag erscheinen sind, " "sondern viele andere, die Korrekturen und neues Material beigesteuert " "haben. Aus der Sicht der Gemeinschaft ist die Lösung Ihres Problems " "lediglich ein erfreulicher Nebeneffekt eines viel größeren Projektes – " "nämlich das Buch und schlussendlich auch Subversion selbst immer näher an " "die Art und Weise anzupassen, in der es tatsächlich benutzt wird. Diese " "Personen sind begierig darauf, von Ihnen zu hören, nicht nur weil sie Ihnen " "helfen können, sondern auch weil ihnen selbst damit geholfen ist. Für " "Subversion – so wie für alle aktiven freien Software-Projekte – " "gilt: <emphasis>Sie sind nicht allein</emphasis>." # type: Content of: <preface><para> #: ../en/book/foreword.xml:124 msgid "Let this book be your first companion." msgstr "Lassen Sie dieses Buch Ihren ersten Begleiter sein."

# German translation of the Subversion book # # This file is distributed under the same license as the Subversion book. # Jens Seidel , 2008. # msgid "" msgstr "" "Project-Id-Version: svnbook 2008\n" "POT-Creation-Date: 2008-08-23 19:01+0300\n" "PO-Revision-Date: 2008-08-23 18:59+0200\n" "Last-Translator: Jens Seidel \n" "Language-Team: Debian German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" # type: Content of: #: ../en/book/appa-quickstart.xml:3 #, fuzzy #| msgid "Subversion in Action" msgid "Subversion Quick-Start Guide" msgstr "Subversion in Action" # type: Content of: <appendix><para> #: ../en/book/appa-quickstart.xml:6 msgid "" "If you're eager to get Subversion up and running (and you enjoy learning by " "experimentation), this appendix will show you how to create a repository, " "import code, and then check it back out again as a working copy. Along the " "way, we give links to the relevant chapters of this book." msgstr "" # type: Content of: <appendix><warning><para> #: ../en/book/appa-quickstart.xml:13 msgid "" "If you're new to the entire concept of version control or to the <quote>copy-" "modify-merge</quote> model used by both CVS and Subversion, you should read " "<xref linkend=\"svn.basic\"/> before going any further." msgstr "" # type: Content of: <preface><sect1><title> #: ../en/book/appa-quickstart.xml:25 #, fuzzy #| msgid "What Is Subversion?" msgid "Installing Subversion" msgstr "Was ist Subversion?" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:27 msgid "" "Subversion is built on a portability layer called APR—the Apache " "Portable Runtime library. The APR library provides all the interfaces that " "Subversion needs to function on different operating systems: disk access, " "network access, memory management, and so on. While Subversion is able to " "use Apache as one of its network server programs, its dependence on APR " "<emphasis>does not</emphasis> mean that Apache is a required component. APR " "is a standalone library usable by any application. It does mean, however, " "that like Apache, Subversion clients and servers run on any operating system " "that the Apache <command>httpd</command> server runs on: Windows, Linux, all " "flavors of BSD, Mac OS X, NetWare, and others." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:40 msgid "" "The easiest way to get Subversion is to download a binary package built for " "your operating system. Subversion's web site (<ulink url=\"http://" "subversion.tigris.org\"/>) often has these packages available for download, " "posted by volunteers. The site usually contains graphical installer " "packages for users of Microsoft operating systems. If you run a Unix-like " "operating system, you can use your system's native package distribution " "system (RPMs, DEBs, the ports tree, etc.) to get Subversion." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:50 msgid "" "Alternatively, you can build Subversion directly from source code, though " "it's not always an easy task. (If you're not experienced at building open " "source software packages, you're probably better off downloading a binary " "distribution instead!) From the Subversion web site, download the latest " "source code release. After unpacking it, follow the instructions in the " "<filename>INSTALL</filename> file to build it. Note that a released source " "package may not contain everything you need to build a command-line client " "capable of talking to a remote repository. Starting with Subversion 1.4 and " "later, the libraries Subversion depends on (apr, apr-util, and neon) are " "distributed in a separate source package suffixed with <filename>-deps</" "filename>. These libraries are now common enough that they may already be " "installed on your system. If not, you'll need to unpack the dependency " "package into the same directory where you unpacked the main Subversion " "source. Regardless, it's possible that you may want to fetch other optional " "dependencies such as Berkeley DB and possibly Apache <command>httpd</" "command>. If you want to do a complete build, make sure you have all of the " "packages documented in the <filename>INSTALL</filename> file." msgstr "" # type: Content of: <appendix><sect1><para><footnote> #: ../en/book/appa-quickstart.xml:72 msgid "" "If you're one of those folks that likes to use bleeding-edge software, you " "can also get the Subversion source code from the Subversion repository in " "which it lives. Obviously, you'll need to already have a Subversion client " "on hand to do this. But once you do, you can check out a working copy of " "the Subversion source repository from <ulink url=\"http://svn.collab.net/" "repos/svn/trunk/\"/>: <footnote>" msgstr "" # type: Content of: <appendix><sect1><para><footnote><para> #: ../en/book/appa-quickstart.xml:79 msgid "" "Note that the URL checked out in the example ends not with <literal>svn</" "literal>, but with a subdirectory thereof called <literal>trunk</literal>. " "See our discussion of Subversion's branching and tagging model for the " "reasoning behind this." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/appa-quickstart.xml:84 ../en/book/appb-svn-for-cvs-users.xml:370 #: ../en/book/ch00-preface.xml:461 ../en/book/ch02-basic-usage.xml:583 #: ../en/book/ch02-basic-usage.xml:685 ../en/book/ch02-basic-usage.xml:2141 #: ../en/book/ch03-advanced-topics.xml:511 #: ../en/book/ch03-advanced-topics.xml:947 #: ../en/book/ch03-advanced-topics.xml:2773 #: ../en/book/ch03-advanced-topics.xml:4083 #: ../en/book/ch04-branching-and-merging.xml:1045 #: ../en/book/ch04-branching-and-merging.xml:1337 #: ../en/book/ch04-branching-and-merging.xml:1548 #: ../en/book/ch04-branching-and-merging.xml:2184 #: ../en/book/ch04-branching-and-merging.xml:2900 #: ../en/book/ch05-repository-admin.xml:231 #: ../en/book/ch05-repository-admin.xml:264 #: ../en/book/ch06-server-configuration.xml:1184 #: ../en/book/ch06-server-configuration.xml:1989 #: ../en/book/ch06-server-configuration.xml:2959 #: ../en/book/ch07-customizing-svn.xml:1159 #: ../en/book/ch08-embedding-svn.xml:760 ../en/book/ch09-reference.xml:9211 msgid "</footnote>" msgstr "</footnote>" # type: Content of: <chapter><sect1><screen> #: ../en/book/appa-quickstart.xml:87 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.collab.net/repos/svn/trunk subv\n" #| "A subv/Makefile.in\n" #| "A subv/ac-helpers\n" #| "A subv/ac-helpers/install.sh\n" #| "A subv/ac-helpers/install-sh\n" #| "A subv/build.conf\n" #| "…\n" #| "Checked out revision 8810.\n" msgid "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk subversion\n" "A subversion/HACKING\n" "A subversion/INSTALL\n" "A subversion/README\n" "A subversion/autogen.sh\n" "A subversion/build.conf\n" "…\n" msgstr "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk subv\n" "A subv/Makefile.in\n" "A subv/ac-helpers\n" "A subv/ac-helpers/install.sh\n" "A subv/ac-helpers/install-sh\n" "A subv/build.conf\n" "…\n" "Checked out revision 8810.\n" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:97 msgid "" "The preceding command will create a working copy of the latest (unreleased) " "Subversion source code into a subdirectory named <filename>subversion</" "filename> in your current working directory. You can adjust that last " "argument as you see fit. Regardless of what you call the new working copy " "directory, though, after this operation completes, you will now have the " "Subversion source code. Of course, you will still need to fetch a few " "helper libraries (apr, apr-util, etc.)—see the <filename>INSTALL</" "filename> file in the top level of the working copy for details." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appa-quickstart.xml:115 msgid "High-Speed Tutorial" msgstr "" # type: Content of: <appendix><sect1><blockquote><para> #: ../en/book/appa-quickstart.xml:118 msgid "" "<quote>Please make sure your seat backs are in their full, upright position " "and that your tray tables are stored. Flight attendants, prepare for take-" "off….</quote>" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:123 msgid "" "What follows is a quick tutorial that walks you through some basic " "Subversion configuration and operation. When you finish it, you should have " "a general understanding of Subversion's typical usage." msgstr "" # type: Content of: <appendix><sect1><note><para> #: ../en/book/appa-quickstart.xml:129 msgid "" "The examples used in this appendix assume that you have <command>svn</" "command>, the Subversion command-line client, and <command>svnadmin</" "command>, the administrative tool, ready to go on a Unix-like operating " "system. (This tutorial also works at the Windows command-line prompt, " "assuming you make some obvious tweaks.) We also assume you are using " "Subversion 1.2 or later (run <userinput>svn --version</userinput> to check.)" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:139 msgid "" "Subversion stores all versioned data in a central repository. To begin, " "create a new repository:" msgstr "" # type: Content of: <appendix><sect1><screen> #: ../en/book/appa-quickstart.xml:142 #, no-wrap msgid "" "\n" "$ svnadmin create /var/svn/repos\n" "$ ls /var/svn/repos\n" "conf/ dav/ db/ format hooks/ locks/ README.txt\n" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:148 msgid "" "This command creates a new directory, <filename>/var/svn/repos</filename>, " "which contains a Subversion repository. This new directory contains (among " "other things) a collection of database files. You won't see your versioned " "files if you peek inside. For more information about repository creation " "and maintenance, see <xref linkend=\"svn.reposadmin\"/>." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:156 msgid "" "Subversion has no concept of a <quote>project.</quote> The repository is " "just a virtual versioned filesystem, a large tree that can hold anything you " "wish. Some administrators prefer to store only one project in a repository, " "and others prefer to store multiple projects in a repository by placing them " "into separate directories. We discuss the merits of each approach in <xref " "linkend=\"svn.reposadmin.projects.chooselayout\"/>. Either way, the " "repository manages only files and directories, so it's up to humans to " "interpret particular directories as <quote>projects.</quote> So while you " "might see references to projects throughout this book, keep in mind that " "we're only ever talking about some directory (or collection of directories) " "in the repository." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:170 msgid "" "In this example, we assume you already have some sort of project (a " "collection of files and directories) that you wish to import into your newly " "created Subversion repository. Begin by organizing your data into a single " "directory called <filename>myproject</filename> (or whatever you wish). For " "reasons explained in <xref linkend=\"svn.branchmerge\"/>, your project's " "tree structure should contain three top-level directories named " "<filename>branches</filename>, <filename>tags</filename>, and " "<filename>trunk</filename>. The <filename>trunk</filename> directory should " "contain all of your data, and the <filename>branches</filename> and " "<filename>tags</filename> directories should be empty:" msgstr "" # type: Content of: <appendix><sect1><screen> #: ../en/book/appa-quickstart.xml:183 #, no-wrap msgid "" "\n" "/tmp/myproject/branches/\n" "/tmp/myproject/tags/\n" "/tmp/myproject/trunk/\n" " foo.c\n" " bar.c\n" " Makefile\n" " …\n" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:193 msgid "" "The <filename>branches</filename>, <filename>tags</filename>, and " "<filename>trunk</filename> subdirectories aren't actually required by " "Subversion. They're merely a popular convention that you'll most likely " "want to use later on." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:198 msgid "" "Once you have your tree of data ready to go, import it into the repository " "with the <command>svn import</command> command (see <xref linkend=\"svn.tour." "importing\"/>):" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/appa-quickstart.xml:202 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svnadmin create /var/svn/newrepos\n" #| "$ svn import mytree file:///var/svn/newrepos/some/project \\\n" #| " -m \"Initial import\"\n" #| "Adding mytree/foo.c\n" #| "Adding mytree/bar.c\n" #| "Adding mytree/subdir\n" #| "Adding mytree/subdir/quux.h\n" #| "\n" #| "Committed revision 1.\n" msgid "" "\n" "$ svn import /tmp/myproject file:///var/svn/repos/myproject -m \"initial import\"\n" "Adding /tmp/myproject/branches\n" "Adding /tmp/myproject/tags\n" "Adding /tmp/myproject/trunk\n" "Adding /tmp/myproject/trunk/foo.c\n" "Adding /tmp/myproject/trunk/bar.c\n" "Adding /tmp/myproject/trunk/Makefile\n" "…\n" "Committed revision 1.\n" "$ \n" msgstr "" "\n" "$ svnadmin create /var/svn/newrepos\n" "$ svn import mytree file:///var/svn/newrepos/some/project \\\n" " -m \"Initial import\"\n" "Adding mytree/foo.c\n" "Adding mytree/bar.c\n" "Adding mytree/subdir\n" "Adding mytree/subdir/quux.h\n" "\n" "Committed revision 1.\n" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:215 msgid "" "Now the repository contains this tree of data. As mentioned earlier, you " "won't see your files by directly peeking into the repository; they're all " "stored within a database. But the repository's imaginary filesystem now " "contains a top-level directory named <filename>myproject</filename>, which " "in turn contains your data." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:222 msgid "" "Note that the original <filename>/tmp/myproject</filename> directory is " "unchanged; Subversion is unaware of it. (In fact, you can even delete that " "directory if you wish.) To start manipulating repository data, you need to " "create a new <quote>working copy</quote> of the data, a sort of private " "workspace. Ask Subversion to <quote>check out</quote> a working copy of the " "<filename>myproject/trunk</filename> directory in the repository:" msgstr "" # type: Content of: <appendix><sect1><screen> #: ../en/book/appa-quickstart.xml:231 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos/myproject/trunk myproject\n" "A myproject/foo.c\n" "A myproject/bar.c\n" "A myproject/Makefile\n" "…\n" "Checked out revision 1.\n" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:240 msgid "" "Now you have a personal copy of part of the repository in a new directory " "named <filename>myproject</filename>. You can edit the files in your " "working copy and then commit those changes back into the repository." msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appa-quickstart.xml:247 msgid "Enter your working copy and edit a file's contents." msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appa-quickstart.xml:251 msgid "" "Run <userinput>svn diff</userinput> to see unified diff output of your " "changes." msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appa-quickstart.xml:255 msgid "" "Run <userinput>svn commit</userinput> to commit the new version of your file " "to the repository." msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appa-quickstart.xml:259 msgid "" "Run <userinput>svn update</userinput> to bring your working copy <quote>up " "to date</quote> with the repository." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:264 msgid "" "For a full tour of all the things you can do with your working copy, read " "<xref linkend=\"svn.tour\"/>." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appa-quickstart.xml:267 msgid "" "At this point, you have the option of making your repository available to " "others over a network. See <xref linkend=\"svn.serverconfig\"/> to learn " "about the different sorts of server processes available and how to configure " "them." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/appb-svn-for-cvs-users.xml:2 #, fuzzy #| msgid "Subversion Repository URLs" msgid "Subversion for CVS Users" msgstr "Subversion-Repository-URLs" # type: Content of: <appendix><para> #: ../en/book/appb-svn-for-cvs-users.xml:4 msgid "" "This appendix is a guide for CVS users new to Subversion. It's essentially " "a list of differences between the two systems as <quote>viewed from 10,000 " "feet.</quote> For each section, we provide references to relevant chapters " "when possible." msgstr "" # type: Content of: <appendix><para> #: ../en/book/appb-svn-for-cvs-users.xml:10 msgid "" "Although the goal of Subversion is to take over the current and future CVS " "user base, some new features and design changes were required to fix certain " "<quote>broken</quote> behaviors that CVS had. This means that, as a CVS " "user, you may need to break habits—ones that you forgot were odd to " "begin with." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:22 msgid "Revision Numbers Are Different Now" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:24 msgid "" "In CVS, revision numbers are per file. This is because CVS stores its data " "in RCS files; each file has a corresponding RCS file in the repository, and " "the repository is roughly laid out according to the structure of your " "project tree." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:29 msgid "" "In Subversion, the repository looks like a single filesystem. Each commit " "results in an entirely new filesystem tree; in essence, the repository is an " "array of trees. Each of these trees is labeled with a single revision " "number. When someone talks about <quote>revision 54</quote>, he's talking " "about a particular tree (and indirectly, the way the filesystem looked after " "the 54th commit)." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:37 msgid "" "Technically, it's not valid to talk about <quote>revision 5 of <filename>foo." "c</filename>.</quote> Instead, one would say <quote><filename>foo.c</" "filename> as it appears in revision 5.</quote> Also, be careful when making " "assumptions about the evolution of a file. In CVS, revisions 5 and 6 of " "<filename>foo.c</filename> are always different. In Subversion, it's most " "likely that <filename>foo.c</filename> did <emphasis>not</emphasis> change " "between revisions 5 and 6." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:47 msgid "" "Similarly, in CVS, a tag or branch is an annotation on the file or on the " "version information for that individual file, whereas in Subversion, a tag " "or branch is a copy of an entire tree (by convention, into the <filename>/" "branches</filename> or <filename>/tags</filename> directories that appear at " "the top level of the repository, beside <filename>/trunk</filename>). In the " "repository as a whole, many versions of each file may be visible: the latest " "version on each branch, every tagged version, and of course the latest " "version on the trunk itself. So, to refine the terms even further, one would " "often say <quote><filename>foo.c</filename> as it appears in <filename>/" "branches/REL1</filename> in revision 5.</quote>" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:61 msgid "" "For more details on this topic, see <xref linkend=\"svn.basic.in-action.revs" "\" />." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:70 msgid "Directory Versions" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:72 msgid "" "Subversion tracks tree structures, not just file contents. It's one of the " "biggest reasons Subversion was written to replace CVS." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:76 msgid "Here's what this means to you, as a former CVS user:" msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:80 msgid "" "The <command>svn add</command> and <command>svn delete</command> commands " "work on directories now, just as they work on files. So do <command>svn " "copy</command> and <command>svn move</command>. However, these commands do " "<emphasis>not</emphasis> cause any kind of immediate change in the " "repository. Instead, the working items are simply <quote>scheduled</quote> " "for addition or deletion. No repository changes happen until you run " "<userinput>svn commit</userinput>." msgstr "" # type: Content of: <appendix><sect1><itemizedlist><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:91 msgid "" "Directories aren't dumb containers anymore; they have revision numbers like " "files. (Or more properly, it's correct to talk about <quote>directory " "<filename>foo/</filename> in revision 5.</quote>)" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:98 msgid "" "Let's talk more about that last point. Directory versioning is a hard " "problem; because we want to allow mixed-revision working copies, there are " "some limitations on how far we can abuse this model." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:103 msgid "" "From a theoretical point of view, we define <quote>revision 5 of directory " "<filename>foo</filename></quote> to mean a specific collection of directory " "entries and properties. Now suppose we start adding and removing files from " "<filename>foo</filename>, and then commit. It would be a lie to say that we " "still have revision 5 of <filename>foo</filename>. However, if we bumped " "<filename>foo</filename>'s revision number after the commit, that would be a " "lie too; there may be other changes to <filename>foo</filename> we haven't " "yet received, because we haven't updated yet." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:115 msgid "" "Subversion deals with this problem by quietly tracking committed adds and " "deletes in the <filename>.svn</filename> area. When you eventually run " "<userinput>svn update</userinput>, all accounts are settled with the " "repository, and the directory's new revision number is set correctly. " "<emphasis>Therefore, only after an update is it truly safe to say that you " "have a <quote>perfect</quote> revision of a directory.</emphasis> Most of " "the time, your working copy will contain <quote>imperfect</quote> directory " "revisions." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:125 msgid "" "Similarly, a problem arises if you attempt to commit property changes on a " "directory. Normally, the commit would bump the working directory's local " "revision number. But again, that would be a lie, as there may be adds or " "deletes that the directory doesn't yet have, because no update has " "happened. <emphasis>Therefore, you are not allowed to commit property " "changes on a directory unless the directory is up to date.</emphasis>" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:134 msgid "" "For more discussion about the limitations of directory versioning, see <xref " "linkend=\"svn.basic.in-action.mixedrevs\"/>." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:144 msgid "More Disconnected Operations" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:146 msgid "" "In recent years, disk space has become outrageously cheap and abundant, but " "network bandwidth has not. Therefore, the Subversion working copy has been " "optimized around the scarcer resource." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:151 msgid "" "The <filename>.svn</filename> administrative directory serves the same " "purpose as the <filename>CVS</filename> directory, except that it also " "stores read-only, <quote>pristine</quote> copies of your files. This allows " "you to do many things offline:" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:160 #: ../en/book/ch02-basic-usage.xml:415 msgid "<command>svn status</command>" msgstr "<command>svn status</command>" # type: Content of: <appendix><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:162 msgid "" "Shows you any local changes you've made (see <xref linkend=\"svn.tour.cycle." "examine.status\"/>)" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:168 #: ../en/book/ch02-basic-usage.xml:418 ../en/book/ch02-basic-usage.xml:1736 msgid "<command>svn diff</command>" msgstr "<command>svn diff</command>" # type: Content of: <appendix><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:170 msgid "" "Shows you the details of your changes (see <xref linkend=\"svn.tour.cycle." "examine.diff\"/>)" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:176 #: ../en/book/ch02-basic-usage.xml:427 msgid "<command>svn revert</command>" msgstr "<command>svn revert</command>" # type: Content of: <appendix><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:178 msgid "" "Removes your local changes (see <xref linkend=\"svn.tour.cycle.revert\"/>)" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:185 msgid "" "Also, the cached pristine files allow the Subversion client to send " "differences when committing, which CVS cannot do." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:188 msgid "" "The last subcommand in the list—<command>svn revert</command>—is " "new. It will not only remove local changes, but also unschedule operations " "such as adds and deletes. Although deleting the file and then running " "<userinput>svn update</userinput> will still work, doing so distorts the " "true purpose of updating. And, while we're on this subject…" msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:203 msgid "Distinction Between Status and Update" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:205 msgid "" "Subversion attempts to erase a lot of the confusion between the <command>cvs " "status</command> and <command>cvs update</command> commands." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:209 msgid "" "The <command>cvs status</command> command has two purposes: first, to show " "the user any local modifications in the working copy, and second, to show " "the user which files are out of date. Unfortunately, because of CVS's hard-" "to-read status output, many CVS users don't take advantage of this command " "at all. Instead, they've developed a habit of running <userinput>cvs " "update</userinput> or <userinput>cvs -n update</userinput> to quickly see " "their changes. If users forget to use the <option>-n</option> option, this " "has the side effect of merging repository changes they may not be ready to " "deal with." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:221 msgid "" "Subversion removes this muddle by making the output of <command>svn status</" "command> easy to read for both humans and parsers. Also, <command>svn " "update</command> prints only information about files that are updated, " "<emphasis>not</emphasis> local modifications." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:228 #: ../en/book/ch09-reference.xml:8969 msgid "Status" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:230 msgid "" "<command>svn status</command> prints all files that have local " "modifications. By default, the repository is not contacted. While this " "subcommand accepts a fair number of options, the following are the most " "commonly used ones:" msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:237 msgid "<option>-u</option>" msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:239 msgid "" "Contact the repository to determine, and then display, out-of-dateness " "information." msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:245 msgid "<option>-v</option>" msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:247 msgid "Show <emphasis>all</emphasis> entries under version control." msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:253 msgid "<option>-N</option>" msgstr "" # type: Content of: <appendix><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/appb-svn-for-cvs-users.xml:255 msgid "Run nonrecursively (do not descend into subdirectories)." msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:261 msgid "" "The <command>svn status</command> command has two output formats. In the " "default <quote>short</quote> format, local modifications look like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/appb-svn-for-cvs-users.xml:265 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn status stuff/fish.c\n" #| "D stuff/fish.c\n" msgid "" "\n" "$ svn status\n" "M foo.c\n" "M bar/baz.c\n" msgstr "" "\n" "$ svn status stuff/fish.c\n" "D stuff/fish.c\n" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:271 msgid "" "If you specify the <option>--show-updates</option> (<option>-u</option>) " "option, a longer output format is used:" msgstr "" # type: Content of: <appendix><sect1><sect2><screen> #: ../en/book/appb-svn-for-cvs-users.xml:275 #, no-wrap msgid "" "\n" "$ svn status -u\n" "M 1047 foo.c\n" " * 1045 faces.html\n" " * bloo.png\n" "M 1050 bar/baz.c\n" "Status against revision: 1066\n" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:284 msgid "" "In this case, two new columns appear. The second column contains an " "asterisk if the file or directory is out of date. The third column shows " "the working copy's revision number of the item. In the previous example, " "the asterisk indicates that <filename>faces.html</filename> would be patched " "if we updated, and that <filename>bloo.png</filename> is a newly added file " "in the repository. (The absence of any revision number next to " "<filename>bloo.png</filename> means that it doesn't yet exist in the working " "copy.)" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:302 msgid "" "At this point, you should take a quick look at the list of all possible " "status codes in <xref linkend=\"svn.ref.svn.c.status\"/>. Here are a few of " "the more common status codes you'll see:" msgstr "" # type: Content of: <appendix><sect1><sect2><screen> #: ../en/book/appb-svn-for-cvs-users.xml:307 #, no-wrap msgid "" "\n" "A Resource is scheduled for Addition\n" "D Resource is scheduled for Deletion\n" "M Resource has local Modifications\n" "C Resource has Conflicts (changes have not been completely merged\n" " between the repository and working copy version)\n" "X Resource is eXternal to this working copy (may come from another\n" " repository). See <xref linkend=\"svn.advanced.externals\" />\n" "? Resource is not under version control\n" "! Resource is missing or incomplete (removed by a tool other than\n" " Subversion)\n" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:320 msgid "" "For a more detailed discussion of <command>svn status</command>, see <xref " "linkend=\"svn.tour.cycle.examine.status\" />." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:326 #: ../en/book/ch09-reference.xml:8991 msgid "Update" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:328 msgid "" "<command>svn update</command> updates your working copy, and prints only " "information about files that it updates." msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:331 msgid "" "Subversion has combined CVS's <literal>P</literal> and <literal>U</literal> " "codes into just <literal>U</literal>. When a merge or conflict occurs, " "Subversion simply prints <literal>G</literal> or <literal>C</literal>, " "rather than a whole sentence about it." msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appb-svn-for-cvs-users.xml:337 msgid "" "For a more detailed discussion of <command>svn update</command>, see <xref " "linkend=\"svn.tour.cycle.update\" />." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:348 msgid "Branches and Tags" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:350 msgid "" "Subversion doesn't distinguish between filesystem space and <quote>branch</" "quote> space; branches and tags are ordinary directories within the " "filesystem. This is probably the single biggest mental hurdle that a CVS " "user will need to cross. Read all about it in <xref linkend=\"svn." "branchmerge\"/>." msgstr "" # type: Content of: <appendix><sect1><warning><para><footnote> #: ../en/book/appb-svn-for-cvs-users.xml:358 msgid "" "Since Subversion treats branches and tags as ordinary directories, your " "project's various lines of development probably live in subdirectories of " "the main project directory. So remember to check out using the URL of the " "subdirectory that contains the particular line of development you want, not " "the project's root URL. If you make the mistake of checking out the root of " "the project, you may very well wind up with a working copy that contains a " "complete copy of your project's content for each and every one of its " "branches and tags. <footnote>" msgstr "" # type: Content of: <appendix><sect1><warning><para><footnote><para> #: ../en/book/appb-svn-for-cvs-users.xml:368 msgid "" "That is, providing you don't run out of disk space before your checkout " "finishes." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:381 msgid "Metadata Properties" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:383 msgid "" "A new feature of Subversion is that you can attach arbitrary metadata (or " "<quote>properties</quote>) to files and directories. Properties are " "arbitrary name/value pairs associated with files and directories in your " "working copy." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:389 msgid "" "To set or get a property name, use the <command>svn propset</command> and " "<command>svn propget</command> subcommands. To list all properties on an " "object, use <command>svn proplist</command>." msgstr "" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/appb-svn-for-cvs-users.xml:394 #, fuzzy #| msgid "<xref linkend=\"svn.advanced\"/>" msgid "For more information, see <xref linkend=\"svn.advanced.props\"/>." msgstr "<xref linkend=\"svn.advanced\"/>" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/appb-svn-for-cvs-users.xml:402 #, fuzzy #| msgid "Postponing conflict resolution" msgid "Conflict Resolution" msgstr "Aufschieben der Konfliktauflösung" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:404 msgid "" "CVS marks conflicts with inline <quote>conflict markers,</quote> and then " "prints a <literal>C</literal> during an update or merge operation. " "Historically, this has caused problems, because CVS isn't doing enough. " "Many users forget about (or don't see) the <literal>C</literal> after it " "whizzes by on their terminal. They often forget that the conflict markers " "are even present, and then accidentally commit files containing those " "conflict markers." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:413 msgid "" "Subversion solves this problem in a pair of ways. First, when a conflict " "occurs in a file, Subversion records the fact that the file is in a state of " "conflict, and won't allow you to commit changes to that file until you " "explicitly resolve the conflict. Second, Subversion 1.5 provides " "interactive conflict resolution, which allows you to resolve conflicts as " "they happen instead of having to go back and do so after the update or merge " "operation completes. See <xref linkend=\"svn.tour.cycle.resolve\" /> for " "more about conflict resolution in Subversion." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:430 msgid "Binary Files and Translation" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:432 msgid "" "In the most general sense, Subversion handles binary files more gracefully " "than CVS does. Because CVS uses RCS, it can only store successive full " "copies of a changing binary file. Subversion, however, expresses " "differences between files using a binary differencing algorithm, regardless " "of whether they contain textual or binary data. That means all files are " "stored differentially (compressed) in the repository." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:440 msgid "" "CVS users have to mark binary files with <option>-kb</option> flags to " "prevent data from being garbled (due to keyword expansion and line-ending " "translations). They sometimes forget to do this." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:445 msgid "" "Subversion takes the more paranoid route. First, it never performs any kind " "of keyword or line-ending translation unless you explicitly ask it to do so " "(see <xref linkend=\"svn.advanced.props.special.keywords\"/> and <xref " "linkend=\"svn.advanced.props.special.eol-style\"/> for more details). By " "default, Subversion treats all file data as literal byte strings, and files " "are always stored in the repository in an untranslated state." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:454 msgid "" "Second, Subversion maintains an internal notion of whether a file is " "<quote>text</quote> or <quote>binary</quote> data, but this notion is " "<emphasis>only</emphasis> extant in the working copy. During an " "<command>svn update</command>, Subversion will perform contextual merges on " "locally modified text files, but will not attempt to do so for binary files." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:461 msgid "" "To determine whether a contextual merge is possible, Subversion examines the " "<literal>svn:mime-type</literal> property. If the file has no <literal>svn:" "mime-type</literal> property, or has a MIME type that is textual (e.g., " "<literal>text/*</literal>), Subversion assumes it is text. Otherwise, " "Subversion assumes the file is binary. Subversion also helps users by " "running a binary-detection algorithm in the <command>svn import</command> " "and <command>svn add</command> commands. These commands will make a good " "guess and then (possibly) set a binary <literal>svn:mime-type</literal> " "property on the file being added. (If Subversion guesses wrong, the user " "can always remove or hand-edit the property.)" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:482 #, fuzzy #| msgid "Versioning Models" msgid "Versioned Modules" msgstr "Versionierungsmodelle" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:484 msgid "" "Unlike CVS, a Subversion working copy is aware that it has checked out a " "module. That means if somebody changes the definition of a module (e.g., " "adds or removes components), a call to <command>svn update</command> will " "update the working copy appropriately, adding and removing components." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:490 msgid "" "Subversion defines modules as a list of directories within a directory " "property; see <xref linkend=\"svn.advanced.externals\"/>." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:500 msgid "Authentication" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:502 msgid "" "With CVS's pserver, you are required to log in to the server (using the " "<command>cvs login</command> command) before performing any read or write " "operation—you sometimes even have to log in for anonymous operations. " "With a Subversion repository using Apache <command>httpd</command> or " "<command>svnserve</command> as the server, you don't provide any " "authentication credentials at the outset—if an operation that you " "perform requires authentication, the server will challenge you for your " "credentials (whether those credentials are username and password, a client " "certificate, or even both). So if your repository is world-readable, you " "will not be required to authenticate at all for read operations." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:515 msgid "" "As with CVS, Subversion still caches your credentials on disk (in your " "<filename>~/.subversion/auth/</filename> directory) unless you tell it not " "to by using the <option>--no-auth-cache</option> option." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:520 msgid "" "The exception to this behavior, however, is in the case of accessing an " "<command>svnserve</command> server over an SSH tunnel, using the <literal>svn" "+ssh://</literal> URL scheme. In that case, the <command>ssh</command> " "program unconditionally demands authentication just to start the tunnel." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appb-svn-for-cvs-users.xml:533 msgid "Converting a Repository from CVS to Subversion" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:535 msgid "" "Perhaps the most important way to familiarize CVS users with Subversion is " "to let them continue to work on their projects using the new system. And " "while that can be somewhat accomplished using a flat import into a " "Subversion repository of an exported CVS repository, the more thorough " "solution involves transferring not just the latest snapshot of their data, " "but all the history behind it as well, from one system to another. This is " "an extremely difficult problem to solve; it involves deducing changesets in " "the absence of atomicity and translating between the systems' completely " "orthogonal branching policies, among other complications. Still, a handful " "of tools claim to at least partially support the ability to convert existing " "CVS repositories into Subversion ones." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appb-svn-for-cvs-users.xml:549 msgid "" "The most popular (and mature) conversion tool is cvs2svn (<ulink url=" "\"http://cvs2svn.tigris.org/\"/>), a Python script originally created by " "members of Subversion's own development community. This tool is meant to " "run exactly once: it scans your CVS repository multiple times and attempts " "to deduce commits, branches, and tags as best it can. When it finishes, the " "result is either a Subversion repository or a portable Subversion dump file " "representing your code's history. See the web site for detailed " "instructions and caveats." msgstr "" # type: Content of: <appendix><title> #: ../en/book/appc-webdav.xml:2 msgid "WebDAV and Autoversioning" msgstr "" # type: Content of: <appendix><para> #: ../en/book/appc-webdav.xml:4 msgid "" "WebDAV is an extension to HTTP, and it is growing more and more popular as a " "standard for file sharing. Today's operating systems are becoming extremely " "web-aware, and many now have built-in support for mounting <quote>shares</" "quote> exported by WebDAV servers." msgstr "" # type: Content of: <appendix><para> #: ../en/book/appc-webdav.xml:10 msgid "" "If you use Apache as your Subversion network server, to some extent you are " "also running a WebDAV server. This appendix gives some background on the " "nature of this protocol, how Subversion uses it, and how well Subversion " "interoperates with other software that is WebDAV-aware." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appc-webdav.xml:21 msgid "What Is WebDAV?" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:23 msgid "" "<firstterm>DAV</firstterm> stands for <quote>Distributed Authoring and " "Versioning.</quote> RFC 2518 defines a set of concepts and accompanying " "extension methods to HTTP 1.1 that make the Web a more universal read/write " "medium. The basic idea is that a WebDAV-compliant web server can act like a " "generic file server; clients can <quote>mount</quote> shared folders over " "HTTP that behave much like other network filesystems (such as NFS or SMB)." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:32 msgid "" "The tragedy, though, is that despite the acronym, the RFC specification " "doesn't actually describe any sort of version control. Basic WebDAV clients " "and servers assume that only one version of each file or directory exists, " "and that it can be repeatedly overwritten." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:38 msgid "" "Because RFC 2518 left out versioning concepts, another committee was left " "with the responsibility of writing RFC 3253 a few years later. The new RFC " "adds versioning concepts to WebDAV, placing the <quote>V</quote> back in " "<quote>DAV</quote>—hence the term <quote>DeltaV.</quote> WebDAV/DeltaV " "clients and servers are often called just <quote>DeltaV</quote> programs, " "since DeltaV implies the existence of basic WebDAV." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:47 msgid "" "The original WebDAV standard has been widely successful. Every modern " "computer operating system has a general WebDAV client built in (details to " "follow), and a number of popular standalone applications are also able to " "speak WebDAV—Microsoft Office, Dreamweaver, and Photoshop, to name a " "few. On the server end, Apache HTTP Server has been able to provide WebDAV " "services since 1998 and is considered the de facto open source standard. " "Several other commercial WebDAV servers are available, including Microsoft's " "own IIS." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:58 msgid "" "DeltaV, unfortunately, has not been so successful. It's very difficult to " "find any DeltaV clients or servers. The few that do exist are relatively " "unknown commercial products, and thus it's very difficult to test " "interoperability. It's not entirely clear as to why DeltaV has remained " "stagnant. Some opine that the specification is just too complex. Others " "argue that while WebDAV's features have mass appeal (even the least " "technical users appreciate network file sharing), its version control " "features just aren't interesting or necessary for most users. Finally, some " "believe that DeltaV remains unpopular because there's still no open source " "server product that implements it well." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:71 msgid "" "When Subversion was still in its design phase, it seemed like a great idea " "to use Apache as a network server. It already had a module to provide " "WebDAV services. DeltaV was a relatively new specification. The hope was " "that the Subversion server module (<command>mod_dav_svn</command>) would " "eventually evolve into an open source DeltaV reference implementation. " "Unfortunately, DeltaV has a very specific versioning model that doesn't " "quite line up with Subversion's model. Some concepts were mappable; others " "were not." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:81 msgid "What does this mean, then?" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:83 msgid "" "First, the Subversion client is not a fully implemented DeltaV client. It " "needs certain types of things from the server that DeltaV itself cannot " "provide, and thus is largely dependent on a number of Subversion-specific " "HTTP <literal>REPORT</literal> requests that only <command>mod_dav_svn</" "command> understands." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:90 msgid "" "Second, <command>mod_dav_svn</command> is not a fully realized DeltaV " "server. Many portions of the DeltaV specification were irrelevant to " "Subversion, and thus were left unimplemented." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:95 msgid "" "There is still some debate in the developer community as to whether or not " "it's worthwhile to remedy either of these situations. It's fairly " "unrealistic to change Subversion's design to match DeltaV, so there's " "probably no way the client can ever learn to get everything it needs from a " "general DeltaV server. On the other hand, <command>mod_dav_svn</command> " "<emphasis>could</emphasis> be further developed to implement all of DeltaV, " "but it's hard to find motivation to do so—there are almost no DeltaV " "clients to interoperate with." msgstr "" # type: Content of: <preface><sect1><sect2><para><indexterm><primary> #: ../en/book/appc-webdav.xml:112 #, fuzzy #| msgid "Subversion" msgid "Autoversioning" msgstr "Subversion" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:114 msgid "" "While the Subversion client is not a full DeltaV client, and the Subversion " "server is not a full DeltaV server, there's still a glimmer of WebDAV " "interoperability to be happy about: <firstterm>autoversioning</firstterm>." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:119 msgid "" "Autoversioning is an optional feature defined in the DeltaV standard. A " "typical DeltaV server will reject an ignorant WebDAV client attempting to do " "a <literal>PUT</literal> to a file that's under version control. To change " "a version-controlled file, the server expects a series of proper versioning " "requests: something like <literal>MKACTIVITY</literal>, <literal>CHECKOUT</" "literal>, <literal>PUT</literal>, <literal>CHECKIN</literal>. But if the " "DeltaV server supports autoversioning, write requests from basic WebDAV " "clients are accepted. The server behaves as though the client " "<emphasis>had</emphasis> issued the proper series of versioning requests, " "performing a commit under the hood. In other words, it allows a DeltaV " "server to interoperate with ordinary WebDAV clients that don't understand " "versioning." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:134 msgid "" "Because so many operating systems already have integrated WebDAV clients, " "the use case for this feature can be incredibly appealing to administrators " "working with non-technical users. Imagine an office of ordinary users " "running Microsoft Windows or Mac OS. Each user <quote>mounts</quote> the " "Subversion repository, which appears to be an ordinary network folder. They " "use the shared folder as they always do: open files, edit them, and save " "them. Meanwhile, the server is automatically versioning everything. Any " "administrator (or knowledgeable user) can still use a Subversion client to " "search history and retrieve older versions of data." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:146 msgid "" "This scenario isn't fiction—it's real and it works, as of Subversion " "1.2 and later. To activate autoversioning in <command>mod_dav_svn</" "command>, use the <literal>SVNAutoversioning</literal> directive within the " "<filename>httpd.conf</filename> <literal>Location</literal> block, like so:" msgstr "" # type: Content of: <appendix><sect1><screen> #: ../en/book/appc-webdav.xml:153 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNPath /var/svn/repository\n" " SVNAutoversioning on\n" "</Location>\n" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:161 msgid "" "When Subversion autoversioning is active, write requests from WebDAV clients " "result in automatic commits. A generic log message is automatically " "generated and attached to each revision." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:166 msgid "" "Before activating this feature, however, understand what you're getting " "into. WebDAV clients tend to do <emphasis>many</emphasis> write requests, " "resulting in a huge number of automatically committed revisions. For " "example, when saving data, many clients will do a <literal>PUT</literal> of " "a 0-byte file (as a way of reserving a name) followed by another " "<literal>PUT</literal> with the real file data. The single file-write " "results in two separate commits. Also consider that many applications auto-" "save every few minutes, resulting in even more commits." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:177 msgid "" "If you have a post-commit hook program that sends email, you may want to " "disable email generation either altogether or on certain sections of the " "repository; it depends on whether you think the influx of emails will still " "prove to be valuable notifications or not. Also, a smart post-commit hook " "program can distinguish between a transaction created via autoversioning and " "one created through a normal Subversion commit operation. The trick is to " "look for a revision property named <literal>svn:autoversioned</literal>. If " "present, the commit was made by a generic WebDAV client." msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:188 msgid "" "Another feature that may be a useful complement for Subversion's " "autoversioning comes from Apache's <literal>mod_mime</literal> module. If a " "WebDAV client adds a new file to the repository, there's no opportunity for " "the user to set the the <literal>svn:mime-type</literal> property. This " "might cause the file to appear as a generic icon when viewed within a WebDAV " "shared folder, not having an association with any application. One remedy " "is to have a sysadmin (or other Subversion-knowledgeable person) check out a " "working copy and manually set the <literal>svn:mime-type</literal> property " "on necessary files. But there's potentially no end to such cleanup tasks. " "Instead, you can use the <literal>ModMimeUsePathInfo</literal> directive in " "your Subversion <literal><Location></literal> block:" msgstr "" # type: Content of: <appendix><sect1><screen> #: ../en/book/appc-webdav.xml:203 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNPath /var/svn/repository\n" " SVNAutoversioning on\n" "\n" " ModMimeUsePathInfo on\n" "\n" "</Location>\n" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:214 msgid "" "This directive allows <literal>mod_mime</literal> to attempt automatic " "deduction of the MIME type on new files that enter the repository via " "autoversioning. The module looks at the file's named extension and possibly " "the contents as well; if the file matches some common patterns, the file's " "<literal>svn:mime-type</literal> property will be set automatically." msgstr "" # type: Content of: <appendix><sect1><title> #: ../en/book/appc-webdav.xml:228 msgid "Client Interoperability" msgstr "" # type: Content of: <appendix><sect1><para> #: ../en/book/appc-webdav.xml:230 msgid "" "All WebDAV clients fall into one of three categories—standalone " "applications, file-explorer extensions, or filesystem implementations. " "These categories broadly define the types of WebDAV functionality available " "to users. <xref linkend=\"svn.webdav.clients.tbl-1\"/> gives our " "categorization as well as a quick description of some common pieces of " "WebDAV-enabled software. You can find more details about these software " "offerings, as well as their general category, in the sections that follow." msgstr "" # type: Content of: <appendix><sect1><table><title> #: ../en/book/appc-webdav.xml:241 msgid "Common WebDAV clients" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><thead><row><entry> #: ../en/book/appc-webdav.xml:245 msgid "Software" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><thead><row><entry> #: ../en/book/appc-webdav.xml:246 msgid "Type" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><thead><row><entry> #: ../en/book/appc-webdav.xml:247 msgid "Windows" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><thead><row><entry> #: ../en/book/appc-webdav.xml:248 msgid "Mac" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><thead><row><entry> #: ../en/book/appc-webdav.xml:249 msgid "Linux" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/appc-webdav.xml:250 ../en/book/ch09-reference.xml:731 #: ../en/book/ch09-reference.xml:840 ../en/book/ch09-reference.xml:976 #: ../en/book/ch09-reference.xml:1057 ../en/book/ch09-reference.xml:1151 #: ../en/book/ch09-reference.xml:1298 ../en/book/ch09-reference.xml:1375 #: ../en/book/ch09-reference.xml:1516 ../en/book/ch09-reference.xml:1721 #: ../en/book/ch09-reference.xml:1835 ../en/book/ch09-reference.xml:2158 #: ../en/book/ch09-reference.xml:2272 ../en/book/ch09-reference.xml:2322 #: ../en/book/ch09-reference.xml:2429 ../en/book/ch09-reference.xml:2615 #: ../en/book/ch09-reference.xml:2758 ../en/book/ch09-reference.xml:2852 #: ../en/book/ch09-reference.xml:3164 ../en/book/ch09-reference.xml:3310 #: ../en/book/ch09-reference.xml:3383 ../en/book/ch09-reference.xml:3466 #: ../en/book/ch09-reference.xml:3596 ../en/book/ch09-reference.xml:3675 #: ../en/book/ch09-reference.xml:3752 ../en/book/ch09-reference.xml:3850 #: ../en/book/ch09-reference.xml:3954 ../en/book/ch09-reference.xml:4090 #: ../en/book/ch09-reference.xml:4222 ../en/book/ch09-reference.xml:4316 #: ../en/book/ch09-reference.xml:4428 ../en/book/ch09-reference.xml:4875 #: ../en/book/ch09-reference.xml:5068 ../en/book/ch09-reference.xml:5156 #: ../en/book/ch09-reference.xml:5523 ../en/book/ch09-reference.xml:5571 #: ../en/book/ch09-reference.xml:5650 ../en/book/ch09-reference.xml:5690 #: ../en/book/ch09-reference.xml:5792 ../en/book/ch09-reference.xml:5824 #: ../en/book/ch09-reference.xml:5877 ../en/book/ch09-reference.xml:5910 #: ../en/book/ch09-reference.xml:5958 ../en/book/ch09-reference.xml:6024 #: ../en/book/ch09-reference.xml:6078 ../en/book/ch09-reference.xml:6124 #: ../en/book/ch09-reference.xml:6201 ../en/book/ch09-reference.xml:6246 #: ../en/book/ch09-reference.xml:6301 ../en/book/ch09-reference.xml:6362 #: ../en/book/ch09-reference.xml:6418 ../en/book/ch09-reference.xml:6473 #: ../en/book/ch09-reference.xml:6540 ../en/book/ch09-reference.xml:6712 #: ../en/book/ch09-reference.xml:6758 ../en/book/ch09-reference.xml:6816 #: ../en/book/ch09-reference.xml:6940 ../en/book/ch09-reference.xml:6986 #: ../en/book/ch09-reference.xml:7058 ../en/book/ch09-reference.xml:7104 #: ../en/book/ch09-reference.xml:7144 ../en/book/ch09-reference.xml:7207 #: ../en/book/ch09-reference.xml:7258 ../en/book/ch09-reference.xml:7310 #: ../en/book/ch09-reference.xml:7356 ../en/book/ch09-reference.xml:7411 #: ../en/book/ch09-reference.xml:7475 ../en/book/ch09-reference.xml:7535 #: ../en/book/ch09-reference.xml:7578 ../en/book/ch09-reference.xml:7761 #: ../en/book/ch09-reference.xml:7829 ../en/book/ch09-reference.xml:7870 #: ../en/book/ch09-reference.xml:7947 ../en/book/ch09-reference.xml:8303 #: ../en/book/ch09-reference.xml:8367 ../en/book/ch09-reference.xml:8431 #: ../en/book/ch09-reference.xml:8475 ../en/book/ch09-reference.xml:8628 #: ../en/book/ch09-reference.xml:9022 ../en/book/ch09-reference.xml:9327 #: ../en/book/ch09-reference.xml:9390 ../en/book/ch09-reference.xml:9445 #: ../en/book/ch09-reference.xml:9502 ../en/book/ch09-reference.xml:9574 #: ../en/book/ch09-reference.xml:9648 ../en/book/ch09-reference.xml:9707 #: ../en/book/ch09-reference.xml:9765 ../en/book/ch09-reference.xml:9825 msgid "Description" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:255 msgid "Adobe Photoshop" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:256 ../en/book/appc-webdav.xml:265 #: ../en/book/appc-webdav.xml:274 ../en/book/appc-webdav.xml:282 #: ../en/book/appc-webdav.xml:291 msgid "Standalone WebDAV application" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:257 ../en/book/appc-webdav.xml:267 #: ../en/book/appc-webdav.xml:268 ../en/book/appc-webdav.xml:275 #: ../en/book/appc-webdav.xml:276 ../en/book/appc-webdav.xml:277 #: ../en/book/appc-webdav.xml:283 ../en/book/appc-webdav.xml:292 #: ../en/book/appc-webdav.xml:302 ../en/book/appc-webdav.xml:313 #: ../en/book/appc-webdav.xml:322 ../en/book/appc-webdav.xml:330 #: ../en/book/appc-webdav.xml:338 ../en/book/appc-webdav.xml:347 #: ../en/book/appc-webdav.xml:359 msgid "X" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:260 msgid "" "Image editing software, allowing direct opening from, and writing to, WebDAV " "URLs" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:264 msgid "cadaver" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:269 msgid "" "Command-line WebDAV client supporting file transfer, tree, and locking " "operations" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:273 msgid "DAV Explorer" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:278 msgid "Java GUI tool for exploring WebDAV shares" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:281 msgid "Macromedia Dreamweaver" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:286 msgid "" "Web production software able to directly read from and write to WebDAV URLs" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:290 msgid "Microsoft Office" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:295 msgid "" "Office productivity suite with several components able to directly read from " "and write to WebDAV URLs" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:300 ../en/book/appc-webdav.xml:477 msgid "Microsoft Web Folders" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:301 ../en/book/appc-webdav.xml:310 #: ../en/book/appc-webdav.xml:319 msgid "File-explorer WebDAV extension" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:305 msgid "" "GUI file explorer program able to perform tree operations on a WebDAV share" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:309 msgid "GNOME Nautilus" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:314 ../en/book/appc-webdav.xml:323 msgid "GUI file explorer able to perform tree operations on a WebDAV share" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:318 msgid "KDE Konqueror" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:327 ../en/book/appc-webdav.xml:618 msgid "Mac OS X" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:328 ../en/book/appc-webdav.xml:337 #: ../en/book/appc-webdav.xml:346 ../en/book/appc-webdav.xml:356 msgid "WebDAV filesystem implementation" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:332 msgid "Operating system that has built-in support for mounting WebDAV shares." msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:336 msgid "Novell NetDrive" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:341 msgid "" "Drive-mapping program for assigning Windows drive letters to a mounted " "remote WebDAV share" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:345 msgid "SRT WebDrive" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:350 msgid "" "File transfer software, which, among other things, allows the assignment of " "Windows drive letters to a mounted remote WebDAV share" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:355 msgid "davfs2" msgstr "" # type: Content of: <appendix><sect1><table><tgroup><tbody><row><entry> #: ../en/book/appc-webdav.xml:360 msgid "Linux filesystem driver that allows you to mount a WebDAV share" msgstr "" # type: Content of: <appendix><sect1><sect2><title> #: ../en/book/appc-webdav.xml:370 msgid "Standalone WebDAV Applications" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appc-webdav.xml:372 msgid "" "A WebDAV application is a program that speaks WebDAV protocols with a WebDAV " "server. We'll cover some of the most popular programs with this kind of " "WebDAV support." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:378 msgid "Microsoft Office, Dreamweaver, Photoshop" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para><footnote> #: ../en/book/appc-webdav.xml:380 msgid "" "On Windows, several well-known applications contain integrated WebDAV client " "functionality, such as Microsoft's Office, <footnote>" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para><footnote><para> #: ../en/book/appc-webdav.xml:384 msgid "" "WebDAV support was removed from Microsoft Access for some reason, but it " "exists in the rest of the Office suite." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:387 msgid "" "</footnote> Adobe's Photoshop, and Macromedia's Dreamweaver programs. " "They're able to directly open and save to URLs, and tend to make heavy use " "of WebDAV locks when editing a file." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:392 msgid "" "Note that while many of these programs also exist for Mac OS X, they do not " "appear to support WebDAV directly on that platform. In fact, on Mac OS X, " "the <guimenu>File→Open</guimenu> dialog box doesn't allow one to type a " "path or URL at all. It's likely that the WebDAV features were deliberately " "left out of Macintosh versions of these programs, since OS X already " "provides such excellent low-level filesystem support for WebDAV." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:405 msgid "cadaver, DAV Explorer" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:407 msgid "" "cadaver is a bare-bones Unix command-line program for browsing and changing " "WebDAV shares. Like the Subversion client, it uses the neon HTTP " "library—not surprisingly, since both neon and cadaver are written by " "the same author. cadaver is free software (GPL license) and is available at " "<ulink url=\"http://www.webdav.org/cadaver/\"/>." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:415 msgid "" "Using cadaver is similar to using a command-line FTP program, and thus it's " "extremely useful for basic WebDAV debugging. It can be used to upload or " "download files in a pinch, to examine properties, and to copy, move, lock, " "or unlock files:" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><screen> #: ../en/book/appc-webdav.xml:421 #, no-wrap msgid "" "\n" "$ cadaver http://host/repos\n" "dav:/repos/> ls\n" "Listing collection `/repos/': succeeded.\n" "Coll: > foobar 0 May 10 16:19\n" " > playwright.el 2864 May 4 16:18\n" " > proofbypoem.txt 1461 May 5 15:09\n" " > westcoast.jpg 66737 May 5 15:09\n" "\n" "dav:/repos/> put README\n" "Uploading README to `/repos/README':\n" "Progress: [=============================>] 100.0% of 357 bytes succeeded.\n" "\n" "dav:/repos/> get proofbypoem.txt\n" "Downloading `/repos/proofbypoem.txt' to proofbypoem.txt:\n" "Progress: [=============================>] 100.0% of 1461 bytes succeeded.\n" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:439 msgid "" "DAV Explorer is another standalone WebDAV client, written in Java. It's " "under a free Apache-like license and is available at <ulink url=\"http://www." "ics.uci.edu/~webdav/\"/>. It does everything cadaver does, but has the " "advantages of being portable and being a more user-friendly GUI " "application. It's also one of the first clients to support the new WebDAV " "Access Control Protocol (RFC 3744)." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:447 msgid "" "Of course, DAV Explorer's ACL support is useless in this case, since " "<command>mod_dav_svn</command> doesn't support it. The fact that both " "cadaver and DAV Explorer support some limited DeltaV commands isn't " "particularly useful either, since they don't allow <literal>MKACTIVITY</" "literal> requests. But it's not relevant anyway; we're assuming all of " "these clients are operating against an autoversioning repository." msgstr "" # type: Content of: <appendix><sect1><sect2><title> #: ../en/book/appc-webdav.xml:461 msgid "File-Explorer WebDAV Extensions" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appc-webdav.xml:463 msgid "" "Some popular file explorer GUI programs support WebDAV extensions that allow " "a user to browse a DAV share as though it was just another directory on the " "local computer, and to perform basic tree editing operations on the items in " "that share. For example, Windows Explorer is able to browse a WebDAV server " "as a <quote>network place.</quote> Users can drag files to and from the " "desktop, or can rename, copy, or delete files in the usual way. But because " "it's only a feature of the file explorer, the DAV share isn't visible to " "ordinary applications. All DAV interaction must happen through the explorer " "interface." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:479 msgid "" "Microsoft was one of the original backers of the WebDAV specification, and " "first started shipping a client in Windows 98, which was known as Web " "Folders. This client was also shipped in Windows NT 4.0 and Windows 2000." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:484 msgid "" "The original Web Folders client was an extension to Explorer, the main GUI " "program used to browse filesystems. It works well enough. In Windows 98, " "the feature might need to be explicitly installed if Web Folders aren't " "already visible inside My Computer. In Windows 2000, simply add a new " "<quote>network place,</quote> enter the URL, and the WebDAV share will pop " "up for browsing." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:492 msgid "" "With the release of Windows XP, Microsoft started shipping a new " "implementation of Web Folders, known as the WebDAV Mini-Redirector. The new " "implementation is a filesystem-level client, allowing WebDAV shares to be " "mounted as drive letters. Unfortunately, this implementation is incredibly " "buggy. The client usually tries to convert HTTP URLs (<literal>http://host/" "repos</literal>) into UNC share notation (<literal>\\\\host\\repos</" "literal>); it also often tries to use Windows Domain authentication to " "respond to basic-auth HTTP challenges, sending usernames as <literal>HOST" "\\username</literal>. These interoperability problems are severe and are " "documented in numerous places around the Web, to the frustration of many " "users. Even Greg Stein, the original author of Apache's WebDAV module, " "bluntly states that XP Web Folders simply can't operate against an Apache " "server." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:509 msgid "" "Windows Vista's initial implementation of Web Folders seems to be almost the " "same as XP's, so it has the same sort of problems. With luck, Microsoft " "will remedy these issues in a Vista Service Pack." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:514 msgid "" "However, there seem to be workarounds for both XP and Vista that allow Web " "Folders to work against Apache. Users have mostly reported success with " "these techniques, so we'll relay them here." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:519 msgid "" "On Windows XP, you have two options. First, search Microsoft's web site for " "update KB90730, <quote>Software Update for Web Folders.</quote> This may fix " "all your problems. If it doesn't, it seems that the original pre-XP Web " "Folders implementation is still buried within the system. You can unearth " "it by going to Network Places and adding a new network place. When " "prompted, enter the URL of the repository, but <emphasis>include a port " "number</emphasis> in the URL. For example, you should enter " "<userinput>http://host/repos</userinput> as <userinput>http://host:80/repos</" "userinput> instead. Respond to any authentication prompts with your " "Subversion credentials." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:533 msgid "" "On Windows Vista, the same KB90730 update may clear everything up. But " "there may still be other issues. Some users have reported that Vista " "considers all <literal>http://</literal> connections insecure, and thus will " "always fail any authentication challenges from Apache unless the connection " "happens over <literal>https://</literal>. If you're unable to connect to " "the Subversion repository via SSL, you can tweak the system registry to turn " "off this behavior. Just change the value of the <literal>HKEY_LOCAL_MACHINE" "\\SYSTEM\\CurrentControlSet\\Services\\WebClient\\Parameters" "\\BasicAuthLevel</literal> key from <userinput>1</userinput> to " "<userinput>2</userinput>. A final warning: be sure to set up the Web Folder " "to point to the repository's root directory (<filename>/</filename>), rather " "than some subdirectory such as <filename>/trunk</filename>. Vista Web " "Folders seems to work only against repository roots." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:549 msgid "" "In general, while these workarounds may function for you, you might get a " "better overall experience using a third-party WebDAV client such as WebDrive " "or NetDrive." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:557 msgid "Nautilus, Konqueror" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:559 msgid "" "Nautilus is the official file manager/browser for the GNOME desktop (<ulink " "url=\"http://www.gnome.org\"/>), and Konqueror is the manager/browser for " "the KDE desktop (<ulink url=\"http://www.kde.org\"/>). Both of these " "applications have an explorer-level WebDAV client built in, and they operate " "just fine against an autoversioning repository." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:566 msgid "" "In GNOME's Nautilus, select the <guimenuitem>File→Open location</" "guimenuitem> menu item and enter the URL in the dialog box presented. The " "repository should then be displayed like any other filesystem." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:571 msgid "" "In KDE's Konqueror, you need to use the <literal>webdav://</literal> scheme " "when entering the URL in the location bar. If you enter an <literal>http://" "</literal> URL, Konqueror will behave like an ordinary web browser. You'll " "likely see the generic HTML directory listing produced by " "<command>mod_dav_svn</command>. When you enter <userinput>webdav://host/" "repos</userinput> instead of <userinput>http://host/repos</userinput>, " "Konqueror becomes a WebDAV client and displays the repository as a " "filesystem." msgstr "" # type: Content of: <appendix><sect1><sect2><title> #: ../en/book/appc-webdav.xml:587 msgid "WebDAV Filesystem Implementation" msgstr "" # type: Content of: <appendix><sect1><sect2><para> #: ../en/book/appc-webdav.xml:589 msgid "" "The WebDAV filesystem implementation is arguably the best sort of WebDAV " "client. It's implemented as a low-level filesystem module, typically within " "the operating system's kernel. This means that the DAV share is mounted " "like any other network filesystem, similar to mounting an NFS share on Unix " "or attaching an SMB share as a drive letter in Windows. As a result, this " "sort of client provides completely transparent read/write WebDAV access to " "all programs. Applications aren't even aware that WebDAV requests are " "happening." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:602 msgid "WebDrive, NetDrive" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:604 msgid "" "Both WebDrive and NetDrive are excellent commercial products that allow a " "WebDAV share to be attached as drive letters in Windows. As a result, you " "can operate on the contents of these WebDAV-backed pseudodrives as easily as " "you can against real local hard drives, and in the same ways. You can " "purchase WebDrive from South River Technologies (<ulink url=\"http://www." "southrivertech.com\"/>). Novell's NetDrive is freely available online, but " "requires users to have a NetWare license." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:620 msgid "" "Apple's OS X operating system has an integrated filesystem-level WebDAV " "client. From the Finder, select the <guimenuitem>Go→Connect to Server</" "guimenuitem> menu item. Enter a WebDAV URL, and it appears as a disk on the " "desktop, just like any other mounted volume. You can also mount a WebDAV " "share from the Darwin terminal by using the <literal>webdav</literal> " "filesystem type with the <command>mount</command> command:" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><screen> #: ../en/book/appc-webdav.xml:629 #, no-wrap msgid "" "\n" "$ mount -t webdav http://svn.example.com/repos/project /some/mountpoint\n" "$\n" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:634 msgid "" "Note that if your <command>mod_dav_svn</command> is older than version 1.2, " "OS X will refuse to mount the share as read/write; it will appear as read-" "only. This is because OS X insists on locking support for read/write " "shares, and the ability to lock files first appeared in Subversion 1.2." msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:641 msgid "" "Also, OS X's WebDAV client can sometimes be overly sensitive to HTTP " "redirects. If OS X is unable to mount the repository at all, you may need " "to enable the <literal>BrowserMatch</literal> directive in the Apache " "server's <filename>httpd.conf</filename>:" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><screen> #: ../en/book/appc-webdav.xml:647 #, no-wrap msgid "" "\n" "BrowserMatch \"^WebDAVFS/1.[012]\" redirect-carefully\n" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><title> #: ../en/book/appc-webdav.xml:655 msgid "Linux davfs2" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><para> #: ../en/book/appc-webdav.xml:657 msgid "" "Linux davfs2 is a filesystem module for the Linux kernel, whose development " "is organized at <ulink url=\"http://dav.sourceforge.net/\"/>. Once you " "install davfs2, you can mount a WebDAV network share using the usual Linux " "mount command:" msgstr "" # type: Content of: <appendix><sect1><sect2><sect3><screen> #: ../en/book/appc-webdav.xml:663 #, no-wrap msgid "" "\n" "$ mount.davfs http://host/repos /mnt/dav\n" msgstr "" # type: Content of: <book><title> #: ../en/book/book.xml:25 msgid "Version Control with Subversion" msgstr "Version Control with Subversion" # type: Content of: <book><bookinfo><subtitle> #: ../en/book/book.xml:29 msgid "For Subversion 1.5" msgstr "For Subversion 1.5" # type: Content of: <book><bookinfo><subtitle> #: ../en/book/book.xml:33 msgid "(Compiled from &svn.l10n_revision;&svn.version;)" msgstr "(Übersetzt aus der &svn.l10n_revision; &svn.version;)" # type: Content of: <book><bookinfo><pubdate> #: ../en/book/book.xml:62 msgid "(TBA)" msgstr "(TBA)" # type: Content of: <book><bookinfo><copyright><holder> #: ../en/book/book.xml:72 msgid "Ben Collins-Sussman" msgstr "Ben Collins-Sussman" # type: Content of: <book><bookinfo><copyright><holder> #: ../en/book/book.xml:73 msgid "Brian W. Fitzpatrick" msgstr "Brian W. Fitzpatrick" # type: Content of: <book><bookinfo><copyright><holder> #: ../en/book/book.xml:74 msgid "C. Michael Pilato" msgstr "C. Michael Pilato" # type: Content of: <book><bookinfo><legalnotice><para> #: ../en/book/book.xml:77 msgid "" "This work is licensed under the Creative Commons Attribution License. To " "view a copy of this license, visit <ulink url=\"http://creativecommons.org/" "licenses/by/2.0/\"/> or send a letter to Creative Commons, 559 Nathan Abbott " "Way, Stanford, California 94305, USA." msgstr "" "This work is licensed under the Creative Commons Attribution License. To " "view a copy of this license, visit <ulink url=\"http://creativecommons.org/" "licenses/by/2.0/\"/> or send a letter to Creative Commons, 559 Nathan Abbott " "Way, Stanford, California 94305, USA." # type: Content of: <preface><title> #: ../en/book/ch00-preface.xml:2 msgid "Preface" msgstr "Vorwort" # type: Content of: <preface><blockquote><attribution> #: ../en/book/ch00-preface.xml:5 msgid "Greg Hudson, Subversion developer" msgstr "Greg Hudson, Subversion-Entwickler" # type: Content of: <preface><blockquote><para> #: ../en/book/ch00-preface.xml:6 msgid "" "<quote>It is important not to let the perfect become the enemy of the good, " "even when you can agree on what perfect is. Doubly so when you can't. As " "unpleasant as it is to be trapped by past mistakes, you can't make any " "progress by being afraid of your own shadow during design.</quote>" msgstr "" "<quote>Es ist wichtig, die Vollkommenheit nicht zum Feind des Guten werden " "zu lassen, selbst dann, wenn darüber Einigkeit besteht, was Vollkommenheit " "ist. Erst recht, wenn man sich nicht darüber einig ist. So unangenehm es " "ist, durch vergangene Fehler gefangen zu sein, kann man während des Entwurfs " "keinen Fortschritt erzielen, wenn man Angst vor dem eigenen Schatten hat.</" "quote>" # type: Content of: <preface><sect1><sect2><para><indexterm> #: ../en/book/ch00-preface.xml:14 ../en/book/ch00-preface.xml:827 #: ../en/book/ch03-advanced-topics.xml:75 #: ../en/book/ch03-advanced-topics.xml:182 #: ../en/book/ch03-advanced-topics.xml:280 ../en/book/ch09-reference.xml:715 #: ../en/book/ch09-reference.xml:824 ../en/book/ch09-reference.xml:960 #: ../en/book/ch09-reference.xml:1040 ../en/book/ch09-reference.xml:1136 #: ../en/book/ch09-reference.xml:1283 ../en/book/ch09-reference.xml:1360 #: ../en/book/ch09-reference.xml:1498 ../en/book/ch09-reference.xml:1704 #: ../en/book/ch09-reference.xml:1817 ../en/book/ch09-reference.xml:2142 #: ../en/book/ch09-reference.xml:2257 ../en/book/ch09-reference.xml:2306 #: ../en/book/ch09-reference.xml:2413 ../en/book/ch09-reference.xml:2600 #: ../en/book/ch09-reference.xml:2741 ../en/book/ch09-reference.xml:2836 #: ../en/book/ch09-reference.xml:3146 ../en/book/ch09-reference.xml:3292 #: ../en/book/ch09-reference.xml:3367 ../en/book/ch09-reference.xml:3451 #: ../en/book/ch09-reference.xml:3580 ../en/book/ch09-reference.xml:3657 #: ../en/book/ch09-reference.xml:3736 ../en/book/ch09-reference.xml:3834 #: ../en/book/ch09-reference.xml:3937 ../en/book/ch09-reference.xml:4074 #: ../en/book/ch09-reference.xml:4205 ../en/book/ch09-reference.xml:4301 #: ../en/book/ch09-reference.xml:4413 ../en/book/ch09-reference.xml:4856 #: ../en/book/ch09-reference.xml:5053 ../en/book/ch09-reference.xml:5141 #: ../en/book/ch09-reference.xml:5508 ../en/book/ch09-reference.xml:5556 #: ../en/book/ch09-reference.xml:5635 ../en/book/ch09-reference.xml:5675 #: ../en/book/ch09-reference.xml:5777 ../en/book/ch09-reference.xml:5808 #: ../en/book/ch09-reference.xml:5860 ../en/book/ch09-reference.xml:5893 #: ../en/book/ch09-reference.xml:5942 ../en/book/ch09-reference.xml:6009 #: ../en/book/ch09-reference.xml:6063 ../en/book/ch09-reference.xml:6103 #: ../en/book/ch09-reference.xml:6185 ../en/book/ch09-reference.xml:6231 #: ../en/book/ch09-reference.xml:6286 ../en/book/ch09-reference.xml:6347 #: ../en/book/ch09-reference.xml:6403 ../en/book/ch09-reference.xml:6457 #: ../en/book/ch09-reference.xml:6525 ../en/book/ch09-reference.xml:6697 #: ../en/book/ch09-reference.xml:6743 ../en/book/ch09-reference.xml:6801 #: ../en/book/ch09-reference.xml:6925 ../en/book/ch09-reference.xml:6971 #: ../en/book/ch09-reference.xml:7043 ../en/book/ch09-reference.xml:7090 #: ../en/book/ch09-reference.xml:7127 ../en/book/ch09-reference.xml:7191 #: ../en/book/ch09-reference.xml:7242 ../en/book/ch09-reference.xml:7294 #: ../en/book/ch09-reference.xml:7340 ../en/book/ch09-reference.xml:7395 #: ../en/book/ch09-reference.xml:7460 ../en/book/ch09-reference.xml:7519 #: ../en/book/ch09-reference.xml:7563 ../en/book/ch09-reference.xml:7744 #: ../en/book/ch09-reference.xml:7814 ../en/book/ch09-reference.xml:7854 #: ../en/book/ch09-reference.xml:7931 ../en/book/ch09-reference.xml:8288 #: ../en/book/ch09-reference.xml:8351 ../en/book/ch09-reference.xml:8416 #: ../en/book/ch09-reference.xml:8459 ../en/book/ch09-reference.xml:9315 #: ../en/book/ch09-reference.xml:9378 ../en/book/ch09-reference.xml:9433 #: ../en/book/ch09-reference.xml:9489 ../en/book/ch09-reference.xml:9561 #: ../en/book/ch09-reference.xml:9636 ../en/book/ch09-reference.xml:9695 #: ../en/book/ch09-reference.xml:9753 ../en/book/ch09-reference.xml:9813 msgid "<indexterm>" msgstr "<indexterm>" # type: Content of: <preface><para><indexterm><primary> #: ../en/book/ch00-preface.xml:15 msgid "Concurrent Versions System (CVS)" msgstr "Concurrent Versions System (CVS)" # type: Content of: <preface><para> #: ../en/book/ch00-preface.xml:16 msgid "" "</indexterm> In the world of open source software, the Concurrent Versions " "System (CVS) was the tool of choice for version control for many years. And " "rightly so. CVS was open source software itself, and its nonrestrictive " "modus operandi and support for networked operation allowed dozens of " "geographically dispersed programmers to share their work. It fit the " "collaborative nature of the open source world very well. CVS and its semi-" "chaotic development model have since become cornerstones of open source " "culture." msgstr "" "</indexterm> In der Welt der Open-Source-Software war das Concurrent " "Versions System (CVS) für viele Jahre das Werkzeug der Wahl für " "Versionskontrolle. Und das zu Recht. CVS war selbst Open-Source-Software und " "seine nicht-einschränkende Vorgehensweise und Unterstützung für " "netzbasierten Einsatz erlaubte dutzenden geografisch verteilten " "Programmierern, ihre Arbeit zu teilen. Es passte sehr gut zur kollaborativen " "Natur der Open-Source-Welt. CVS und sein halb chaotisches Entwicklungsmodell " "sind seitdem zu Eckpfeilern der Open-Source-Kultur geworden." # type: Content of: <preface><para> #: ../en/book/ch00-preface.xml:28 msgid "" "But CVS was not without its flaws, and simply fixing those flaws promised to " "be an enormous effort. Enter Subversion. Subversion was designed to be a " "successor to CVS, and its originators set out to win the hearts of CVS users " "in two ways—by creating an open source system with a design (and " "<quote>look and feel</quote>) similar to CVS, and by attempting to avoid " "most of CVS's noticeable flaws. While the result isn't necessarily the next " "great evolution in version control design, Subversion <emphasis>is</" "emphasis> very powerful, very usable, and very flexible. And for the most " "part, almost all newly started open source projects now choose Subversion " "instead of CVS." msgstr "" "Jedoch war CVS nicht makellos, und diese Makel einfach zu beseitigen, " "versprach einen enormen Aufwand. Bühne frei für Subversion. Subversion " "wurde als Nachfolger für CVS entworfen, und seine Schöpfer zogen los, um auf " "zwei Wegen die Herzen der CVS-Benutzer zu gewinnen – indem ein Open-" "Source-System erschaffen wurde, dessen Design (und <quote>look and feel</" "quote>) ähnlich wie CVS war, und indem versucht wurde, die auffälligsten " "Makel von CVS zu vermeiden. Obwohl das Ergebnis nicht notwendigerweise den " "nächsten Evolutionsschritt in Sachen Versionskontrolle darstellt, " "<emphasis>ist</emphasis> Subversion sehr mächtig, sehr brauchbar und sehr " "flexibel. Und größtenteils wählen nun fast alle neuen Open-Source-Projekte " "Subversion statt CVS." # type: Content of: <preface><para> #: ../en/book/ch00-preface.xml:40 msgid "" "This book is written to document the 1.5 series of the Subversion version " "control system. We have made every attempt to be thorough in our coverage. " "However, Subversion has a thriving and energetic development community, so " "already a number of features and improvements are planned for future " "versions that may change some of the commands and specific notes in this " "book." msgstr "" "Dieses Buch ist geschrieben worden, um die Serie 1.5 des Subversion " "Versionskontrollsystems zu dokumentieren. Wir haben stets versucht, die " "Themen gründlich zu behandeln. Jedoch hat Subversion eine florierende und " "tatkräftige Entwicklergemeinde, so dass bereits eine Menge an Features und " "Verbesserungen für künftige Versionen von Subversion geplant sind, die " "Änderungen mancher Kommandos und bestimmter Anmerkungen in diesem Buch " "bewirken könnten." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:54 msgid "Audience" msgstr "Publikum" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:56 msgid "" "This book is written for computer-literate folk who want to use Subversion " "to manage their data. While Subversion runs on a number of different " "operating systems, its primary user interface is command-line-based. That " "command-line tool (<command>svn</command>), and some auxiliary programs, are " "the focus of this book." msgstr "" "Dieses Buch ist für computerkundige Leute geschrieben, die mit Subversion " "ihre Daten verwalten wollen. Obwohl Subversion unter verschiedenen " "Betriebssystemen läuft, ist die primäre Benutzerschnittstelle " "kommandozeilenbasiert. Dieses Kommandozeilenwerkzeug (<command>svn</" "command>) und einige Hilfsprogramme stehen im Mittelpunkt dieses Buches." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:63 msgid "" "For consistency, the examples in this book assume that the reader is using a " "Unix-like operating system and is relatively comfortable with Unix and " "command-line interfaces. That said, the <command>svn</command> program also " "runs on non-Unix platforms such as Microsoft Windows. With a few minor " "exceptions, such as the use of backward slashes (<literal>\\</literal>) " "instead of forward slashes (<literal>/</literal>) for path separators, the " "input to and output from this tool when run on Windows are identical to its " "Unix counterpart." msgstr "" "Aus Gründen der Vereinheitlichung gehen die Beispiele in diesem Buch davon " "aus, dass der Leser ein unixähnliches Betriebssystem benutzt und mit Unix " "und Kommandozeilenschnittstellen verhältnismäßig gut zurechtkommt. " "Nichtsdestotrotz läuft <command>svn</command> auch unter anderen " "Betriebssystemen als Unix, etwa Microsoft Windows. Bis auf ein paar " "Ausnahmen, wie z.B. die Verwendung umgekehrter Schrägstriche (<literal>\\</" "literal>) statt Schrägstrichen (<literal>/</literal>) als Pfadtrenner, sind " "die Ein- und Ausgaben dieses Werkzeugs unter Windows identisch zur Unix-" "Version." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:73 msgid "" "Most readers are probably programmers or system administrators who need to " "track changes to source code. This is the most common use for Subversion, " "and therefore it is the scenario underlying all of the book's examples. But " "Subversion can be used to manage changes to any sort of information—" "images, music, databases, documentation, and so on. To Subversion, all data " "is just data." msgstr "" "Die meisten Leser sind wahrscheinlich Programmierer oder " "Systemadministratoren, die Änderungen an Quellcode verfolgen müssen. Das " "ist der am meisten verbreitete Einsatzzweck von Subversion, so dass alle " "Beispiele in diesem Buch auf diesem Szenario beruhen. Doch Subversion kann " "gleichwohl dazu benutzt werden, Änderungen an allerlei Arten von " "Informationen zu verwalten – Bilder, Musik, Datenbanken, Dokumentation " "usw. Für Subversion sind alle Daten einfach Daten." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:81 msgid "" "While this book is written with the assumption that the reader has never " "used a version control system, we've also tried to make it easy for users of " "CVS (and other systems) to make a painless leap into Subversion. Special " "sidebars may mention other version control systems from time to time, and " "Appendix B summarizes many of the differences between CVS and Subversion." msgstr "" "Obwohl dieses Buch unter der Annahme geschrieben worden ist, dass der Leser " "noch nie ein Versionskontrollsystem benutzt hat, haben wir auch versucht, " "für Anwender von CVS (und anderen Systemen) den Sprung zu Subversion so " "schmerzlos wie möglich zu machen. Ab und zu werden in Randnotizen andere " "Versionskontrollsysteme erwähnt, und ein besonderer Anhang fasst viele der " "Unterschiede zwischen CVS und Subversion zusammen." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:89 msgid "" "Note also that the source code examples used throughout the book are only " "examples. While they will compile with the proper compiler incantations, " "they are intended to illustrate a particular scenario and not necessarily to " "serve as examples of good programming style or practices." msgstr "" "Es sei angemerkt, dass es sich bei den Quelltexten in diesem Buch nur um " "Beispiele handelt. Obwohl sie sich mit den passenden Compiler-Aufrufen " "übersetzen ließen, sollen sie lediglich ein besonderes Szenario illustrieren " "und nicht als Vorlage für guten Programmierstil oder gute Programmierpraxis " "dienen." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:101 msgid "How to Read This Book" msgstr "Wie dieses Buch zu lesen ist" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:103 msgid "" "Technical books always face a certain dilemma: whether to cater to " "<firstterm>top-down</firstterm> or to <firstterm>bottom-up</firstterm> " "learners. A top-down learner prefers to read or skim documentation, getting " "a large overview of how the system works; only then does she actually start " "using the software. A bottom-up learner is a <quote>learn by doing</quote> " "person—someone who just wants to dive into the software and figure it " "out as she goes, referring to book sections when necessary. Most books tend " "to be written for one type of person or the other, and this book is " "undoubtedly biased toward top-down learners. (And if you're actually " "reading this section, you're probably already a top-down learner yourself!) " "However, if you're a bottom-up person, don't despair. While the book may be " "laid out as a broad survey of Subversion topics, the content of each section " "tends to be heavy with specific examples that you can try-by-doing. For the " "impatient folks who just want to get going, you can jump right to <xref " "linkend=\"svn.intro\"/>." msgstr "" "Technische Bücher stehen immer vor einem bestimmten Dilemma: ob sie " "<firstterm>von-oben</firstterm> oder <firstterm>von-unten</firstterm> " "Lernenden entgegenkommen sollen. Ein von-oben Lernender bevorzugt es, " "Dokumentation zu lesen oder zu überfliegen und dabei einen groben Überblick " "über das Funktionieren des Systems zu erhalten, bevor er beginnt, die " "Software zu verwenden. Ein von-unten Lernender ist eine Person, für die " "<quote>Lernen durch Ausprobieren</quote> gilt, jemand, der in die Software " "eintauchen möchte, um beim Ausprobieren herauszufinden, wie sie " "funktioniert, und wenn nötig Abschnitte im Buch nachschlägt. Die meisten " "Bücher werden für die eine oder andere Art dieser Personen geschrieben, " "wobei dieses Buch zweifellos den von-oben Lernenden entgegenkommt. (Und wenn " "Sie gerade diesen Abschnitt lesen, sind Sie wahrscheinlich selber ein von-" "oben Lernender!) Verzweifeln Sie jedoch nicht, falls Sie ein von-unten " "Lerner sind. Während dieses Buch als eine breite Betrachtung der Themen rund " "um Subversion gestaltet ist, beinhaltet jeder Abschnitt eine reichhaltige " "Auswahl an Beispielen, die sie ausprobieren können. Die Ungeduldigen, die " "einfach weitermachen wollen, können sofort zu <xref linkend=\"svn.intro\"/> " "springen." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:122 msgid "" "Regardless of your learning style, this book aims to be useful to people of " "widely different backgrounds—from those with no previous experience in " "version control to experienced system administrators. Depending on your own " "background, certain chapters may be more or less important to you. The " "following can be considered a <quote>recommended reading list</quote> for " "various types of readers:" msgstr "" "Ungeachtet Ihrer Lernmethode zielt dieses Buch darauf ab, für Menschen " "unterschiedlicher Herkunft nützlich zu sein – von Menschen ohne " "vorherige Erfahrung mit Versionskontrolle bis hin zu erfahrenen " "Systemadministratoren. Je nach Ihrer Herkunft können bestimmte Kapitel mehr " "oder weniger wichtig für Sie sein. Was nun folgt, kann als " "<quote>Leseempfehlung</quote> für verschiedene Typen von Lesern betrachtet " "werden:" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:133 msgid "Experienced system administrators" msgstr "Erfahrene Systemadministratoren" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:135 msgid "" "The assumption here is that you've probably used version control before and " "are dying to get a Subversion server up and running ASAP. <xref linkend=" "\"svn.reposadmin\"/> and <xref linkend=\"svn.serverconfig\"/> will show you " "how to create your first repository and make it available over the network. " "After that's done, <xref linkend=\"svn.tour\"/> and <xref linkend=\"svn." "forcvs\"/> are the fastest routes to learning the Subversion client." msgstr "" "Die Annahme ist, dass Sie wahrscheinlich bereits Versionskontrolle verwendet " "haben und darauf brennen, möglichst schnell einen Subversion-Server zum " "Laufen zu bekommen. <xref linkend=\"svn.reposadmin\"/> und <xref linkend=" "\"svn.serverconfig\"/> zeigen, wie Sie Ihr erstes Repository erzeugen und es " "über das Netz verfügbar machen können. Danach sind <xref linkend=\"svn.tour" "\"/> und <xref linkend=\"svn.forcvs\"/> die schnellsten Wege zum Lernen des " "Subversion-Clients." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:149 msgid "New users" msgstr "Neulinge" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:151 msgid "" "Your administrator has probably set up Subversion already, and you need to " "learn how to use the client. If you've never used a version control system, " "then <xref linkend=\"svn.basic\"/> is a vital introduction to the ideas " "behind version control. <xref linkend=\"svn.tour\"/> is a guided tour of " "the Subversion client." msgstr "" "Wahrscheinlich hat Ihr Administrator Subversion bereits aufgesetzt, und Sie " "möchten nun lernen, wie man den Client benutzt. Falls Sie noch nie ein " "Versionskontrollsystem benutzt haben, ist <xref linkend=\"svn.basic\"/> eine " "unbedingt notwendige Einführung in die Konzepte der Versionskontrolle. " "<xref linkend=\"svn.tour\"/> ist eine Führung durch den Subversion-Client." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:161 msgid "Advanced users" msgstr "Fortgeschrittene" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:163 msgid "" "Whether you're a user or administrator, eventually your project will grow " "larger. You're going to want to learn how to do more advanced things with " "Subversion, such as how to use Subversion's property support (<xref linkend=" "\"svn.advanced\"/>), how to use branches and perform merges (<xref linkend=" "\"svn.branchmerge\"/>), how to configure runtime options (<xref linkend=" "\"svn.customization\"/>), and other things. These chapters aren't critical " "at first, but be sure to read them once you're comfortable with the basics." msgstr "" "Ob Sie ein Benutzer oder ein Administrator sind, letztendlich wird Ihr " "Projekt anwachsen. Sie werden lernen wollen, wie man fortgeschrittene Dinge " "mit Subversion machen kann, etwa Branches verwenden und Merges durchführen " "(<xref linkend=\"svn.branchmerge\"/>), wie Subversions Property-" "Unterstützung (<xref linkend=\"svn.advanced\"/>) zu benutzen ist, wie " "Laufzeitoptionen konfiguriert werden können (<xref linkend=\"svn." "customization\"/>) und vieles mehr. Diese Kapitel sind zunächst nicht " "kritisch, jedoch sollten Sie sie lesen, sobald Sie mit den Grundlagen " "vertraut sind." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:177 msgid "Developers" msgstr "Entwickler" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:179 msgid "" "Presumably, you're already familiar with Subversion, and now want to either " "extend it or build new software on top of its many APIs. <xref linkend=" "\"svn.developer\"/> is just for you." msgstr "" "Unter der Annahme, dass Sie bereits mit Subversion vertraut sind und es nun " "entweder erweitern oder neue Software basierend auf einem seiner zahlreichen " "APIs erstellen möchten, ist <xref linkend=\"svn.developer\"/> genau das, was " "sie suchen." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:187 msgid "" "The book ends with reference material—<xref linkend=\"svn.ref\"/> is a " "reference guide for all Subversion commands, and the appendixes cover a " "number of useful topics. These are the chapters you're mostly likely to " "come back to after you've finished the book." msgstr "" "Das Buch schließt mit einer Referenz – <xref linkend=\"svn.ref\"/> ist " "ein Referenzhandbuch für alle Befehle von Subversion, und die Anhänge " "behandeln eine Anzahl nützlicher Themen. Dies sind die Kapitel, zu denen Sie " "sehr wahrscheinlich zurückkehren werden, wenn Sie dieses Buch beendet haben." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:199 msgid "Conventions Used in This Book" msgstr "Konventionen in diesem Buch" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:201 msgid "The following typographic conventions are used in this book:" msgstr "" "Die folgenden typografischen Konventionen werden in diesem Buch verwendet:" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:208 msgid "<userinput>Constant width</userinput>" msgstr "<userinput>Festbreitenschrift</userinput>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:211 msgid "Used for literal user input, command output, and command-line options" msgstr "" "Verwendet für Benutzereingaben, Befehlsausgaben und Kommandozeilenoptionen" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:218 msgid "<filename>Italic</filename>" msgstr "<filename>Kursiv</filename>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:221 msgid "" "Used for program and Subversion tool subcommand names, file and directory " "names, and new terms" msgstr "" "Verwendet für Programm- und Subversion-Unterbefehlsnamen, Datei- und " "Verzeichnisnamen und für neue Begriffe" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:228 msgid "<replaceable>Constant width italic</replaceable>" msgstr "<replaceable>Kursive Festbreitenschrift</replaceable>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:231 msgid "Used for replaceable items in code and text" msgstr "Verwendet für zu ersetzende Objekte in Code und Text" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:237 msgid "" "Also, we sprinkled especially helpful or important bits of information " "throughout the book (in contextually relevant locations), set off visually " "so they're easy to find. Look for the following icons as you read:" msgstr "" "Des Weiteren haben wir besonders hilfreiche oder wichtige " "Informationshäppchen, wegen der besseren Auffindbarkeit optisch " "hervorgehoben, über das gesamte Buch verteilt (dort, wo es für den " "Zusammenhang bedeutsam ist). Achten Sie beim Lesen auf die folgenden Bilder:" # type: Content of: <preface><sect1><note><para> #: ../en/book/ch00-preface.xml:243 msgid "This icon designates a special point of interest." msgstr "Dieses Bild markiert einen besonders wichtigen Punkt." # type: Content of: <preface><sect1><tip><para> #: ../en/book/ch00-preface.xml:247 msgid "This icon designates a helpful tip or recommended best practice." msgstr "" "Dieses Bild markiert einen nützlichen Tipp oder eine empfohlene " "Vorgehensweise." # type: Content of: <preface><sect1><warning><para> #: ../en/book/ch00-preface.xml:252 msgid "" "This icon designates a warning. Pay close attention to these to avoid " "running into problems." msgstr "" "Dieses Bild markiert eine Warnung. Beachten Sie diese besonders, um Probleme " "zu vermeiden!" # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:262 msgid "Organization of This Book" msgstr "Aufbau dieses Buchs" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:264 msgid "The chapters that follow and their contents are listed here:" msgstr "Hier sind die folgenden Kapitel und ihr Inhalt aufgeführt:" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:270 msgid "<xref linkend=\"svn.basic\"/>" msgstr "<xref linkend=\"svn.basic\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:272 msgid "" "Explains the basics of version control and different versioning models, " "along with Subversion's repository, working copies, and revisions." msgstr "" "Erklärt die Grundlagen von Versionskontrolle und unterschiedliche " "Versionierungsmodelle sowie das Repository von Subversion, Arbeitskopien und " "Revisionen." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:279 msgid "<xref linkend=\"svn.tour\"/>" msgstr "<xref linkend=\"svn.tour\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:281 msgid "" "Walks you through a day in the life of a Subversion user. It demonstrates " "how to use a Subversion client to obtain, modify, and commit data." msgstr "" "Ein Spaziergang durch den Tag eines Subversion-Anwenders. Es zeigt, wie ein " "Subversion-Client verwendet wird, um Daten zu bekommen, zu verändern und " "abzuliefern." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:288 msgid "<xref linkend=\"svn.advanced\"/>" msgstr "<xref linkend=\"svn.advanced\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:290 msgid "" "Covers more complex features that regular users will eventually come into " "contact with, such as versioned metadata, file locking, and peg revisions." msgstr "" "Behandelt komplexere Eigenschaften, denen Benutzer letztendlich begegnen " "werden, wie etwa versionierte Metadaten, Dateisperren und Peg-Revisionen." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:297 msgid "<xref linkend=\"svn.branchmerge\"/>" msgstr "<xref linkend=\"svn.branchmerge\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:299 msgid "" "Discusses branches, merges, and tagging, including best practices for " "branching and merging, common use cases, how to undo changes, and how to " "easily swing from one branch to the next." msgstr "" "Behandelt Branches, Merges und Tagging inklusive empfohlener Vorgehensweisen " "beim Branchen und Mergen, übliche Szenarien, wie Änderungen wieder " "rückgängig gemacht werden können und wie einfach von einem Branch zum " "nächsten gewechselt werden kann." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:307 msgid "<xref linkend=\"svn.reposadmin\"/>" msgstr "<xref linkend=\"svn.reposadmin\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:309 msgid "" "Describes the basics of the Subversion repository, how to create, configure, " "and maintain a repository, and the tools you can use to do all of this." msgstr "" "Beschreibt die Grundlagen des Subversion-Repositorys, wie man ein Repository " "anlegt, konfiguriert und wartet sowie die Tools, die man hierfür benutzen " "kann" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:316 msgid "<xref linkend=\"svn.serverconfig\"/>" msgstr "<xref linkend=\"svn.serverconfig\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:318 msgid "" "Explains how to configure your Subversion server and offers different ways " "to access your repository: <literal>HTTP</literal>, the <literal>svn</" "literal> protocol, and local disk access. It also covers the details of " "authentication, authorization and anonymous access." msgstr "" "Erklärt, wie man einen Subversion-Server konfiguriert und unterschiedliche " "Arten auf ein Repository zuzugreifen: <literal>HTTP</literal>, das " "<literal>svn</literal>-Protokoll und über die lokale Festplatte. Behandelt " "werden hier auch die Authentifizierung, die Autorisierung und der anonyme " "Zugriff." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:328 msgid "<xref linkend=\"svn.customization\"/>" msgstr "<xref linkend=\"svn.customization\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:330 msgid "" "Explores the Subversion client configuration files, the handling of " "internationalized text, and how to make external tools cooperate with " "Subversion." msgstr "" "Untersucht die Subversion-Client-Konfigurationsdateien, die Handhabung " "internationalisierter Texte und wie man externe Tools zur Zusammenarbeit mit " "Subversion bringt." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:337 msgid "<xref linkend=\"svn.developer\"/>" msgstr "<xref linkend=\"svn.developer\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:339 msgid "" "Describes the internals of Subversion, the Subversion filesystem, and the " "working copy administrative areas from a programmer's point of view. It " "also demonstrates how to use the public APIs to write a program that uses " "Subversion, and most importantly, how to contribute to the development of " "Subversion." msgstr "" "Beschreibt die Interna von Subversion, das Subversion-Dateisystem und die " "Verwaltungsbereiche der Arbeitskopie aus der Sicht eines Programmierers. " "Hier wird auch gezeigt, wie die veröffentlichten APIs in einem Programm " "verwendet werden, das Subversion benutzt, und, was am wichtigsten ist, wie " "man zur Weiterentwicklung von Subversion beitragen kann." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:349 msgid "<xref linkend=\"svn.ref\"/>" msgstr "<xref linkend=\"svn.ref\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:351 msgid "" "Explains in great detail every subcommand of <command>svn</command>, " "<command>svnadmin</command>, and <command>svnlook</command> with plenty of " "examples for the whole family!" msgstr "" "Erklärt detailreich jeden Unterbefehl von <command>svn</command>, " "<command>svnadmin</command> und <command>svnlook</command> mit vielen " "Beispielen für die ganze Familie." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:359 msgid "<xref linkend=\"svn.intro\"/>" msgstr "<xref linkend=\"svn.intro\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:361 msgid "" "For the impatient, a whirlwind explanation of how to install Subversion and " "start using it immediately. You have been warned." msgstr "" "Für die Ungeduldigen eine Anleitung im Schnelldurchlauf für die Installation " "und die sofortige Benutzung. Seien Sie gewarnt!" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:368 msgid "<xref linkend=\"svn.forcvs\"/>" msgstr "<xref linkend=\"svn.forcvs\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:370 msgid "" "Covers the similarities and differences between Subversion and CVS, with " "numerous suggestions on how to break all the bad habits you picked up from " "years of using CVS. Included are descriptions of Subversion revision " "numbers, versioned directories, offline operations, <command>update</" "command> versus <command>status</command>, branches, tags, metadata, " "conflict resolution, and authentication." msgstr "" "Behandelt die Ähnlichkeiten und Unterschiede zwischen Subversion und CVS mit " "etlichen Vorschlägen, wie man sich all die schlechten Angewohnheiten aus " "jahrelangem CVS-Gebrauch wieder abgewöhnen kann. Dies beinhaltet Subversion-" "Revisionsnummern, versionierte Verzeichnisse, Offline-Tätigkeiten, " "<command>update</command> und <command>status</command>, Branches, Tags, " "Metadaten, Konfliktauflösung und Authentifizierung." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:382 msgid "<xref linkend=\"svn.webdav\"/>" msgstr "<xref linkend=\"svn.webdav\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:384 msgid "" "Describes the details of WebDAV and DeltaV and how you can configure your " "Subversion repository to be mounted read/write as a DAV share." msgstr "" "Beschreibt die Details zu WebDAV und DeltaV und wie man sein Subversion-" "Repository konfiguriert, damit es als freigegebenes DAV-Laufwerk schreibbar " "in das Dateisystem eingehängt werden kann." # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:391 msgid "<xref linkend=\"svn.copyright\"/>" msgstr "<xref linkend=\"svn.copyright\"/>" # type: Content of: <preface><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:393 msgid "" "A copy of the Creative Commons Attribution License, under which this book is " "licensed." msgstr "" "Eine Kopie der Creative Commons Attribution License, unter der dieses Buch " "lizenziert ist." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:407 msgid "This Book Is Free" msgstr "Dieses Buch ist frei" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:409 msgid "" "This book started out as bits of documentation written by Subversion project " "developers, which were then coalesced into a single work and rewritten. As " "such, it has always been under a free license (see <xref linkend=\"svn." "copyright\"/>). In fact, the book was written in the public eye, originally " "as part of the Subversion project itself. This means two things:" msgstr "" "Dieses Buch startete aus Dokumentationsschnipseln von Entwicklern des " "Subversion-Projektes, die in einem Werk gebündelt und umgeschrieben wurden. " "Insofern war es immer schon unter einer freien Lizenz (siehe <xref linkend=" "\"svn.copyright\"/>). Tatsächlich wurde das Buch unter den Augen der " "Öffentlichkeit geschrieben, ursprünglich als Teil des Subversion Projektes " "selbst. Das bedeutet zweierlei:" # type: Content of: <preface><sect1><itemizedlist><listitem><para> #: ../en/book/ch00-preface.xml:418 msgid "" "You will always find the latest version of this book in the book's own " "Subversion repository." msgstr "" "Sie werden stets die neueste Version dieses Buchs im eigenen Subversion-" "Repository finden." # type: Content of: <preface><sect1><itemizedlist><listitem><para> #: ../en/book/ch00-preface.xml:423 msgid "" "You can make changes to this book and redistribute it however you wish—" "it's under a free license. Your only obligation is to maintain proper " "attribution to the original authors. Of course, we'd much rather you send " "feedback and patches to the Subversion developer community, instead of " "distributing your private version of this book." msgstr "" "Sie können an diesem Buch Änderungen vornehmen und es wie auch immer " "weiterverteilen – es unterliegt einer freien Lizenz. Ihre einzige " "Verpflichtung besteht darin, den Hinweis auf die ursprünglichen Autoren " "beizubehalten. Natürlich würden wir es bevorzugen, wenn Sie Rückmeldungen " "und Verbesserungen der Subversion-Entwicklergemeinde zukommen ließen, " "anstatt Ihre Privatversion zu verteilen." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:433 msgid "" "The online home of this book's development and most of the volunteer-driven " "translation efforts regarding it is <ulink url=\"http://svnbook.red-bean.com" "\"/>. There you can find links to the latest releases and tagged versions " "of the book in various formats, as well as instructions for accessing the " "book's Subversion repository (where its DocBook XML source code lives). " "Feedback is welcomed—encouraged, even. Please submit all comments, " "complaints, and patches against the book sources to <email>svnbook-dev@red-" "bean.com</email>." msgstr "" "Die Homepage der Entwicklungs- und Übersetzungsaktivitäten auf freiwilliger " "Basis ist <ulink url=\"http://svnbook.red-bean.com\"/>. Dort finden Sie " "Links auf die neuesten Releases und mit Tags versehene Versionen des Buchs " "in verschiedenen Formaten ebenso wie eine Anleitung, auf das Subversion-" "Repository des Buchs zuzugreifen (dort lebt sein Quellcode im DocBook-XML-" "Format). Rückmeldungen sind willkommen – ja sogar erwünscht. Bitte " "senden Sie alle Kommentare, Beschwerden und Patches für die Sourcen des " "Buchs an <email>svnbook-dev@red-bean.com</email>." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:449 msgid "Acknowledgments" msgstr "Danksagungen" # type: Content of: <preface><sect1><para><footnote> #: ../en/book/ch00-preface.xml:451 msgid "" "This book would not be possible (nor very useful) if Subversion did not " "exist. For that, the authors would like to thank Brian Behlendorf and " "CollabNet for the vision to fund such a risky and ambitious new open source " "project; Jim Blandy for the original Subversion name and design—we " "love you, Jim; and Karl Fogel for being such a good friend and a great " "community leader, in that order. <footnote>" msgstr "" "Dieses Buch wäre nicht möglich (und auch nicht sehr nützlich) wenn es " "Subversion nicht gäbe. Dafür möchten die Autoren Brian Behrendorf danken " "sowie CollabNet für die Vision, solch ein riskantes und ehrgeiziges Open-" "Source-Projekt zu finanzieren; Jim Blandy für den ursprünglichen Namen von " "Subversion und sein Design – wir lieben Dich, Jim; Karl Fogel, dafür, " "dass er so ein guter Freund und Leiter der Gemeinde ist, in dieser " "Reihenfolge. <footnote>" # type: Content of: <preface><sect1><para><footnote><para> #: ../en/book/ch00-preface.xml:459 msgid "" "Oh, and thanks, Karl, for being too overworked to write this book yourself." msgstr "" "Oh, und Danke, Karl, dafür, dass du zu viel zu tun hattest, um das Buch " "selbst zu schreiben." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:464 msgid "" "Thanks to O'Reilly and our various editors: Chuck Toporek, Linda Mui, " "Tatiana Apandi, Mary Brady, and Mary Treseler. Their patience and support " "has been tremendous." msgstr "" "Dank an O'Reilly und unsere verschiedenen Redakteure: Chuck Toporek, Linda " "Mui, Tatiana Apandi, Mary Brady und Mary Treseler. Ihre Geduld und " "Unterstützung waren enorm." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:468 msgid "" "Finally, we thank the countless people who contributed to this book with " "informal reviews, suggestions, and patches. While this is undoubtedly not a " "complete list, this book would be incomplete and incorrect without their " "help: Bhuvaneswaran A, David Alber, C. Scott Ananian, David Anderson, Ariel " "Arjona, Seth Arnold, Jani Averbach, Charles Bailey, Ryan Barrett, Francois " "Beausoleil, Brian R. Becker, Yves Bergeron, Karl Berry, Jennifer Bevan, Matt " "Blais, Jim Blandy, Phil Bordelon, Sietse Brouwer, Tom Brown, Zack Brown, " "Martin Buchholz, Paul Burba, Sean Callan-Hinsvark, Branko Cibej, Archie " "Cobbs, Jason Cohen, Ryan Cresawn, John R. Daily, Peter Davis, Olivier Davy, " "Robert P. J. Day, Mo DeJong, Brian Denny, Joe Drew, Markus Dreyer, Nick " "Duffek, Boris Dusek, Ben Elliston, Justin Erenkrantz, Jens M. Felderhoff, " "Kyle Ferrio, Shlomi Fish, Julian Foad, Chris Foote, Martin Furter, Vlad " "Georgescu, Peter Gervai, Dave Gilbert, Eric Gillespie, David Glasser, Marcel " "Gosselin, Lieven Govaerts, Steve Greenland, Matthew Gregan, Tom Gregory, " "Maverick Grey, Art Haas, Mark E. Hamilton, Eric Hanchrow, Liam Healy, Malte " "Helmert, Michael Henderson, Øyvind A. Holm, Greg Hudson, Alexis Huxley, Auke " "Jilderda, Toby Johnson, Jens B. Jorgensen, Tez Kamihira, David Kimdon, Mark " "Benedetto King, Robert Kleemann, Erik Kline, Josh Knowles, Andreas J. " "Koenig, Axel Kollmorgen, Nuutti Kotivuori, Kalin Kozhuharov, Matt Kraai, " "Regis Kuckaertz, Stefan Kueng, Steve Kunkee, Scott Lamb, Wesley J. Landaker, " "Benjamin Landsteiner, Vincent Lefevre, Morten Ludvigsen, Dennis Lundberg, " "Paul Lussier, Bruce A. Mah, Jonathon Mah, Karl Heinz Marbaise, Philip " "Martin, Feliciano Matias, Neil Mayhew, Patrick Mayweg, Gareth McCaughan, " "Craig McElroy, Simon McKenna, Christophe Meresse, Jonathan Metillon, Jean-" "Francois Michaud, Jon Middleton, Robert Moerland, Marcel Molina Jr., Tim " "Moloney, Alexander Mueller, Tabish Mustufa, Christopher Ness, Roman " "Neuhauser, Mats Nilsson, Greg Noel, Joe Orton, Eric Paire, Dimitri " "Papadopoulos-Orfanos, Jerry Peek, Chris Pepper, Amy Lyn Pilato, Kevin Pilch-" "Bisson, Hans Polak, Dmitriy Popkov, Michael Price, Mark Proctor, Steffen " "Prohaska, Daniel Rall, Srinivasa Ramanujan, Jack Repenning, Tobias " "Ringstrom, Jason Robbins, Garrett Rooney, Joel Rosdahl, Christian Sauer, " "Ryan Schmidt, Jochem Schulenklopper, Jens Seidel, Daniel Shahaf, Larry " "Shatzer, Danil Shopyrin, Erik Sjoelund, Joey Smith, W. Snyder, Stefan " "Sperling, Robert Spier, M. S. Sriram, Russell Steicke, David Steinbrunner, " "Sander Striker, David Summers, Johan Sundstroem, Ed Swierk, John " "Szakmeister, Arfrever Frehtes Taifersar Arahesis, Robert Tasarz, Michael W. " "Thelen, Mason Thomas, Erik van der Kolk, Joshua Varner, Eric Wadsworth, " "Chris Wagner, Colin Watson, Alex Waugh, Chad Whitacre, Andy Whitcroft, Josef " "Wolf, Luke Worth, Hyrum Wright, Blair Zajac, Florian Zumbiehl, and the " "entire Subversion community." msgstr "" "Schließlich danken wir den zahllosen Menschen, die zu diesem Buch durch " "informelle Rezensionen, Vorschläge, und Fehlerbehebungen beigetragen haben. " "Obwohl diese Liste zweifellos nicht vollständig ist, wäre dieses Buch " "unfertig und fehlerhaft ohne die Hilfe von: Bhuvaneswaran A, David Alber, C. " "Scott Ananian, David Anderson, Ariel Arjona, Seth Arnold, Jani Averbach, " "Charles Bailey, Ryan Barrett, Francois Beausoleil, Brian R. Becker, Yves " "Bergeron, Karl Berry, Jennifer Bevan, Matt Blais, Jim Blandy, Phil Bordelon, " "Sietse Brouwer, Tom Brown, Zack Brown, Martin Buchholz, Paul Burba, Sean " "Callan-Hinsvark, Branko Cibej, Archie Cobbs, Jason Cohen, Ryan Cresawn, John " "R. Daily, Peter Davis, Olivier Davy, Robert P. J. Day, Mo DeJong, Brian " "Denny, Joe Drew, Markus Dreyer, Nick Duffek, Boris Dusek, Ben Elliston, " "Justin Erenkrantz, Jens M. Felderhoff, Kyle Ferrio, Shlomi Fish, Julian " "Foad, Chris Foote, Martin Furter, Vlad Georgescu, Peter Gervai, Dave " "Gilbert, Eric Gillespie, David Glasser, Marcel Gosselin, Lieven Govaerts, " "Steve Greenland, Matthew Gregan, Tom Gregory, Maverick Grey, Art Haas, Mark " "E. Hamilton, Eric Hanchrow, Liam Healy, Malte Helmert, Michael Henderson, " "Øyvind A. Holm, Greg Hudson, Alexis Huxley, Auke Jilderda, Toby Johnson, " "Jens B. Jorgensen, Tez Kamihira, David Kimdon, Mark Benedetto King, Robert " "Kleemann, Erik Kline, Josh Knowles, Andreas J. Koenig, Axel Kollmorgen, " "Nuutti Kotivuori, Kalin Kozhuharov, Matt Kraai, Regis Kuckaertz, Stefan " "Kueng, Steve Kunkee, Scott Lamb, Wesley J. Landaker, Benjamin Landsteiner, " "Vincent Lefevre, Morten Ludvigsen, Dennis Lundberg, Paul Lussier, Bruce A. " "Mah, Jonathon Mah, Karl Heinz Marbaise, Philip Martin, Feliciano Matias, " "Neil Mayhew, Patrick Mayweg, Gareth McCaughan, Craig McElroy, Simon McKenna, " "Christophe Meresse, Jonathan Metillon, Jean-Francois Michaud, Jon Middleton, " "Robert Moerland, Marcel Molina Jr., Tim Moloney, Alexander Mueller, Tabish " "Mustufa, Christopher Ness, Roman Neuhauser, Mats Nilsson, Greg Noel, Joe " "Orton, Eric Paire, Dimitri Papadopoulos-Orfanos, Jerry Peek, Chris Pepper, " "Amy Lyn Pilato, Kevin Pilch-Bisson, Hans Polak, Dmitriy Popkov, Michael " "Price, Mark Proctor, Steffen Prohaska, Daniel Rall, Srinivasa Ramanujan, " "Jack Repenning, Tobias Ringstrom, Jason Robbins, Garrett Rooney, Joel " "Rosdahl, Christian Sauer, Ryan Schmidt, Jochem Schulenklopper, Jens Seidel, " "Daniel Shahaf, Larry Shatzer, Danil Shopyrin, Erik Sjoelund, Joey Smith, W. " "Snyder, Stefan Sperling, Robert Spier, M. S. Sriram, Russell Steicke, David " "Steinbrunner, Sander Striker, David Summers, Johan Sundstroem, Ed Swierk, " "John Szakmeister, Arfrever Frehtes Taifersar Arahesis, Robert Tasarz, " "Michael W. Thelen, Mason Thomas, Erik van der Kolk, Joshua Varner, Eric " "Wadsworth, Chris Wagner, Colin Watson, Alex Waugh, Chad Whitacre, Andy " "Whitcroft, Josef Wolf, Luke Worth, Hyrum Wright, Blair Zajac, Florian " "Zumbiehl, und die gesamte Subversion Gemeinde." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:646 msgid "From Ben Collins-Sussman" msgstr "Von Ben Collins-Sussman" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:648 msgid "" "Thanks to my wife Frances, who, for many months, got to hear <quote>But " "honey, I'm still working on the book,</quote> rather than the usual " "<quote>But honey, I'm still doing email.</quote> I don't know where she gets " "all that patience! She's my perfect counterbalance." msgstr "" "Dank meiner Gattin Frances, die sich viele Monate lang <quote>Aber, Schatz, " "ich arbeite noch am Buch</quote> anhören musste, statt des üblichen " "<quote>Aber, Schatz ich bearbeite noch E-Mail</quote>. Ich weiß nicht, woher " "sie all die Geduld nimmt. Sie ist der perfekte Ausgleich für mich." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:654 msgid "" "Thanks to my extended family and friends for their sincere encouragement, " "despite having no actual interest in the subject. (You know, the ones who " "say, <quote>Ooh, you wrote a book?</quote> and then when you tell them it's " "a computer book, sort of glaze over.)" msgstr "" "Dank meiner Verwandtschaft und meinen Freunden für ihre aufrichtige " "Ermutigung, obwohl sie kein tatsächliches Interesse an der Materie hatten. " "(Sie wissen schon, diejenigen, die sagen <quote>Oh, du hast ein Buch " "geschrieben?</quote>, und wenn man ihnen erzählt, es sei ein Computerbuch, " "die Nase rümpfen." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:660 msgid "" "Thanks to all my close friends, who make me a rich, rich man. Don't look at " "me that way—you know who you are." msgstr "" "Vielen Dank an meine engen Freunde, die aus mir einen sehr reichen Mann " "machen. Schaut mich nicht so an – Ihr wisst, wer Ihr seid." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:663 msgid "" "Thanks to my parents for the perfect low-level formatting and being " "unbelievable role models. Thanks to my kids for the opportunity to pass " "that on." msgstr "" "Dank an meine Eltern für die perfekte Grundformatierung und dafür, dass sie " "unglaubliche Leitbilder sind. Dank an meine Kinder, für die Gelegenheit, " "dieses weiterzugeben." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:671 msgid "From Brian W. Fitzpatrick" msgstr "Von Brian W. Fitzpatrick" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:673 msgid "" "Huge thanks to my wife Marie for being incredibly understanding, supportive, " "and most of all, patient. Thank you to my brother Eric who first introduced " "me to Unix programming way back when. Thanks to my Mom and Grandmother for " "all their support, not to mention enduring a Christmas holiday where I came " "home and promptly buried my head in my laptop to work on the book." msgstr "" "Einen riesigen Dank an meine Gattin Marie dafür, dass sie so unglaublich " "verständnisvoll, unterstützend und vor allem so geduldig ist. Dank an meinen " "Bruder Eric, der mich vor langer Zeit als erster an die Programmierung von " "UNIX herangeführt hatte. Dank an meine Mutter und Großmutter für ihre " "Unterstützung; ganz zu schweigen davon, dass sie Weihnachtsfeiertage " "ertragen mussten, an denen ich nach Hause kam und sofort meinen Kopf hinter " "dem Laptop versteckte, um am Buch zu arbeiten." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:681 msgid "" "To Mike and Ben: it was a pleasure working with you on the book. Heck, it's " "a pleasure working with you at work!" msgstr "" "An Mike und Ben: Es war ein Vergnügen, mit Euch am Buch zu arbeiten. " "Verdammt, es ist eine Freude mit Euch auf der Arbeit zusammenzuarbeiten." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:684 msgid "" "To everyone in the Subversion community and the Apache Software Foundation, " "thanks for having me. Not a day goes by where I don't learn something from " "at least one of you." msgstr "" "Dank an alle in der Subversion-Gemeinde und der Apache Software Foundation, " "dafür, dass ihr mich in euren Bann gezogen habt. Kein Tag vergeht, ohne " "dass ich irgendetwas von mindestens einem von Euch lerne." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:689 msgid "" "Lastly, thanks to my grandfather, who always told me that <quote>freedom " "equals responsibility.</quote> I couldn't agree more." msgstr "" "Schließlich Dank an meinen Großvater, der mir immer sagte <quote>Freiheit " "bedeutet Verantwortung</quote>. Ich muss dem voll und ganz zustimmen." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:697 msgid "From C. Michael Pilato" msgstr "Von C. Michael Pilato" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:699 msgid "" "Special thanks to Amy, my best friend and wife of more than ten incredible " "years, for her love and patient support, for putting up with the late " "nights, and for graciously enduring the version control processes I've " "imposed on her. Don't worry, sweetheart—you'll be a TortoiseSVN " "wizard in no time!" msgstr "" "Besonderen Dank an Amy, meiner besten Freundin und Ehefrau für mehr als zehn " "unglaubliche Jahre, für ihre Liebe und geduldige Unterstützung, dafür, dass " "sie sich mit den langen Nächten abfand und gnädig die " "Versionskontrollprozesse ertrug, die ich ihr aufbürdete. Keine Sorge, " "Liebling – binnen kurzer Zeit wirst du eine TortoiseSVN-Expertin sein." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:706 msgid "" "Gavin, you're able to read half of the words in this book yourself now; " "sadly, it's the other half that provide the key concepts. And sorry, Aidan " "— I couldn't find a way to work Disney/Pixar characters into the " "text. But Daddy loves you both, and can't wait to teach you about " "programming." msgstr "" "Gavin, du kannst jetzt die Hälfte der Worte in diesem Buch selber lesen; " "leider liefert die andere Hälfte die Schlüsselkonzepte. Tut mir Leid, Aidan " "– ich habe keine Möglichkeit gefunden, Disney/Pixar-Figuren in diesen " "Text einzuarbeiten. Aber Daddy liebt Euch beide und kann kaum erwarten, Euch " "das Programmieren beizubringen." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:712 msgid "" "Mom and Dad, thanks for your constant support and enthusiasm. Mom- and Dad-" "in-law, thanks for all of the same <emphasis>plus</emphasis> your fabulous " "daughter." msgstr "" "Mutter und Vater, Dank für Eure stetige Unterstützung und Begeisterung. " "Schwiegereltern, Dank für dasselbe <emphasis>plus</emphasis> Eure sagenhafte " "Tochter." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:716 msgid "" "Hats off to Shep Kendall, through whom the world of computers was first " "opened to me; Ben Collins-Sussman, my tour guide through the open source " "world; Karl Fogel, you <emphasis>are</emphasis> my <filename>.emacs</" "filename>; Greg Stein, for oozing practical programming know-how; and Brian " "Fitzpatrick, for sharing this writing experience with me. To the many folks " "from whom I am constantly picking up new knowledge—keep dropping it!" msgstr "" "Hut ab vor Shep Kendall, der mir als erster die Welt der Computer eröffnete; " "Ben Collins-Sussman, mein Reiseführer durch die Open-Source-Welt; Karl Fogel " "– Du <emphasis>bist</emphasis> mein <filename>.emacs</filename>; Greg " "Stein, für überquellendes praktisches Programmierwissen; und Brian " "Fitzpatrick – dafür, dass Du diese Schreiberfahrung mit mir teilst. " "Vor all den vielen Leuten, von denen ich ständig etwas neues aufnehme " "– lasst weiter etwas fallen!" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:725 msgid "" "Finally, to the One who perfectly demonstrates creative excellence—" "thank You." msgstr "" "Schließlich, vor demjenigen, der perfekt kreative Exzellenz demonstriert " "– Dank an Dich." # type: Content of: <preface><sect1><title> #: ../en/book/ch00-preface.xml:737 msgid "What Is Subversion?" msgstr "Was ist Subversion?" # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:739 msgid "" "Subversion is a free/open source version control system. That is, " "Subversion manages files and directories, and the changes made to them, over " "time. This allows you to recover older versions of your data or examine the " "history of how your data changed. In this regard, many people think of a " "version control system as a sort of <quote>time machine.</quote>" msgstr "" "Subversion ist ein freies/Open-Source Versionskontrollsystem. Das bedeutet, " "Subversion verwaltet Dateien und Verzeichnisse und die Änderungen an ihnen " "im Lauf der Zeit. Das erlaubt Ihnen, alte Versionen Ihrer Daten " "wiederherzustellen oder die Geschichte der Änderungen zu verfolgen. Unter " "diesem Blickwinkel denken viele Leute bei einem Versionskontrollsystem an " "eine Art <quote>Zeitmaschine</quote>." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:746 msgid "" "Subversion can operate across networks, which allows it to be used by people " "on different computers. At some level, the ability for various people to " "modify and manage the same set of data from their respective locations " "fosters collaboration. Progress can occur more quickly without a single " "conduit through which all modifications must occur. And because the work is " "versioned, you need not fear that quality is the trade-off for losing that " "conduit—if some incorrect change is made to the data, just undo that " "change." msgstr "" "Subversion kann netzwerkübergreifend arbeiten, was die Benutzung durch " "Menschen an verschiedenen Computern ermöglicht. Auf einer bestimmten Ebene " "fördert die Fähigkeit unterschiedlicher Personen dieselbe Menge an Daten " "bearbeiten und verwalten zu können die Zusammenarbeit. Ohne auf einen " "einzigen Kanal, über den alle Änderungen abgewickelt werden müssen, " "beschränkt zu sein, kann das Vorankommen beschleunigt werden. Und weil die " "Arbeit versioniert ist, braucht nicht befürchtet zu werden, dass die " "Qualität bei Verlust dieses Kanals geopfert wird – falls irgendeine " "falsche Änderung an den Daten gemacht wird, kann man sie einfach " "zurücknehmen." # type: Content of: <preface><sect1><para> #: ../en/book/ch00-preface.xml:756 msgid "" "Some version control systems are also software configuration management " "(SCM) systems. These systems are specifically tailored to manage trees of " "source code and have many features that are specific to software " "development—such as natively understanding programming languages, or " "supplying tools for building software. Subversion, however, is not one of " "these systems. It is a general system that can be used to manage " "<emphasis>any</emphasis> collection of files. For you, those files might be " "source code—for others, anything from grocery shopping lists to " "digital video mixdowns and beyond." msgstr "" "Manche Versionskontrollsysteme sind auch Software-Konfigurationsmanagement-" "Systeme. Diese Systeme sind maßgeschneidert, um ganze Verzeichnisbäume mit " "Quellcode zu verwalten und verfügen über viele Merkmale, die spezifisch für " "Software-Entwicklung sind – etwa das Verstehen von Programmiersprachen " "oder das Bereitstellen von Werkzeugen zum Bauen von Software. Jedoch gehört " "Subversion nicht zu diesen Systemen. Es ist ein allgemeines System, das " "verwendet werden kann, um <emphasis>alle möglichen</emphasis> Sammlungen von " "Dateien zu verwalten. Für Sie mag es sich dabei um Quellcode handeln – " "für andere mag es dabei um alles von Einkaufslisten bis zu digitalen " "Videomischungen und weit darüber hinaus gehen." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:772 msgid "Is Subversion the Right Tool?" msgstr "Ist Subversion das richtige Werkzeug?" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:774 msgid "" "If you're a user or system administrator pondering the use of Subversion, " "the first question you should ask yourself is: \"Is this the right tool for " "the job?\" Subversion is a fantastic hammer, but be careful not to view " "every problem as a nail." msgstr "" "Falls Sie ein Anwender oder Systemadministrator sind und den Einsatz von " "Subversion erwägen, sollte die erste Frage, die Sie sich stellen, sein: " "\"Ist es das richtige Werkzeug für die Aufgabe?\" Subversion ist ein " "fantastischer Hammer, achten Sie jedoch darauf, dass Sie nicht jedes Problem " "als einen Nagel sehen." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:780 msgid "" "If you need to archive old versions of files and directories, possibly " "resurrect them, or examine logs of how they've changed over time, then " "Subversion is exactly the right tool for you. If you need to collaborate " "with people on documents (usually over a network) and keep track of who made " "which changes, then Subversion is also appropriate. This is why Subversion " "is so often used in software development environments— programming is " "an inherently social activity, and Subversion makes it easy to collaborate " "with other programmers. Of course, there's a cost to using Subversion as " "well: administrative overhead. You'll need to manage a data repository to " "store the information and all its history, and be diligent about backing it " "up. When working with the data on a daily basis, you won't be able to copy, " "move, rename, or delete files the way you usually do. Instead, you'll have " "to do all of those things through Subversion." msgstr "" "Falls Sie alte Datei- und Verzeichnisversionen aufbewahren, sie eventuell " "wiedererwecken müssen, oder Protokolle darüber auswerten möchten, wie sie " "sich im Lauf der Zeit geändert haben, ist Subversion das genau passende " "Werkzeug für Sie. Subversion ist auch geeignet, wenn Sie mit mehreren " "Leuten gemeinsam (üblicherweise über das Netz) an Dokumenten arbeiten und " "verfolgen müssen, wer welche Änderung gemacht hat. Deshalb wird Subversion " "so oft in Softwareentwicklungsumgebungen eingesetzt – Programmierung " "ist von Natur aus eine soziale Tätigkeit und Subversion vereinfacht die " "Zusammenarbeit mit anderen Programmierern. Natürlich ist die Benutzung von " "Subversion nicht umsonst zu bekommen: es kostet administrativen Aufwand. Sie " "müssen ein Daten-Repository verwalten, das die Informationen und ihre " "gesamte Geschichte speichert, und Sie müssen sich gewissenhaft um " "Sicherheitskopien kümmern. Wenn Sie täglich mit den Daten arbeiten, werden " "Sie sie nicht auf die gleiche Art kopieren, verschieben, umbenennen oder " "löschen können wie gewohnt. Stattdessen müssen Sie dafür Subversion " "verwenden." # type: Content of: <preface><sect1><sect2><para><footnote> #: ../en/book/ch00-preface.xml:798 msgid "" "Assuming you're fine with the extra workflow, you should still make sure " "you're not using Subversion to solve a problem that other tools solve " "better. For example, because Subversion replicates data to all the " "collaborators involved, a common misuse is to treat it as a generic " "distribution system. People will sometimes use Subversion to distribute " "huge collections of photos, digital music, or software packages. The " "problem is that this sort of data usually isn't changing at all. The " "collection itself grows over time, but the individual files within the " "collection aren't being changed. In this case, using Subversion is " "<quote>overkill.</quote> <footnote>" msgstr "" "Unter der Annahme, dass Ihnen die zusätzlichen Arbeitsabläufe nichts " "ausmachen, sollten Sie trotzdem sicher sein, dass Sie Subversion nicht für " "die Lösung eines Problems verwenden, das andere Werkzeuge besser lösen " "könnten. Zum Beispiel wird Subversion, weil es die Daten an alle Beteiligten " "verteilt, als generisches Verteilsystem missbraucht. Manchmal wird " "Subversion zum Verteilen von umfangreichen Bildersammlungen, digitaler Musik " "oder Softwarepaketen verwendet. Das Problem damit ist, dass sich diese Art " "Daten für gewöhnlich überhaupt nicht verändert. Die Sammlung selber wächst " "stetig, jedoch werden die einzelnen Dateien der Sammlung nicht verändert. In " "diesem Fall ist die Benutzung von Subversion zu viel des Guten.<footnote>" # type: Content of: <preface><sect1><sect2><para><footnote><para> #: ../en/book/ch00-preface.xml:811 msgid "Or as a friend puts it, <quote>swatting a fly with a Buick.</quote>" msgstr "" "Oder wie es ein Freund ausdrückt: <quote>Eine Fliege mit einem Buick " "erschlagen.</quote>" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:813 msgid "" "</footnote> There are simpler tools that efficiently replicate data " "<emphasis>without</emphasis> the overhead of tracking changes, such as " "<command>rsync</command> or <command>unison</command>." msgstr "" "</footnote> Es gibt einfachere Werkzeuge, die hervorragend Daten " "replizieren, <emphasis>ohne</emphasis> dabei Änderungen mitzuverfolgen, etwa " "<command>rsync</command> oder <command>unison</command>." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:824 msgid "Subversion's History" msgstr "Die Geschichte von Subversion" # type: Content of: <preface><sect1><sect2><para><indexterm><primary> #: ../en/book/ch00-preface.xml:828 msgid "Subversion" msgstr "Subversion" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:830 msgid "" "</indexterm> In early 2000, CollabNet, Inc. (<ulink url=\"http://www.collab." "net\"/>) began seeking developers to write a replacement for CVS. CollabNet " "offers a collaboration software suite called CollabNet Enterprise Edition " "(CEE), of which one component is version control. Although CEE used CVS as " "its initial version control system, CVS's limitations were obvious from the " "beginning, and CollabNet knew it would eventually have to find something " "better. Unfortunately, CVS had become the de facto standard in the open " "source world largely because there <emphasis>wasn't</emphasis> anything " "better, at least not under a free license. So CollabNet determined to write " "a new version control system from scratch, retaining the basic ideas of CVS, " "but without the bugs and misfeatures." msgstr "" "</indexterm> Anfang 2000 begann CollabNet, Inc. (<ulink url=\"http://www." "collab.net\"/>) Entwickler zu suchen, die einen Ersatz für CVS schreiben " "sollten. CollabNet bietet eine Software-Suite namens CollabNet Enterprise " "Edition (CEE) für die Zusammenarbeit an, die auch eine Komponente für " "Versionskontrolle beinhaltet. Obwohl CEE ursprünglich CVS als " "Versionskontrollsystem verwendete, waren die Einschränkungen von CVS von " "Anfang an offensichtlich, und CollabNet war sich bewusst, dass letztendlich " "etwas Besseres gefunden werden musste. Unglücklicherweise war CVS der de-" "facto Standard in der Open-Source-Welt geworden, hauptsächlich deshalb, weil " "es nichts Besseres gab, zumindest nicht unter einer freien Lizenz. Also " "beschloss CollabNet, ein vollständig neues Versionskontrollsystem zu " "schreiben, welches die grundlegenden Ideen von CVS beibehalten, jedoch die " "Fehler und Fehlentwicklungen vermeiden sollte." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:847 msgid "" "In February 2000, they contacted Karl Fogel, the author of <citetitle>Open " "Source Development with CVS</citetitle> (Coriolis, 1999), and asked if he'd " "like to work on this new project. Coincidentally, at the time Karl was " "already discussing a design for a new version control system with his friend " "Jim Blandy. In 1995, the two had started Cyclic Software, a company " "providing CVS support contracts, and although they later sold the business, " "they still used CVS every day at their jobs. Their frustration with CVS had " "led Jim to think carefully about better ways to manage versioned data, and " "he'd already come up with not only the name <quote>Subversion,</quote> but " "also the basic design of the Subversion data store. When CollabNet called, " "Karl immediately agreed to work on the project, and Jim got his employer, " "Red Hat Software, to essentially donate him to the project for an indefinite " "period of time. CollabNet hired Karl and Ben Collins-Sussman, and detailed " "design work began in May 2000. With the help of some well-placed prods from " "Brian Behlendorf and Jason Robbins of CollabNet, and from Greg Stein (at the " "time an independent developer active in the WebDAV/DeltaV specification " "process), Subversion quickly attracted a community of active developers. It " "turned out that many people had encountered the same frustrating experiences " "with CVS and welcomed the chance to finally do something about it." msgstr "" "Im Februar 2000 nahmen sie Verbindung mit Karl Fogel auf, dem Autor von " "<citetitle>Open Source Development with CVS</citetitle> (Coriolis, 1999), " "und fragten ihn, ob er an diesem neuen Projekt mitarbeiten wolle. " "Zufälligerweise besprach Karl bereits einen Entwurf für ein neues " "Versionskontrollsystem mit seinem Freund Jim Blandy. Im Jahr 1995 gründeten " "die beiden Cyclic Software, eine CVS-Beratungsfirma, und sie benutzten, " "obwohl sie die Firma später verkauften, bei ihrer täglichen Arbeit immer " "noch CVS. Ihre Enttäuschung über CVS veranlasste Jim, sorgfältig über " "bessere Möglichkeiten zur Verwaltung versionierter Daten nachzudenken. Er " "hatte sich nicht nur bereits den Namen <quote>Subversion</quote> ausgedacht, " "sondern auch den grundsätzlichen Entwurf der Subversion-Datenablage. Als " "CollabNet rief, stimmte Karl sofort der Mitarbeit am Projekt zu, und Karl " "gelang es, dass sein Arbeitgeber Red Hat Software ihn praktisch auf " "unbestimmte Zeit dem Projekt spendete. CollabNet stellte Karl und Ben " "Collins-Sussman ein und der detaillierte Entwurfsprozess begann im Mai. Dank " "einiger Stupser von Brian Behrendorf und Jason Robbins von CollabNet sowie " "Greg Stein (zu dieser Zeit als unabhängiger Entwickler aktiv im der WebDAV/" "DeltaV Spezifikationsprozess), zog Subversion schnell eine Gemeinde aktiver " "Entwickler an. Es stellte sich heraus, dass viele Leute dieselben " "enttäuschenden Erfahrungen mit CVS gemacht hatten und nun die Gelegenheit " "begrüßten, etwas daran zu ändern." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:873 msgid "" "The original design team settled on some simple goals. They didn't want to " "break new ground in version control methodology, they just wanted to fix " "CVS. They decided that Subversion would match CVS's features and preserve " "the same development model, but not duplicate CVS's most obvious flaws. And " "although it did not need to be a drop-in replacement for CVS, it should be " "similar enough that any CVS user could make the switch with little effort." msgstr "" "Das ursprüngliche Designteam einigte sich auf einige einfache Ziele. Sie " "wollten kein Neuland in Versionskontrollmethodik betreten, sondern einfach " "CVS reparieren. Sie beschlossen, dass Subversion dieselben Merkmale und " "dasselbe Entwicklungsmodell wie CVS haben solle, wobei die Fehler von CVS " "aber nicht noch einmal gemacht werden sollten. Und obwohl es nicht als ein " "hundertprozentiger Ersatz für CVS gedacht war, sollte es dennoch ähnlich " "genug sein, so dass ein leichter Wechsel für einen CVS-Anwender möglich wäre." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:882 msgid "" "After 14 months of coding, Subversion became <quote>self-hosting</quote> on " "August 31, 2001. That is, Subversion developers stopped using CVS to manage " "Subversion's own source code and started using Subversion instead." msgstr "" "Nach vierzehn Monaten Programmierung wurde Subversion am 31. August 2001 " "<quote>selbstbewirtend</quote>, d.h., die Subversion-Entwickler hörten auf, " "CVS für den Quellcode von Subversion zu verwenden und benutzten stattdessen " "Subversion." # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:887 msgid "" "While CollabNet started the project, and still funds a large chunk of the " "work (it pays the salaries of a few full-time Subversion developers), " "Subversion is run like most open source projects, governed by a loose, " "transparent set of rules that encourage meritocracy. CollabNet's copyright " "license is fully compliant with the Debian Free Software Guidelines. In " "other words, anyone is free to download, modify, and redistribute Subversion " "as he pleases; no permission from CollabNet or anyone else is required." msgstr "" "Obwohl CollabNet das Projekt startete und immer noch einen großen Batzen der " "Arbeit finanziert (sie zahlen die Gehälter einiger Vollzeit-Subversion-" "Entwickler), läuft Subversion wie die meisten Open-Source-Projekte, geführt " "von einer Anzahl lockerer, transparenter Regeln, die die Meritokratie " "fördern. Die Urheberrechtslizenzen von CollabNet sind einvernehmlich mit " "den Debian Free Software Guidelines. Mit anderen Worten: Jeder darf " "Subversion nach Belieben herunterladen, ändern und weitergeben; es bedarf " "hierzu keinerlei Zustimmung durch CollabNet oder sonst jemanden." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:902 msgid "Subversion's Architecture" msgstr "Die Architektur von Subversion" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:904 msgid "" "<xref linkend=\"svn.intro.architecture.dia-1\"/> illustrates a <quote>mile-" "high</quote> view of Subversion's design." msgstr "" "<xref linkend=\"svn.intro.architecture.dia-1\"/> illustriert einen " "<quote>kilometerhohen</quote> Blick auf das Design von Subversion." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:909 #, fuzzy #| msgid "Subversion's Architecture" msgid "Subversion's architecture" msgstr "Die Architektur von Subversion" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:913 msgid "" "On one end is a Subversion repository that holds all of your versioned " "data. On the other end is your Subversion client program, which manages " "local reflections of portions of that versioned data (called <quote>working " "copies</quote>). Between these extremes are multiple routes through various " "Repository Access (RA) layers. Some of these routes go across computer " "networks and through network servers which then access the repository. " "Others bypass the network altogether and access the repository directly." msgstr "" "An einem Ende ist das Repository von Subversion, das die gesamten " "versionierten Daten enthält. Am anderen Ende ist das Subversion-Client-" "Programm, das die lokale Spiegelung von Teilen dieser versionierten Daten " "verwaltet (<quote>Arbeitskopien</quote> genannt). Zwischen den " "entgegengesetzten Enden befinden sich mehrere Wege über verschiedene " "Repository-Zugriffsschichten. Einige dieser Pfade gehen über " "Computernetzwerke und über Netzwerkserver, die dann auf das Repository " "zugreifen. Andere lassen das Netz links liegen und greifen direkt auf das " "Repository zu." # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:928 msgid "Subversion's Components" msgstr "Die Komponenten von Subversion" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:930 msgid "" "Subversion, once installed, has a number of different pieces. The following " "is a quick overview of what you get. Don't be alarmed if the brief " "descriptions leave you scratching your head—<emphasis>plenty</" "emphasis> more pages in this book are devoted to alleviating that confusion." msgstr "" "Sobald es installiert ist, hat Subversion eine Anzahl verschiedener Teile. " "Was folgt, ist ein schneller Überblick was Sie bekommen. Lassen Sie sich " "nicht beunruhigen, falls die kurzen Beschreibungen Sie dazu veranlassen, " "sich am Kopf zu kratzen – es gibt in diesem Buch <emphasis>jede Menge</" "emphasis> weiterer Seiten, die dem Ziel gewidmet sind, diese Verwirrung zu " "lindern." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:938 ../en/book/ch09-reference.xml:716 #: ../en/book/ch09-reference.xml:825 ../en/book/ch09-reference.xml:961 #: ../en/book/ch09-reference.xml:1041 ../en/book/ch09-reference.xml:1137 #: ../en/book/ch09-reference.xml:1284 ../en/book/ch09-reference.xml:1361 #: ../en/book/ch09-reference.xml:1499 ../en/book/ch09-reference.xml:1705 #: ../en/book/ch09-reference.xml:1818 ../en/book/ch09-reference.xml:2143 #: ../en/book/ch09-reference.xml:2258 ../en/book/ch09-reference.xml:2307 #: ../en/book/ch09-reference.xml:2414 ../en/book/ch09-reference.xml:2601 #: ../en/book/ch09-reference.xml:2742 ../en/book/ch09-reference.xml:2837 #: ../en/book/ch09-reference.xml:3147 ../en/book/ch09-reference.xml:3293 #: ../en/book/ch09-reference.xml:3368 ../en/book/ch09-reference.xml:3452 #: ../en/book/ch09-reference.xml:3581 ../en/book/ch09-reference.xml:3658 #: ../en/book/ch09-reference.xml:3737 ../en/book/ch09-reference.xml:3835 #: ../en/book/ch09-reference.xml:3938 ../en/book/ch09-reference.xml:4075 #: ../en/book/ch09-reference.xml:4206 ../en/book/ch09-reference.xml:4302 #: ../en/book/ch09-reference.xml:4414 ../en/book/ch09-reference.xml:4857 #: ../en/book/ch09-reference.xml:5054 ../en/book/ch09-reference.xml:5142 msgid "svn" msgstr "svn" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:940 msgid "The command-line client program" msgstr "Das Kommandozeilenprogramm" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:945 ../en/book/ch09-reference.xml:8455 #: ../en/book/ch09-reference.xml:8460 ../en/book/ch09-reference.xml:8464 msgid "svnversion" msgstr "svnversion" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:947 msgid "" "A program for reporting the state (in terms of revisions of the items " "present) of a working copy" msgstr "" "Ein Programm, das den Zustand einer Arbeitskopie (durch Revisionen der " "vorliegenden Objekte) berichtet" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:953 ../en/book/ch05-repository-admin.xml:1074 #: ../en/book/ch09-reference.xml:6586 ../en/book/ch09-reference.xml:6698 #: ../en/book/ch09-reference.xml:6744 ../en/book/ch09-reference.xml:6802 #: ../en/book/ch09-reference.xml:6926 ../en/book/ch09-reference.xml:6972 #: ../en/book/ch09-reference.xml:7044 ../en/book/ch09-reference.xml:7091 #: ../en/book/ch09-reference.xml:7128 ../en/book/ch09-reference.xml:7192 #: ../en/book/ch09-reference.xml:7243 ../en/book/ch09-reference.xml:7295 #: ../en/book/ch09-reference.xml:7341 ../en/book/ch09-reference.xml:7396 #: ../en/book/ch09-reference.xml:7461 ../en/book/ch09-reference.xml:7520 #: ../en/book/ch09-reference.xml:7564 msgid "svnlook" msgstr "svnlook" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:955 msgid "A tool for directly inspecting a Subversion repository" msgstr "Ein Werkzeug zur direkten Untersuchung eines Subversion-Repositorys" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:960 ../en/book/ch05-repository-admin.xml:1039 #: ../en/book/ch09-reference.xml:5320 ../en/book/ch09-reference.xml:5509 #: ../en/book/ch09-reference.xml:5557 ../en/book/ch09-reference.xml:5636 #: ../en/book/ch09-reference.xml:5676 ../en/book/ch09-reference.xml:5778 #: ../en/book/ch09-reference.xml:5809 ../en/book/ch09-reference.xml:5861 #: ../en/book/ch09-reference.xml:5894 ../en/book/ch09-reference.xml:5943 #: ../en/book/ch09-reference.xml:6010 ../en/book/ch09-reference.xml:6064 #: ../en/book/ch09-reference.xml:6104 ../en/book/ch09-reference.xml:6186 #: ../en/book/ch09-reference.xml:6232 ../en/book/ch09-reference.xml:6287 #: ../en/book/ch09-reference.xml:6348 ../en/book/ch09-reference.xml:6404 #: ../en/book/ch09-reference.xml:6458 ../en/book/ch09-reference.xml:6526 msgid "svnadmin" msgstr "svnadmin" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:962 msgid "A tool for creating, tweaking, or repairing a Subversion repository" msgstr "" "Ein Werkzeug zum Erstellen, Verändern oder Reparieren eines Repositorys" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:968 ../en/book/ch08-embedding-svn.xml:118 #: ../en/book/ch09-reference.xml:8615 msgid "mod_dav_svn" msgstr "mod_dav_svn" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:970 msgid "" "A plug-in module for the Apache HTTP Server, used to make your repository " "available to others over a network" msgstr "" "Ein Plug-In-Modul für den Apache-HTTP-Server, wird benötigt, um das " "Repository über ein Netzwerk verfügbar zu machen" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:977 ../en/book/ch06-server-configuration.xml:82 #: ../en/book/ch09-reference.xml:8022 msgid "svnserve" msgstr "svnserve" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:979 msgid "" "A custom standalone server program, runnable as a daemon process or " "invokable by SSH; another way to make your repository available to others " "over a network." msgstr "" "Ein spezielles Server-Programm, dass als Hintergrundprozess laufen oder von " "SSH aufgerufen werden kann; eine weitere Möglichkeit, das Repository über " "ein Netzwerk verfügbar zu machen." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:986 ../en/book/ch05-repository-admin.xml:1205 #: ../en/book/ch09-reference.xml:8207 ../en/book/ch09-reference.xml:8289 #: ../en/book/ch09-reference.xml:8352 ../en/book/ch09-reference.xml:8417 msgid "svndumpfilter" msgstr "svndumpfilter" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:988 msgid "A program for filtering Subversion repository dump streams" msgstr "Ein Programm zum Filtern von Subversion-Repository-Dump-Streams" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:994 ../en/book/ch05-repository-admin.xml:1242 #: ../en/book/ch09-reference.xml:7610 ../en/book/ch09-reference.xml:7745 #: ../en/book/ch09-reference.xml:7815 ../en/book/ch09-reference.xml:7855 #: ../en/book/ch09-reference.xml:7932 msgid "svnsync" msgstr "svnsync" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:996 msgid "" "A program for incrementally mirroring one repository to another over a " "network" msgstr "" "Ein Programm zum inkrementellen Spiegeln eines Repositorys über ein Netzwerk" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch00-preface.xml:1008 msgid "What's New in Subversion" msgstr "Was gibt es Neues in Subversion" # type: Content of: <preface><sect1><sect2><para> #: ../en/book/ch00-preface.xml:1010 msgid "" "The first edition of this book was released in 2004, shortly after " "Subversion had reached 1.0. Over the following four years Subversion " "released five major new versions, fixing bugs and adding major new " "features. While we've managed to keep the online version of this book up to " "date, we're thrilled that the second edition from O'Reilly now covers " "Subversion up through release 1.5, a major milestone for the project. " "Here's a quick summary of major new changes since Subversion 1.0. Note that " "this is not a complete list; for full details, please visit Subversion's web " "site at <ulink url=\"http://subversion.tigris.org\"/>." msgstr "" "Die erste Auflage dieses Buchs wurde 2004 herausgegeben, kurz nachdem " "Subversion die 1.0 erreicht hatte. Innerhalb der nächsten vier Jahre wurden " "fünf neue größere Versionen von Subversion freigegeben, die Fehler " "beseitigten und neue Features einführten. Während wir es schafften, die " "Online-Version dieses Buches aktuell zu halten, sind wir begeistert davon, " "dass die zweite Auflage von O'Reilly nun Subversion bis Release 1.5 " "behandelt, ein großer Meilenstein für das Projekt. Hier ist eine schnelle " "Zusammenfassung der größeren Änderungen seit Subversion 1.0. Beachten Sie, " "dass es keine komplette Liste ist; um alle Details zu sehen, besuchen Sie " "die Subversion-Website bei <ulink url=\"http://subversion.tigris.org\"/>." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:1025 msgid "Subversion 1.1 (September 2004)" msgstr "Subversion 1.1 (September 2004)" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:1027 msgid "" "Release 1.1 introduced FSFS, a flat-file repository storage option for the " "repository. While the Berkeley DB backend is still widely used and " "supported, FSFS has since become the default choice for newly created " "repositories due to its low barrier to entry and minimal maintenance " "requirements. Also in this release came the ability to put symbolic links " "under version control, auto-escaping of URLs, and a localized user interface." msgstr "" "Release 1.1 führte FSFS ein, eine Repository-Speicheroption, die auf Dateien " "basiert. Obwohl das Berkeley-DB-Backend immer noch weitverbreitet ist und " "unterstützt wird, ist FSFS mittlerweile wegen der niedrigen Einstiegshürde " "und des minimalen Wartungsbedarfs die Standard-Auswahl für neu erzeugte " "Repositorys. Ebenfalls kam mit diesem Release die Möglichkeit, symbolische " "Links unter Versionskontrolle zu stellen, das automatische Maskieren von " "URLs und eine sprachabhängige Benutzerschnittstelle." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:1040 msgid "Subversion 1.2 (May 2005)" msgstr "Subversion 1.2 (Mai 2005)" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:1042 msgid "" "Release 1.2 introduced the ability to create server-side locks on files, " "thus serializing commit access to certain resources. While Subversion is " "still a fundamentally concurrent version control system, certain types of " "binary files (e.g. art assets) cannot be merged together. The locking " "feature fulfills the need to version and protect such resources. With " "locking also came a complete WebDAV auto-versioning implementation, allowing " "Subversion repositories to be mounted as network folders. Finally, " "Subversion 1.2 began using a new, faster binary-differencing algorithm to " "compress and retrieve old versions of files." msgstr "" "Mit Release 1.2 konnten serverseitige Sperren auf Dateien erzeugt und somit " "der Commit-Zugriff für bestimmte Ressourcen serialisiert werden. Während " "Subversion immer noch grundsätzlich ein gleichzeitiges " "Versionskontrollsystem ist, können bestimmte Arten binärer Dateien (z.B. " "Kunstobjekte) nicht zusammengeführt werden. Die Sperrmöglichkeit stillt den " "Bedarf, solche Ressourcen zu versionieren und zu schützen. Zusammen mit dem " "Sperren kam auch eine vollständige WebDAV-Auto-Versionierungs-" "Implementierung, die es erlaubt, Subversion-Repositorys als " "Netzwerkverzeichnisse einzuhängen. Schließlich begann Subversion 1.2 einen " "neuen, schnelleren binären Differenzalgorithmus zu verwenden, um alte " "Versionen von Dateien zu komprimieren und hervorzuholen." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:1058 msgid "Subversion 1.3 (December 2005)" msgstr "Subversion 1.3 (Dezember 2005)" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:1060 msgid "" "Release 1.3 brought path-based authorization controls to the " "<command>svnserve</command> server, matching a feature formerly found only " "in the Apache server. The Apache server, however, gained some new logging " "features of its own, and Subversion's API bindings to other languages also " "made great leaps forward." msgstr "" "Release 1.3 brachte pfadbasierte Autorisierungskontrolle für den " "<command>svnserve</command>-Server, was einem Merkmal entsprach, das vorher " "nur im Apache-Server vorzufinden war. Der Apache-Server wiederum bekam " "einige neue eigene Logging-Features, und die Subversion-API-Bindings für " "andere Sprachen machten auch große Sprünge vorwärts." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:1071 msgid "Subversion 1.4 (September 2006)" msgstr "Subversion 1.4 (September 2006)" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:1073 msgid "" "Release 1.4 introduced a whole new tool—<command>svnsync</" "command>—for doing one-way repository replication over a network. " "Major parts of the working copy metadata were revamped to no longer use XML " "(resulting in client-side speed gains), while the Berkeley DB repository " "backend gained the ability to automatically recover itself after a server " "crash." msgstr "" "Release 1.4 führte ein völlig neues Werkzeug – <command>svnsync</" "command> – ein, um eine Einbahn-Replizierung von Repositorys über das " "Netz vornehmen zu können. Größere Teile der Arbeitskopie-Metadaten wurden " "überarbeitet, so dass nicht mehr XML benutzt wurde (was sich in erhöhter " "Geschwindigkeit auf Client-Seite niederschlug), während das Berkeley-DB-" "Repository-Backend die Fähigkeit erhielt, sich nach einem Server-Crash " "automatisch wiederherzustellen." # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch00-preface.xml:1085 msgid "Subversion 1.5 (June 2008)" msgstr "Subversion 1.5 (Juni 2008)" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch00-preface.xml:1087 msgid "" "Release 1.5 took much longer to finish than prior releases, but the " "headliner feature was gigantic: semi-automated tracking of branching and " "merging. This was a huge boon for users, and pushed Subversion far beyond " "the abilities of CVS and into the ranks of commercial competitors such as " "Perforce and Clearcase. Subversion 1.5 also introduced a bevy of other user-" "focused features, such as interactive resolution of file conflicts, partial " "checkouts, client-side management of changelists, powerful new syntax for " "externals definitions, and SASL authentication support for the " "<command>svnserve</command> server." msgstr "" "Release 1.5 brauchte viel länger als vorige Releases, doch das Hauptfeature " "war gigantisch: Halbautomatische Verfolgung des Verzweigens und " "Zusammenführens. Dies war eine riesige Wohltat für Anwender und schob " "Subversion weit jenseits der Fähigkeiten von CVS und in die Reihen " "kommerzieller Mitbewerber wie Perforce und Clearcase. Subversion 1.5 führte " "auch eine große Anzahl anderer, benutzerorientierter Features ein, wie die " "interaktive Auflösung von Dateikonflikten, partielle Checkouts, client-" "seitige Verwaltung von Änderungslisten, eine starke neue Syntax für External-" "Definitionen und SASL-Authentifizierungsunterstützung für den " "<command>svnserve</command>-Server." # type: Content of: <chapter><title> #: ../en/book/ch01-fundamental-concepts.xml:2 msgid "Fundamental Concepts" msgstr "Grundlegende Konzepte" # type: Content of: <chapter><para> #: ../en/book/ch01-fundamental-concepts.xml:4 msgid "" "This chapter is a short, casual introduction to Subversion. If you're new " "to version control, this chapter is definitely for you. We begin with a " "discussion of general version control concepts, work our way into the " "specific ideas behind Subversion, and show some simple examples of " "Subversion in use." msgstr "" "Das Kapitel ist eine kurze, lockere Einführung in Subversion. Wenn Sie noch " "nicht mit Versionskontrolle zu tun hatten, dann ist dieses Kapitel genau für " "Sie. Wir besprechen die grundlegenden Konzepte von Versionskontrolle und " "arbeiten uns in die Richtung von Subversion und dessen spezifischen Ideen " "und zeigen einfache Beispiele zur Anwendung." # type: Content of: <chapter><para> #: ../en/book/ch01-fundamental-concepts.xml:11 msgid "" "Even though the examples in this chapter show people sharing collections of " "program source code, keep in mind that Subversion can manage any sort of " "file collection—it's not limited to helping computer programmers." msgstr "" "Obwohl die Beispiele in diesem Kapitel Leute zeigen, die gemeinsam an " "Quellcode arbeiten, sei daran erinnert, dass Subversion alle möglichen Arten " "von Datensammlungen verwalten kann – es beschränkt sich nicht darauf, " "Entwicklern zu helfen." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:21 msgid "The Repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:23 msgid "" "Subversion is a centralized system for sharing information. At its core is " "a repository, which is a central store of data. The repository stores " "information in the form of a <firstterm>filesystem tree</firstterm>—a " "typical hierarchy of files and directories. Any number of " "<firstterm>clients</firstterm> connect to the repository, and then read or " "write to these files. By writing data, a client makes the information " "available to others; by reading data, the client receives information from " "others. <xref linkend=\"svn.basic.repository.dia-1\"/> illustrates this." msgstr "" "Subversion ist ein zentralisiertes System zur gemeinsamen Nutzung von " "Informationen. In seinem Kern ist ein Repository ein zentraler Speicher von " "Daten. Das Repository speichert Informationen in Form eines " "<firstterm>Dateisystembaumes</firstterm>, typischerweise eine Hierarchie von " "Dateien und Verzeichnissen. Eine beliebige Anzahl von <firstterm>Clients</" "firstterm> verbinden sich mit dem Repository und lesen oder schreiben diese " "Dateien. Durch den Schreibvorgang, macht ein Client Informationen für andere " "verfügbar. Durch den Lesevorgang bekommt der Client Informationen von " "anderen zur Verfügung gestellt. <xref linkend=\"svn.basic.repository.dia-1" "\"/> verdeutlicht das." # type: Content of: <chapter><sect1><figure><title> #: ../en/book/ch01-fundamental-concepts.xml:35 msgid "A typical client/server system" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:39 msgid "" "So why is this interesting? So far, this sounds like the definition of a " "typical file server. And indeed, the repository <emphasis>is</emphasis> a " "kind of file server, but it's not your usual breed. What makes the " "Subversion repository special is that <emphasis>it remembers every change</" "emphasis> ever written to it—every change to every file, and even " "changes to the directory tree itself, such as the addition, deletion, and " "rearrangement of files and directories." msgstr "" "So, warum ist das interessant? Bis zu diesem Punkt hört sich das wie die " "Definition eines typischen File-Servers an. Und tatsächlich, das Repository " "<emphasis>ist</emphasis> eine Art von File-Server, aber nicht von der Art, " "die Sie kennen. Was das Subversion-Repository so speziell macht ist, dass " "es sich <emphasis>jede Änderung merkt</emphasis>, die jemals " "hineingeschrieben wurde. Jede Änderung an jeder Datei und auch Änderungen am " "Verzeichnisbaum selbst, wie z.B. das Hinzufügen, Löschen und Umstrukturieren " "von Dateien und Verzeichnissen." # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:48 msgid "" "When a client reads data from the repository, it normally sees only the " "latest version of the filesystem tree. But the client also has the ability " "to view <emphasis>previous</emphasis> states of the filesystem. For " "example, a client can ask historical questions such as <quote>What did this " "directory contain last Wednesday?</quote> and <quote>Who was the last person " "to change this file, and what changes did he make?</quote> These are the " "sorts of questions that are at the heart of any <firstterm>version control " "system</firstterm>: systems that are designed to track changes to data over " "time." msgstr "" "Wenn ein Client Daten vom Repository liest, bekommt der Client üblicherweise " "nur die letzte Version des Dateisystem-Baumes zu sehen. Der Client hat aber " "auch die Möglichkeit, <emphasis>vorherige</emphasis> Zustände des " "Dateibaumes anzuschauen. Zum Beispiel kann ein Client somit die Frage " "stellen: <quote>Was beinhaltete das Verzeichnis am letzten Mittwoch?</quote> " "und <quote>Wer war die Person, die als letztes die Datei geändert hat und " "welche Änderungen hat sie gemacht?</quote>. Diese Art von Fragen sind die " "Grundlage eines <firstterm>Versionskontrollsystems</firstterm>, Systeme, die " "dazu entwickelt wurden, um die Änderungen an Daten über die Zeit hin " "aufzuzeichnen." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:66 msgid "Versioning Models" msgstr "Versionierungsmodelle" # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:68 msgid "" "The core mission of a version control system is to enable collaborative " "editing and sharing of data. But different systems use different strategies " "to achieve this. It's important to understand these different strategies, " "for a couple of reasons. First, it will help you compare and contrast " "existing version control systems, in case you encounter other systems " "similar to Subversion. Beyond that, it will also help you make more " "effective use of Subversion, since Subversion itself supports a couple of " "different ways of working." msgstr "" "Die zentrale Aufgabe eines Versionskontrollsystems ist es, die " "Zusammenarbeit beim Editieren gemeinsam benutzter Daten zu ermöglichen. " "Jedoch verwenden unterschiedliche Systeme auch unterschiedliche Strategien, " "um dies zu ermöglichen. Aus einer Reihe von Gründen ist es wichtig, diese " "Unterschiede zu verstehen. Erstmal hilft es dabei, bestehende " "Versionskontrollsysteme zu vergleichen und gegenüberzustellen, falls Ihnen " "andere Systeme begegnen, die Subversion ähneln. Darüber hinaus wird es " "Ihnen helfen, Subversion effektiver zu benutzen, da Subversion selbst eine " "Reihe unterschiedlicher Arbeitsweisen unterstützt." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:80 msgid "The Problem of File Sharing" msgstr "Das Problem ??The Problem of File Sharing" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:82 msgid "" "All version control systems have to solve the same fundamental problem: how " "will the system allow users to share information, but prevent them from " "accidentally stepping on each other's feet? It's all too easy for users to " "accidentally overwrite each other's changes in the repository." msgstr "" "Alle Versionskontrollsysteme haben alle die gleichen fundamentalen Probleme " "zu lösen: Wie soll es Anwendern erlaubt werden Informationen zu teilen aber " "Sie davor bewahren, sich gegenseitig auf die Füße zu treten? Es ist allzu " "einfach die Änderungen eines anderen im Repository zu überschreiben?" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:89 msgid "" "Consider the scenario shown in <xref linkend=\"svn.basic.vsn-models.problem-" "sharing.dia-1\"/>. Suppose we have two coworkers, Harry and Sally. They " "each decide to edit the same repository file at the same time. If Harry " "saves his changes to the repository first, it's possible that (a few moments " "later) Sally could accidentally overwrite them with her own new version of " "the file. While Harry's version of the file won't be lost forever (because " "the system remembers every change), any changes Harry made <emphasis>won't</" "emphasis> be present in Sally's newer version of the file, because she never " "saw Harry's changes to begin with. Harry's work is still effectively " "lost—or at least missing from the latest version of the file—and " "probably by accident. This is definitely a situation we want to avoid!" msgstr "" "Beachten Sie das dargestellte Szenario Consider<xref linkend=\"svn.basic.vsn-" "models.problem-sharing.dia-1\"/>. Nehmen wir an wir haben zwei Kollegen, " "Harry und Sally. Sie haben sich beide entschieden die gleiche Datei zur " "gleichen Zeit zu bearbeiten. Wenn Harry seine Änderungen im Repository " "zuerst speichert ist es möglich, dass einige Augenblicke später, Sally " "unbeabsichtigt mit Ihrer eigenen Version der Datei überschreibt. Während " "Harry's Version der Datei nicht für immer verloren ist (weil das System " "jegliche Änderung aufzeichnet) jede Änderung die Harry gemacht hat overwrite " "them with her own new version of the file. While Harry's version of the " "file won't be lost forever (because the system remembers every change), any " "changes Harry made <emphasis>won't</emphasis> be present in Sally's newer " "version of the file, because she never saw Harry's changes to begin with. " "Harry's work is still effectively lost—or at least missing from the " "latest version of the file—and probably by accident. This is " "definitely a situation we want to avoid!" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:106 #, fuzzy #| msgid "The Problem of File Sharing" msgid "The problem to avoid" msgstr "Das Problem ??The Problem of File Sharing" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:114 msgid "The Lock-Modify-Unlock Solution" msgstr "The Lock-Modify-Unlock Solution" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:116 msgid "" "Many version control systems use a <firstterm>lock-modify-unlock</firstterm> " "model to address the problem of many authors clobbering each other's work. " "In this model, the repository allows only one person to change a file at a " "time. This exclusivity policy is managed using locks. Harry must " "<quote>lock</quote> a file before he can begin making changes to it. If " "Harry has locked a file, Sally cannot also lock it, and therefore cannot " "make any changes to that file. All she can do is read the file and wait for " "Harry to finish his changes and release his lock. After Harry unlocks the " "file, Sally can take her turn by locking and editing the file. <xref " "linkend=\"svn.basic.vsn-models.lock-unlock.dia-1\"/> demonstrates this " "simple solution." msgstr "" "Many version control systems use a <firstterm>lock-modify-unlock</firstterm> " "model to address the problem of many authors clobbering each other's work. " "In this model, the repository allows only one person to change a file at a " "time. This exclusivity policy is managed using locks. Harry must " "<quote>lock</quote> a file before he can begin making changes to it. If " "Harry has locked a file, Sally cannot also lock it, and therefore cannot " "make any changes to that file. All she can do is read the file and wait for " "Harry to finish his changes and release his lock. After Harry unlocks the " "file, Sally can take her turn by locking and editing the file. <xref " "linkend=\"svn.basic.vsn-models.lock-unlock.dia-1\"/> demonstrates this " "simple solution." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:132 #, fuzzy #| msgid "The Lock-Modify-Unlock Solution" msgid "The lock-modify-unlock solution" msgstr "The Lock-Modify-Unlock Solution" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:136 msgid "" "The problem with the lock-modify-unlock model is that it's a bit restrictive " "and often becomes a roadblock for users:" msgstr "" "The problem with the lock-modify-unlock model is that it's a bit restrictive " "and often becomes a roadblock for users:" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:142 msgid "" "<emphasis>Locking may cause administrative problems.</emphasis> Sometimes " "Harry will lock a file and then forget about it. Meanwhile, because Sally " "is still waiting to edit the file, her hands are tied. And then Harry goes " "on vacation. Now Sally has to get an administrator to release Harry's " "lock. The situation ends up causing a lot of unnecessary delay and wasted " "time." msgstr "" "<emphasis>Locking may cause administrative problems.</emphasis> Sometimes " "Harry will lock a file and then forget about it. Meanwhile, because Sally " "is still waiting to edit the file, her hands are tied. And then Harry goes " "on vacation. Now Sally has to get an administrator to release Harry's " "lock. The situation ends up causing a lot of unnecessary delay and wasted " "time." # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:154 msgid "" "<emphasis>Locking may cause unnecessary serialization.</emphasis> What if " "Harry is editing the beginning of a text file, and Sally simply wants to " "edit the end of the same file? These changes don't overlap at all. They " "could easily edit the file simultaneously, and no great harm would come, " "assuming the changes were properly merged together. There's no need for " "them to take turns in this situation." msgstr "" "<emphasis>Locking may cause unnecessary serialization.</emphasis> What if " "Harry is editing the beginning of a text file, and Sally simply wants to " "edit the end of the same file? These changes don't overlap at all. They " "could easily edit the file simultaneously, and no great harm would come, " "assuming the changes were properly merged together. There's no need for " "them to take turns in this situation." # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:167 msgid "" "<emphasis>Locking may create a false sense of security.</emphasis> Suppose " "Harry locks and edits file A, while Sally simultaneously locks and edits " "file B. But what if A and B depend on one another, and the changes made to " "each are semantically incompatible? Suddenly A and B don't work together " "anymore. The locking system was powerless to prevent the problem—yet " "it somehow provided a false sense of security. It's easy for Harry and " "Sally to imagine that by locking files, each is beginning a safe, insulated " "task, and thus they need not bother discussing their incompatible changes " "early on. Locking often becomes a substitute for real communication." msgstr "" "<emphasis>Locking may create a false sense of security.</emphasis> Suppose " "Harry locks and edits file A, while Sally simultaneously locks and edits " "file B. But what if A and B depend on one another, and the changes made to " "each are semantically incompatible? Suddenly A and B don't work together " "anymore. The locking system was powerless to prevent the problem—yet " "it somehow provided a false sense of security. It's easy for Harry and " "Sally to imagine that by locking files, each is beginning a safe, insulated " "task, and thus they need not bother discussing their incompatible changes " "early on. Locking often becomes a substitute for real communication." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:188 msgid "The Copy-Modify-Merge Solution" msgstr "The Copy-Modify-Merge Solution" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:190 msgid "" "Subversion, CVS, and many other version control systems use a " "<firstterm>copy-modify-merge</firstterm> model as an alternative to " "locking. In this model, each user's client contacts the project repository " "and creates a personal <firstterm>working copy</firstterm>—a local " "reflection of the repository's files and directories. Users then work " "simultaneously and independently, modifying their private copies. Finally, " "the private copies are merged together into a new, final version. The " "version control system often assists with the merging, but ultimately, a " "human being is responsible for making it happen correctly." msgstr "" "Subversion, CVS, and many other version control systems use a " "<firstterm>copy-modify-merge</firstterm> model as an alternative to " "locking. In this model, each user's client contacts the project repository " "and creates a personal <firstterm>working copy</firstterm>—a local " "reflection of the repository's files and directories. Users then work " "simultaneously and independently, modifying their private copies. Finally, " "the private copies are merged together into a new, final version. The " "version control system often assists with the merging, but ultimately, a " "human being is responsible for making it happen correctly." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:202 msgid "" "Here's an example. Say that Harry and Sally each create working copies of " "the same project, copied from the repository. They work concurrently and " "make changes to the same file A within their copies. Sally saves her " "changes to the repository first. When Harry attempts to save his changes " "later, the repository informs him that his file A is <firstterm>out of date</" "firstterm>. In other words, file A in the repository has somehow changed " "since he last copied it. So Harry asks his client to <firstterm>merge</" "firstterm> any new changes from the repository into his working copy of file " "A. Chances are that Sally's changes don't overlap with his own; once he has " "both sets of changes integrated, he saves his working copy back to the " "repository. <xref linkend=\"svn.basic.vsn-models.copy-merge.dia-1\"/> and " "<xref linkend=\"svn.basic.vsn-models.copy-merge.dia-2\"/> show this process." msgstr "" "Here's an example. Say that Harry and Sally each create working copies of " "the same project, copied from the repository. They work concurrently and " "make changes to the same file A within their copies. Sally saves her " "changes to the repository first. When Harry attempts to save his changes " "later, the repository informs him that his file A is <firstterm>out of date</" "firstterm>. In other words, that file A in the repository has somehow " "changed since he last copied it. So Harry asks his client to " "<firstterm>merge</firstterm> any new changes from the repository into his " "working copy of file A. Chances are that Sally's changes don't overlap with " "his own; once he has both sets of changes integrated, he saves his working " "copy back to the repository. <xref linkend=\"svn.basic.vsn-models.copy-" "merge.dia-1\"/> and <xref linkend=\"svn.basic.vsn-models.copy-merge.dia-2\"/" "> show this process." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:220 #, fuzzy #| msgid "The Copy-Modify-Merge Solution" msgid "The copy-modify-merge solution" msgstr "The Copy-Modify-Merge Solution" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:225 #, fuzzy #| msgid "The Copy-Modify-Merge Solution" msgid "The copy-modify-merge solution (continued)" msgstr "The Copy-Modify-Merge Solution" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:229 msgid "" "But what if Sally's changes <emphasis>do</emphasis> overlap with Harry's " "changes? What then? This situation is called a <firstterm>conflict</" "firstterm>, and it's usually not much of a problem. When Harry asks his " "client to merge the latest repository changes into his working copy, his " "copy of file A is somehow flagged as being in a state of conflict: he'll be " "able to see both sets of conflicting changes and manually choose between " "them. Note that software can't automatically resolve conflicts; only humans " "are capable of understanding and making the necessary intelligent choices. " "Once Harry has manually resolved the overlapping changes—perhaps after " "a discussion with Sally—he can safely save the merged file back to the " "repository." msgstr "" "But what if Sally's changes <emphasis>do</emphasis> overlap with Harry's " "changes? What then? This situation is called a <firstterm>conflict</" "firstterm>, and it's usually not much of a problem. When Harry asks his " "client to merge the latest repository changes into his working copy, his " "copy of file A is somehow flagged as being in a state of conflict: he'll be " "able to see both sets of conflicting changes and manually choose between " "them. Note that software can't automatically resolve conflicts; only humans " "are capable of understanding and making the necessary intelligent choices. " "Once Harry has manually resolved the overlapping changes—perhaps after " "a discussion with Sally—he can safely save the merged file back to the " "repository." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:243 msgid "" "The copy-modify-merge model may sound a bit chaotic, but in practice, it " "runs extremely smoothly. Users can work in parallel, never waiting for one " "another. When they work on the same files, it turns out that most of their " "concurrent changes don't overlap at all; conflicts are infrequent. And the " "amount of time it takes to resolve conflicts is usually far less than the " "time lost by a locking system." msgstr "" "The copy-modify-merge model may sound a bit chaotic, but in practice, it " "runs extremely smoothly. Users can work in parallel, never waiting for one " "another. When they work on the same files, it turns out that most of their " "concurrent changes don't overlap at all; conflicts are infrequent. And the " "amount of time it takes to resolve conflicts is usually far less than the " "time lost by a locking system." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:251 msgid "" "In the end, it all comes down to one critical factor: user communication. " "When users communicate poorly, both syntactic and semantic conflicts " "increase. No system can force users to communicate perfectly, and no system " "can detect semantic conflicts. So there's no point in being lulled into a " "false sense of security that a locking system will somehow prevent " "conflicts; in practice, locking seems to inhibit productivity more than " "anything else." msgstr "" "In the end, it all comes down to one critical factor: user communication. " "When users communicate poorly, both syntactic and semantic conflicts " "increase. No system can force users to communicate perfectly, and no system " "can detect semantic conflicts. So there's no point in being lulled into a " "false sense of security that a locking system will somehow prevent " "conflicts; in practice, locking seems to inhibit productivity more than " "anything else." # type: Content of: <chapter><sect1><sect2><sidebar> #: ../en/book/ch01-fundamental-concepts.xml:260 msgid "<sidebar id=\"svn.basic.vsn-models.copy-merge.sb-1\">" msgstr "<sidebar id=\"svn.basic.vsn-models.copy-merge.sb-1\">" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch01-fundamental-concepts.xml:261 msgid "When Locking Is Necessary" msgstr "When Locking Is Necessary" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:263 msgid "" "While the lock-modify-unlock model is considered generally harmful to " "collaboration, sometimes locking is appropriate." msgstr "" "While the lock-modify-unlock model is considered generally harmful to " "collaboration, sometimes locking is appropriate." # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:267 msgid "" "The copy-modify-merge model is based on the assumption that files are " "contextually mergeable—that is, that the majority of the files in the " "repository are line-based text files (such as program source code). But for " "files with binary formats, such as artwork or sound, it's often impossible " "to merge conflicting changes. In these situations, it really is necessary " "for users to take strict turns when changing the file. Without serialized " "access, somebody ends up wasting time on changes that are ultimately " "discarded." msgstr "" "The copy-modify-merge model is based on the assumption that files are " "contextually mergeable—that is, that the majority of the files in the " "repository are line-based text files (such as program source code). But for " "files with binary formats, such as artwork or sound, it's often impossible " "to merge conflicting changes. In these situations, it really is necessary " "for users to take strict turns when changing the file. Without serialized " "access, somebody ends up wasting time on changes that are ultimately " "discarded." # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:278 msgid "" "While Subversion is primarily a copy-modify-merge system, it still " "recognizes the need to lock an occasional file, and thus provides mechanisms " "for this. We discuss this feature in <xref linkend=\"svn.advanced.locking\"/" ">." msgstr "" "While Subversion is primarily a copy-modify-merge system, it still " "recognizes the need to lock an occasional file, and thus provides mechanisms " "for this. We discuss this feature in <xref linkend=\"svn.advanced.locking\"/" ">." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:295 msgid "Subversion in Action" msgstr "Subversion in Action" # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:297 msgid "" "It's time to move from the abstract to the concrete. In this section, we'll " "show real examples of Subversion being used." msgstr "" "Es ist an der Zeit, sich vom Abstrakten zum Konkreten zu bewegen. In diesem " "Abschnitt werden wir echte Beispiele zur Benutzung von Subversion zeigen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:303 msgid "Subversion Repository URLs" msgstr "Subversion-Repository-URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:305 msgid "" "Throughout this book, Subversion uses URLs to identify versioned files and " "directories in Subversion repositories. For the most part, these URLs use " "the standard syntax, allowing for server names and port numbers to be " "specified as part of the URL:" msgstr "" "Das ganze Buch hindurch verwendet Subversion URLs, um Dateien und " "Verzeichnisse in Subversion-Repositorys zu identifizieren. Meistens benutzen " "diese URLs die Standardsyntax, die es erlaubt, Servernamen und Portnummern " "als Teil des URL zu spezifizieren:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:311 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" msgstr "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:316 msgid "" "But there are some nuances in Subversion's handling of URLs that are " "notable. For example, URLs containing the <literal>file://</literal> access " "method (used for local repositories) must, in accordance with convention, " "have either a server name of <literal>localhost</literal> or no server name " "at all:" msgstr "" "Allerdings gibt es einige bemerkenswerte Feinheiten, wie Subversion mit URLs " "umgeht. Beispielsweise dürfen URLs, die die <literal>file://</literal>-" "Zugriffsmethode enthalten (für lokale Repositorys verwendet), gemäß " "Konvention entweder den Servernamen <literal>localhost</literal> oder gar " "keinen Servernamen enthalten:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:323 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos\n" "…\n" "$ svn checkout file://localhost/var/svn/repos\n" "…\n" msgstr "" "\n" "$ svn checkout file:///var/svn/repos\n" "…\n" "$ svn checkout file://localhost/var/svn/repos\n" "…\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:330 msgid "" "Also, users of the <literal>file://</literal> scheme on Windows platforms " "will need to use an unofficially <quote>standard</quote> syntax for " "accessing repositories that are on the same machine, but on a different " "drive than the client's current working drive. Either of the two following " "URL path syntaxes will work, where <literal>X</literal> is the drive on " "which the repository resides:" msgstr "" "Darüber hinaus müssen Benutzer des <literal>file://</literal> Schemas auf " "Windows-Plattformen eine inoffizielle <quote>Standard</quote>-Syntax " "verwenden falls auf Repositorys auf derselben Maschine aber auf einem " "anderen Laufwerk zugegriffen werden soll. Beide der folgenden URL-Pfad-" "Syntaxen funktionieren, wobei <literal>X</literal> das Laufwerk ist, wo das " "Repository liegt:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:339 #, no-wrap msgid "" "\n" "C:\\> svn checkout file:///X:/var/svn/repos\n" "…\n" "C:\\> svn checkout \"file:///X|/var/svn/repos\"\n" "…\n" msgstr "" "\n" "C:\\> svn checkout file:///X:/var/svn/repos\n" "…\n" "C:\\> svn checkout \"file:///X|/var/svn/repos\"\n" "…\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:346 msgid "" "In the second syntax, you need to quote the URL so that the vertical bar " "character is not interpreted as a pipe. Also, note that a URL uses forward " "slashes even though the native (non-URL) form of a path on Windows uses " "backslashes." msgstr "" "Bei der zweiten Syntax muss der URL in Anführungsstriche eingeschlossen " "werden, damit der senkrechte Strich nicht als Pipe-Symbol interpretiert " "wird. Beachten Sie auch, dass in einem URL Schrägstriche verwendet werden, " "obwohl es unter Windows üblich ist, für Pfade umgekehrte Schrägstriche zu " "verwenden." # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch01-fundamental-concepts.xml:352 msgid "" "You cannot use Subversion's <literal>file://</literal> URLs in a regular web " "browser the way typical <literal>file://</literal> URLs can. When you " "attempt to view a <literal>file://</literal> URL in a regular web browser, " "it reads and displays the contents of the file at that location by examining " "the filesystem directly. However, Subversion's resources exist in a virtual " "filesystem (see <xref linkend=\"svn.developer.layerlib.repos\" />), and your " "browser will not understand how to interact with that filesystem." msgstr "" "Sie können die <literal>file://</literal> URLs von Subversion nicht in einem " "normalen Web-Browser auf die Art und Weise verwenden wie andere " "<literal>file://</literal> URLs. Falls Sie versuchen, einen <literal>file://" "</literal> URL in einem gewöhnlichen Web-Browser anzusehen, wird der Inhalt " "der Datei von der angegebenen Stelle direkt aus dem Dateisystem gelesen und " "angezeigt. Allerdings befinden sich die Daten von Subversion in einem " "virtuellen Dateisystem (siehe <xref linkend=\"svn.developer.layerlib.repos" "\" />), und der Browser wird nicht mit diesem Dateisystem umzugehen wissen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:364 msgid "" "Finally, it should be noted that the Subversion client will automatically " "encode URLs as necessary, just like a web browser does. For example, if a " "URL contains a space or upper-ASCII character as in the following:" msgstr "" "Zuletzt sei noch angemerkt, dass der Subversion-Client, wie ein Web-Browser, " "nötigenfalls automatisch URLs umwandelt. Falls zum Beispiel in einem URL " "Leerzeichen oder Großbuchstaben vorkommen wie hier:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:369 #, no-wrap msgid "" "\n" "$ svn checkout \"http://host/path with space/project/españa\"\n" msgstr "" "\n" "$ svn checkout \"http://host/path with space/project/españa\"\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:373 msgid "" "then Subversion will escape the unsafe characters and behave as though you " "had typed:" msgstr "" "wird Subversion die unsicheren Zeichen umwandeln, als ob Sie Folgendes " "geschrieben hätten:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:376 #, no-wrap msgid "" "\n" "$ svn checkout http://host/path%20with%20space/project/espa%C3%B1a\n" msgstr "" "\n" "$ svn checkout http://host/path%20with%20space/project/espa%C3%B1a\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:380 msgid "" "If the URL contains spaces, be sure to place it within quotation marks so " "that your shell treats the whole thing as a single argument to the " "<command>svn</command> program." msgstr "" "Falls ein URL Leerzeichen beinhalten sollte, stellen Sie sicher, das der URL " "in Anführungszeichen gesetzt wird, damit die Shell alles als ein Argument " "für das <command>svn</command> Programm behandelt." # type: Content of: <chapter><sect1><sect2><sidebar> #: ../en/book/ch01-fundamental-concepts.xml:384 msgid "<sidebar id=\"svn.basic.in-action.wc.sb-1\">" msgstr "<sidebar id=\"svn.basic.in-action.wc.sb-1\">" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch01-fundamental-concepts.xml:385 msgid "Repository URLs" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:387 msgid "" "You can access Subversion repositories through many different methods—" "on local disk or through various network protocols, depending on how your " "administrator has set things up for you. A repository location, however, is " "always a URL. <xref linkend=\"svn.basic.in-action.wc.tbl-1\"/> describes " "how different URL schemes map to the available access methods." msgstr "" "Sie können auf Subversion-Repositorys über viele unterschiedliche Methoden " "zugreifen – auf der lokalen Festplatte oder über verschiedene " "Protokolle, je nachdem, wie Ihr Administrator es eingerichtet hat. Ein Ort " "im Repository ist jedenfalls immer ein URL. <xref linkend=\"svn.basic.in-" "action.wc.tbl-1\"/> beschreibt, wie unterschiedliche URL Schemata auf die " "verfügbaren Zugriffsmethoden abgebildet werden." # type: Content of: <chapter><sect1><sect2><sidebar><table><title> #: ../en/book/ch01-fundamental-concepts.xml:397 msgid "Repository access URLs" msgstr "Repository-Zugriffs-URLs" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><thead><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:401 msgid "Schema" msgstr "Schema" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><thead><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:402 msgid "Access method" msgstr "Zugriffsmethode" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:407 msgid "<literal>file:///</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:408 msgid "Direct repository access (on local disk)" msgstr "Direkter Repository-Zugriff (auf lokaler Festplatte)" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:411 msgid "<literal>http://</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:412 msgid "Access via WebDAV protocol to Subversion-aware Apache server" msgstr "" "Zugriff über das WebDAV-Protokoll auf Apache-Server, die Subversion " "unterstützen" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:416 msgid "<literal>https://</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:417 msgid "Same as <literal>http://</literal>, but with SSL encryption." msgstr "Wie <literal>http://</literal>, jedoch mit SSL-Verschlüsselung." # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:421 msgid "<literal>svn://</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:422 msgid "Access via custom protocol to an <literal>svnserve</literal> server" msgstr "" "Zugriff über eigenes Protokoll auf einen <literal>svnserve</literal>-Server" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:426 msgid "<literal>svn+ssh://</literal>" msgstr "<literal>svn+ssh://</literal>" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch01-fundamental-concepts.xml:427 msgid "Same as <literal>svn://</literal>, but through an SSH tunnel." msgstr "Wie <literal>svn://</literal>, jedoch über SSH getunnelt." # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:434 msgid "" "For more information on how Subversion parses URLs, see <xref linkend=\"svn." "advanced.reposurls\"/>. For more information on the different types of " "network servers available for Subversion, see <xref linkend=\"svn." "serverconfig\"/>." msgstr "" "Für mehr Informationen darüber, wie Subversion URLs parst, siehe <xref " "linkend=\"svn.advanced.reposurls\"/>. Für weitergehende Informationen zu " "den unterschiedlichen Typen verfügbarer Netzwerk-Servern für Subversion, " "siehe <xref linkend=\"svn.serverconfig\"/>." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:446 msgid "Working Copies" msgstr "Arbeitskopien" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:448 msgid "" "You've already read about working copies; now we'll demonstrate how the " "Subversion client creates and uses them." msgstr "" "Sie haben schon über Arbeitskopien gelesen; nun werden wir zeigen, wie der " "Subversion-Client sie erzeugt und benutzt." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:452 msgid "" "A Subversion working copy is an ordinary directory tree on your local " "system, containing a collection of files. You can edit these files however " "you wish, and if they're source code files, you can compile your program " "from them in the usual way. Your working copy is your own private work " "area: Subversion will never incorporate other people's changes, nor make " "your own changes available to others, until you explicitly tell it to do " "so. You can even have multiple working copies of the same project." msgstr "" "Eine Subversion-Arbeitskopie ist ein gewöhnlicher Verzeichnisbaum auf Ihrem " "lokalen System, der eine Ansammlung von Dateien enthält. Sie können diese " "Dateien nach belieben bearbeiten, und wenn es sich um Quelltexte handelt, " "können Sie hieraus Ihr Programm auf die übliche Weise compilieren. Ihre " "Arbeitskopie ist Ihr privater Arbeitsbereich: nie wird Subversion weder die " "Änderungen von anderen einpflegen, noch Ihre eigenen Änderungen anderen zur " "Verfügung stellen, bis Sie es ausdrücklich dazu auffordern. Sie können sogar " "mehrere Arbeitskopien desselben Projektes haben." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:462 msgid "" "After you've made some changes to the files in your working copy and " "verified that they work properly, Subversion provides you with commands to " "<quote>publish</quote> your changes to the other people working with you on " "your project (by writing to the repository). If other people publish their " "own changes, Subversion provides you with commands to merge those changes " "into your working copy (by reading from the repository)." msgstr "" "Nachdem Sie einige Änderungen an den Dateien Ihrer Arbeitskopie gemacht und " "sichergestellt haben, dass sie funktionieren, stellt Ihnen Subversion " "Befehle zur Verfügung, um Ihre Änderungen den anderen, die an Ihrem Projekt " "mitarbeiten, <quote>publik</quote> zu machen (indem es ins Repository " "schreibt). Wenn die anderen ihre Änderungen veröffentlichen, stellt Ihnen " "Subversion Befehle zur Verfügung, um diese Änderungen in Ihr " "Arbeitsverzeichnis einzupflegen (indem es aus dem Repository liest)." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:471 msgid "" "A working copy also contains some extra files, created and maintained by " "Subversion, to help it carry out these commands. In particular, each " "directory in your working copy contains a subdirectory named <filename>.svn</" "filename>, also known as the working copy's <firstterm>administrative " "directory</firstterm>. The files in each administrative directory help " "Subversion recognize which files contain unpublished changes, and which " "files are out of date with respect to others' work." msgstr "" "Eine Arbeitskopie verfügt darüber hinaus über einige zusätzliche Dateien, " "die von Subversion erzeugt und gepflegt werden, um es bei diesen Befehlen zu " "unterstützen. Insbesondere enthält jedes Verzeichnis Ihrer Arbeitskopie ein " "Unterverzeichnis namens <filename>.svn</filename>, auch bekannt als das " "<firstterm>Verwaltungsverzeichnis</firstterm> der Arbeitskopie. Die Dateien " "in jedem Verwaltungsverzeichnis helfen Subversion dabei, zu erkennen, welche " "Dateien unveröffentlichte Änderungen enthalten und welche Dateien " "hinsichtlich der Arbeit anderer veraltet sind." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:481 msgid "" "A typical Subversion repository often holds the files (or source code) for " "several projects; usually, each project is a subdirectory in the " "repository's filesystem tree. In this arrangement, a user's working copy " "will usually correspond to a particular subtree of the repository." msgstr "" "Oft enthält ein typisches Subversion-Repository die Dateien (oder den " "Quelltext) für verschiedene Projekte; für gewöhnlich ist jedes Projekt ein " "Unterverzeichnis im Dateisystembaum des Repositorys. Bei dieser Anordnung " "entspricht die Arbeitskopie eines Benutzers gewöhnlich einem bestimmten " "Unterverzeichnis des Repositorys." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:487 msgid "" "For example, suppose you have a repository that contains two software " "projects, <literal>paint</literal> and <literal>calc</literal>. Each " "project lives in its own top-level subdirectory, as shown in <xref linkend=" "\"svn.basic.in-action.wc.dia-1\"/>." msgstr "" "Nehmen wir zum Beispiel an, Sie haben ein Repository, das zwei Software-" "Projekte beinhaltet, <literal>paint</literal> und <literal>calc</literal>. " "Jedes Projekt ist in einem eigenen Hauptverzeichnis abgelegt, wie in <xref " "linkend=\"svn.basic.in-action.wc.dia-1\"/> dargestellt." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:494 #, fuzzy #| msgid "The Repository" msgid "The repository's filesystem" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:498 msgid "" "To get a working copy, you must <firstterm>check out</firstterm> some " "subtree of the repository. (The term <emphasis>check out</emphasis> may " "sound like it has something to do with locking or reserving resources, but " "it doesn't; it simply creates a private copy of the project for you.) For " "example, if you check out <filename>/calc</filename>, you will get a working " "copy like this:" msgstr "" "Um eine Arbeitskopie zu erhalten, muss zunächst irgendein Teilbaum des " "Repositorys <firstterm>ausgecheckt</firstterm> werden(check out). (Der " "Begriff <emphasis>check out</emphasis> hört sich an, als habe es etwas mit " "dem Sperren oder Reservieren von Ressourcen zu tun, hat es aber nicht; es " "erzeugt lediglich eine private Kopie des Projektes für Sie.) Wenn Sie zum " "Beispiel <filename>/calc</filename> auschecken, bekommen Sie eine " "Arbeitskopie wie diese:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:506 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.example.com/repos/calc\n" "A calc/Makefile\n" "A calc/integer.c\n" "A calc/button.c\n" "Checked out revision 56.\n" "\n" "$ ls -A calc\n" "Makefile button.c integer.c .svn/\n" msgstr "" "\n" "$ svn checkout http://svn.example.com/repos/calc\n" "A calc/Makefile\n" "A calc/integer.c\n" "A calc/button.c\n" "Checked out revision 56.\n" "\n" "$ ls -A calc\n" "Makefile button.c integer.c .svn/\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:517 msgid "" "The list of letter <literal>A</literal>s in the left margin indicates that " "Subversion is adding a number of items to your working copy. You now have a " "personal copy of the repository's <filename>/calc</filename> directory, with " "one additional entry—<filename>.svn</filename>—which holds the " "extra information needed by Subversion, as mentioned earlier." msgstr "" "Die Liste der <literal>A</literal>s am linken Rand zeigt an, dass Subversion " "Ihrer Arbeitskopie eine Anzahl von Objekten hinzufügt (Add). Sie haben nun " "eine persönliche Kopie des Verzeichnisses <filename>/calc</filename> im " "Repository, mit einem zusätzlichen Eintrag – <filename>.svn</filename> " "– das, wie bereits erwähnt, die besonderen Informationen enthält, die " "Subversion benötigt." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:525 msgid "" "Suppose you make changes to <filename>button.c</filename>. Since the " "<filename>.svn</filename> directory remembers the file's original " "modification date and contents, Subversion can tell that you've changed the " "file. However, Subversion does not make your changes public until you " "explicitly tell it to. The act of publishing your changes is more commonly " "known as <firstterm>committing</firstterm> (or <firstterm>checking in</" "firstterm>) changes to the repository." msgstr "" "Angenommen, Sie nehmen Änderungen an <filename>button.c</filename> vor. Da " "sich das Verzeichnis <filename>.svn</filename> den ursprünglichen " "Änderungszeitpunkt und den Inhalt der Datei merkt, kann Subversion erkennen, " "dass Sie die Datei verändert haben. Trotzdem veröffentlicht Subversion Ihre " "Änderungen solange nicht, bis Sie es ausdrücklich hierzu auffordern. Der " "Vorgang des Veröffentlichens von Änderungen über das Repository ist " "gemeinhin bekannter als <firstterm>commit</firstterm> (oder <firstterm>check " "in</firstterm>)." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:534 msgid "" "To publish your changes to others, you can use Subversion's <command>svn " "commit</command> command:" msgstr "" "Um Ihre Änderungen anderen gegenüber zu veröffentlichen, können Sie den " "Subversion-Befehl <command>svn commit</command> verwenden:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:537 #, no-wrap msgid "" "\n" "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" "Sending button.c\n" "Transmitting file data .\n" "Committed revision 57.\n" msgstr "" "\n" "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" "Sending button.c\n" "Transmitting file data .\n" "Committed revision 57.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:544 msgid "" "Now your changes to <filename>button.c</filename> have been committed to the " "repository, with a note describing your change (namely, that you fixed a " "typo). If another user checks out a working copy of <filename>/calc</" "filename>, she will see your changes in the latest version of the file." msgstr "" "Nun sind Ihre Änderungen an <filename>button.c</filename> dem Repository " "überstellt, mitsamt einer Notiz, die Ihre Änderung beschreibt (nämlich, dass " "Sie einen Tippfehler beseitigt haben). Wenn eine andere Benutzerin eine " "Arbeitskopie von <filename>/calc</filename> auscheckt, wird sie Ihre " "Änderungen in der letzten Version der Datei sehen können." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:551 msgid "" "Suppose you have a collaborator, Sally, who checked out a working copy of " "<filename>/calc</filename> at the same time you did. When you commit your " "change to <filename>button.c</filename>, Sally's working copy is left " "unchanged; Subversion modifies working copies only at the user's request." msgstr "" "angenommen, Sie haben eine Mitarbeiterin, Sally, die eine Arbeitskopie von " "<filename>/calc</filename> gleichzeitig mit Ihnen ausgecheckt hat. Wenn Sie " "Ihre Änderung an <filename>button.c</filename> committen, bleibt Sallys " "Arbeitskopie unverändert; Subversion ändert Arbeitskopien nur auf Wunsch des " "Benutzers." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:558 msgid "" "To bring her project up to date, Sally can ask Subversion to " "<firstterm>update</firstterm> her working copy, by using the <command>svn " "update</command> command. This will incorporate your changes into her " "working copy, as well as any others that have been committed since she " "checked it out." msgstr "" "Um ihr Projekt auf den neuesten Stand zu bringen, kann Sally Subversion dazu " "auffordern, ihre Arbeitskopie zu aktualisieren, indem sie den Befehl " "<command>svn update</command> verwendet. Das bringt sowohl Ihre als auch " "alle anderen Änderungen die committet wurden seit sie ausgecheckt hatte in " "ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:564 #, no-wrap msgid "" "\n" "$ pwd\n" "/home/sally/calc\n" "\n" "$ ls -A\n" "Makefile button.c integer.c .svn/\n" "\n" "$ svn update\n" "U button.c\n" "Updated to revision 57.\n" msgstr "" "\n" "$ pwd\n" "/home/sally/calc\n" "\n" "$ ls -A\n" "Makefile button.c integer.c .svn/\n" "\n" "$ svn update\n" "U button.c\n" "Updated to revision 57.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:576 msgid "" "The output from the <command>svn update</command> command indicates that " "Subversion updated the contents of <filename>button.c</filename>. Note that " "Sally didn't need to specify which files to update; Subversion uses the " "information in the <filename>.svn</filename> directory as well as further " "information in the repository, to decide which files need to be brought up " "to date." msgstr "" "Die Ausgabe des <command>svn update</command> Befehls zeigt, dass Subversion " "den Inhalt von <filename>button.c</filename> aktualisiert hat (Update). " "Beachten Sie, dass Sally nicht angeben musste, welche Dateien zu " "aktualisieren sind; Subversion benutzt die Informationen aus dem <filename>." "svn</filename> Verzeichnis und darüber hinaus weitere Informationen im " "Repository, um zu entscheiden, welche Dateien auf den neuesten Stand " "gebracht werden müssen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:589 msgid "Revisions" msgstr "Revisionen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:591 msgid "" "An <command>svn commit</command> operation publishes changes to any number " "of files and directories as a single atomic transaction. In your working " "copy, you can change files' contents; create, delete, rename, and copy files " "and directories; and then commit a complete set of changes as an atomic " "transaction." msgstr "" "Ein <command>svn commit</command> veröffentlicht Änderungen an einer " "beliebigen Anzahl von Dateien und Verzeichnissen als eine einzige atomare " "Transaktion. In Ihrer Arbeitskopie können Sie Dateiinhalte ändern, Dateien " "und Verzeichnisse erzeugen, löschen, umbenennen und kopieren und dann den " "gesamten Umfang der Änderungen als atomare Transaktion durch ein " "<command>svn commit</command> in das Repository einbringen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:598 msgid "" "By atomic transaction, we mean simply this: either all of the changes happen " "in the repository, or none of them happens. Subversion tries to retain this " "atomicity in the face of program crashes, system crashes, network problems, " "and other users' actions." msgstr "" "Eine atomare Transaktion bedeutet: entweder es gehen alle Änderungen in das " "Repository oder keine. Angesichts von Programmabstürzen, Systemabstürzen, " "Netzproblemen oder anderer Benutzeraktionen hält Subversion an dieser " "Atomizität fest." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:604 msgid "" "Each time the repository accepts a commit, this creates a new state of the " "filesystem tree, called a <firstterm>revision</firstterm>. Each revision is " "assigned a unique natural number, one greater than the number of the " "previous revision. The initial revision of a freshly created repository is " "numbered 0 and consists of nothing but an empty root directory." msgstr "" "Jedes Mal wenn das Repository ein Commit annimmt, wird ein neuer Zustand des " "Dateisystem-Baums erzeugt, der <firstterm>Revision</firstterm> genannt wird. " "Jeder Revision wird eine einmalige natürliche Zahl zugewiesen, die um eins " "größer ist als die Vorgänger-Revision. Die anfängliche Revision eines frisch " "erzeugten Repositorys bekommt die Nummer 0 und besteht lediglich aus einem " "leeren Wurzelverzeichnis." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:612 msgid "" "<xref linkend=\"svn.basic.in-action.revs.dia-1\"/> illustrates a nice way to " "visualize the repository. Imagine an array of revision numbers, starting at " "0, stretching from left to right. Each revision number has a filesystem " "tree hanging below it, and each tree is a <quote>snapshot</quote> of the way " "the repository looked after a commit." msgstr "" "<xref linkend=\"svn.basic.in-action.revs.dia-1\"/> zeigt, wie man sich das " "Repository vorstellen kann. Stellen Sie sich eine Reihe von Revisionsnummern " "vor, die bei 0 startet und von links nach rechts wächst. Jede " "Revisionsnummer hat einen Dateisystem-Baum unter sich hängen, der ein " "<quote>Schnappschuss</quote> des Repositorys nach einem Commit ist." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:620 #, fuzzy #| msgid "The Repository" msgid "The repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><sect3><sidebar> #: ../en/book/ch01-fundamental-concepts.xml:624 #: ../en/book/ch02-basic-usage.xml:57 ../en/book/ch02-basic-usage.xml:190 #: ../en/book/ch02-basic-usage.xml:278 ../en/book/ch02-basic-usage.xml:516 #: ../en/book/ch02-basic-usage.xml:629 ../en/book/ch02-basic-usage.xml:671 #: ../en/book/ch02-basic-usage.xml:723 ../en/book/ch02-basic-usage.xml:1819 #: ../en/book/ch02-basic-usage.xml:1874 #: ../en/book/ch03-advanced-topics.xml:225 #: ../en/book/ch03-advanced-topics.xml:421 #: ../en/book/ch03-advanced-topics.xml:734 #: ../en/book/ch03-advanced-topics.xml:914 #: ../en/book/ch03-advanced-topics.xml:1247 #: ../en/book/ch03-advanced-topics.xml:1359 #: ../en/book/ch03-advanced-topics.xml:1712 #: ../en/book/ch03-advanced-topics.xml:2367 #: ../en/book/ch03-advanced-topics.xml:2656 #: ../en/book/ch03-advanced-topics.xml:3214 #: ../en/book/ch04-branching-and-merging.xml:209 #: ../en/book/ch04-branching-and-merging.xml:607 #: ../en/book/ch04-branching-and-merging.xml:2187 #: ../en/book/ch05-repository-admin.xml:2704 #: ../en/book/ch06-server-configuration.xml:913 #: ../en/book/ch06-server-configuration.xml:1432 #: ../en/book/ch06-server-configuration.xml:1609 #: ../en/book/ch06-server-configuration.xml:2337 #: ../en/book/ch06-server-configuration.xml:2818 #: ../en/book/ch06-server-configuration.xml:2912 #: ../en/book/ch06-server-configuration.xml:3176 #: ../en/book/ch06-server-configuration.xml:3306 #: ../en/book/ch07-customizing-svn.xml:932 #: ../en/book/ch08-embedding-svn.xml:246 ../en/book/ch08-embedding-svn.xml:544 #: ../en/book/ch08-embedding-svn.xml:813 ../en/book/ch08-embedding-svn.xml:951 msgid "<sidebar>" msgstr "<sidebar>" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch01-fundamental-concepts.xml:625 msgid "Global Revision Numbers" msgstr "Globale Revisionsnummern" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch01-fundamental-concepts.xml:627 msgid "" "Unlike most version control systems, Subversion's revision numbers apply to " "<emphasis>entire trees</emphasis>, not individual files. Each revision " "number selects an entire tree, a particular state of the repository after " "some committed change. Another way to think about it is that revision N " "represents the state of the repository filesystem after the Nth commit. " "When Subversion users talk about <quote>revision 5 of <filename>foo.c</" "filename>,</quote> they really mean <quote><filename>foo.c</filename> as it " "appears in revision 5.</quote> Notice that in general, revisions N and M of " "a file do <emphasis>not</emphasis> necessarily differ! Many other version " "control systems use per-file revision numbers, so this concept may seem " "unusual at first. (Former CVS users might want to see <xref linkend=\"svn." "forcvs\"/> for more details.)" msgstr "" "Anders als die meisten Versionskontrollsysteme werden die Revisionsnummern " "von Subversion auf <emphasis>komplette Bäume</emphasis> anstatt auf einzelne " "Dateien angewendet. Jede Revisionsnummer wählt einen kompletten Baum aus; " "ein besonderer Zustand nach dem Commit einer Änderung. Man kann sich auch " "vorstellen, dass Revision N den Zustand des Repository-Dateisystems nach dem " "N-ten Commit repräsentiert. Wenn Subversion-Benutzer von <quote>Revision 5 " "von <filename>foo.c</filename></quote> sprechen, meinen sie tatsächlich " "<quote><filename>foo.c</filename> so wie es in Revision 5 aussieht</quote>. " "Beachten Sie, dass sich im Allgemeinen die Revisionen N und M einer Datei " "<emphasis>nicht</emphasis> notwendigerweise unterscheiden! Viele andere " "Versionskontrollsysteme verwenden dateibezogene Revisionsnummern, so dass " "dieses Konzept zunächst ungewöhnlich aussieht. (Ehemalige CVS-Benutzer " "sollten sich für weitergehende Informationen <xref linkend=\"svn.forcvs\"/> " "ansehen.)" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:645 msgid "" "It's important to note that working copies do not always correspond to any " "single revision in the repository; they may contain files from several " "different revisions. For example, suppose you check out a working copy from " "a repository whose most recent revision is 4:" msgstr "" "Es ist wichtig zu beachten, dass eine Arbeitskopie nicht immer genau einer " "Revision im Repository zugeordnet werden kann; sie kann Dateien aus " "verschiedenen Revisionen beinhalten. Nehmen wir z.B. an, Sie checken sich " "eine Arbeitskopie einer Datei aus einem Repository aus, deren neueste " "Revision 4 ist:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:651 #, no-wrap msgid "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:4\n" msgstr "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:4\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:657 msgid "" "At the moment, this working directory corresponds exactly to revision 4 in " "the repository. However, suppose you make a change to <filename>button.c</" "filename>, and commit that change. Assuming no other commits have taken " "place, your commit will create revision 5 of the repository, and your " "working copy will now look like this:" msgstr "" "In diesem Augenblick entspricht Ihre Arbeitskopie exakt der Revision im " "Repository. Sie machen jetzt allerdings eine Änderung an <filename>button.c</" "filename> und bringen diese Änderung mit einem Commit ins Repository. " "Angenommen, dass keine weiteren Commits vorgenommen wurden, wird Ihr Commit " "die Revision 5 im Repository erzeugen, und Ihre Arbeitskopie sieht so aus:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:664 #, no-wrap msgid "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:5\n" msgstr "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:5\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:670 msgid "" "Suppose that, at this point, Sally commits a change to <filename>integer.c</" "filename>, creating revision 6. If you use <command>svn update</command> to " "bring your working copy up to date, it will look like this:" msgstr "" "Angenommen, zu diesem Zeitpunkt macht Sally einen Commit für eine Änderung " "an <filename>integer.c</filename> und erzeugt Revision 6. Wenn Sie " "<command>svn update</command> verwenden, um Ihre Arbeitskopie zu " "aktualisieren, sieht sie so aus:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch01-fundamental-concepts.xml:675 #, no-wrap msgid "" "\n" "calc/Makefile:6\n" " integer.c:6\n" " button.c:6\n" msgstr "" "\n" "calc/Makefile:6\n" " integer.c:6\n" " button.c:6\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:681 msgid "" "Sally's change to <filename>integer.c</filename> will appear in your working " "copy, and your change will still be present in <filename>button.c</" "filename>. In this example, the text of <filename>Makefile</filename> is " "identical in revisions 4, 5, and 6, but Subversion will mark your working " "copy of <filename>Makefile</filename> with revision 6 to indicate that it is " "still current. So, after you do a clean update at the top of your working " "copy, it will generally correspond to exactly one revision in the repository." msgstr "" "Sallys Änderung an <filename>integer.c</filename> erscheint in Ihrer " "Arbeitskopie, und Ihre Änderung ist immer noch in <filename>button.c</" "filename>. In diesem Beispiel ist der Text von <filename>Makefile</" "filename> in den Revisionen 4, 5 und 6 identisch, jedoch markiert Subversion " "die Arbeitskopie von <filename>Makefile</filename> mit Revision 6, um zu " "zeigen, dass es noch aktuell ist. Wenn Sie also ein sauberes Update von der " "Wurzel Ihrer Arbeitskopie her machen, sollte sie im Allgemeinen genau einer " "Revision im Repository entsprechen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:696 msgid "How Working Copies Track the Repository" msgstr "Wie Arbeitskopien das Repository verfolgen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:698 msgid "" "For each file in a working directory, Subversion records two essential " "pieces of information in the <filename>.svn/</filename> administrative area:" msgstr "" "Für jede Datei eines Arbeitsverzeichnis merkt sich Subversion zwei " "essentielle Informationen im <filename>.svn/</filename>-Verwaltungsbereich:" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:705 msgid "" "What revision your working file is based on (this is called the file's " "<firstterm>working revision</firstterm>)" msgstr "" "Auf welcher Revision Ihre Arbeitsdatei aufbaut (das wird die " "<firstterm>Arbeitsrevision</firstterm> der Datei genannt)" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:711 msgid "" "A timestamp recording of when the local copy was last updated by the " "repository" msgstr "" "Ein Zeitstempel, der festhält, wann die lokale Kopie das letzte Mal vom " "Repository aktualisiert wurde." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:716 msgid "" "Given this information, by talking to the repository, Subversion can tell " "which of the following four states a working file is in:" msgstr "" "Mit diesen Informationen kann Subversion durch Kommunikation mit dem " "Repository feststellen, in welchem der folgenden Zustände sich eine " "Arbeitsdatei befindet:" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch01-fundamental-concepts.xml:722 msgid "Unchanged, and current" msgstr "Unverändert und aktuell" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:725 msgid "" "The file is unchanged in the working directory, and no changes to that file " "have been committed to the repository since its working revision. An " "<command>svn commit</command> of the file will do nothing, and an " "<command>svn update</command> of the file will do nothing." msgstr "" "Die Datei im Arbeitsverzeichnis ist unverändert, und keinerlei Änderungen an " "der Datei sind seit der Arbeitsrevision an das Repository übergeben worden. " "Ein <command>svn commit</command> der Datei würde nichts machen, und ein " "<command>svn update</command> der Datei auch nicht." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch01-fundamental-concepts.xml:735 msgid "Locally changed, and current" msgstr "Lokal geändert und aktuell" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:738 msgid "" "The file has been changed in the working directory, and no changes to that " "file have been committed to the repository since you last updated. There " "are local changes that have not been committed to the repository; thus an " "<command>svn commit</command> of the file will succeed in publishing your " "changes, and an <command>svn update</command> of the file will do nothing." msgstr "" "Die Datei wurde im Arbeitsverzeichnis geändert, und keinerlei Änderungen an " "der Datei sind seit der letzten Aktualisierung an das Repository übergeben " "worden. Es gibt lokale Änderungen, die noch nicht an das Repository " "übergeben worden sind, so dass ein <command>svn commit</command> der Datei " "Ihre Änderungen erfolgreich veröffentlichen würde, und ein <command>svn " "update</command> der Datei nichts tun würde." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch01-fundamental-concepts.xml:749 msgid "Unchanged, and out of date" msgstr "Unverändert und veraltet" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:752 msgid "" "The file has not been changed in the working directory, but it has been " "changed in the repository. The file should eventually be updated in order " "to make it current with the latest public revision. An <command>svn commit</" "command> of the file will do nothing, and an <command>svn update</command> " "of the file will fold the latest changes into your working copy." msgstr "" "Die Datei wurde im Arbeitsverzeichnis nicht geändert, jedoch im Repository. " "Die Datei sollte aktualisiert werden, damit sie bezüglich der letzten " "öffentlichen Revision aktuell ist. Ein <command>svn commit</command> der " "Datei würde nichts machen, und ein <command>svn update</command> der Datei " "würde die letzten Änderungen in Ihre Arbeitskopie einbringen." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch01-fundamental-concepts.xml:764 msgid "Locally changed, and out of date" msgstr "Lokal geändert und veraltet" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:767 msgid "" "The file has been changed both in the working directory and in the " "repository. An <command>svn commit</command> of the file will fail with an " "<quote>out-of-date</quote> error. The file should be updated first; an " "<command>svn update</command> command will attempt to merge the public " "changes with the local changes. If Subversion can't complete the merge in a " "plausible way automatically, it leaves it to the user to resolve the " "conflict." msgstr "" "Die Datei wurde sowohl im Arbeitsverzeichnis als auch im Repository " "geändert. Ein <command>svn commit</command> der Datei würde mit einem " "<quote>out-of-date</quote> Fehler abbrechen. Die Datei sollte erst " "aktualisiert werden; ein <command>svn update</command> Befehl würde " "versuchen, die öffentlichen mit den lokalen Änderungen zusammenzuführen. " "Wenn Subversion diese Zusammenführung nicht plausibel automatisch " "durchführen kann, wird die Auflösung des Konflikts dem Benutzer überlassen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:781 msgid "" "This may sound like a lot to keep track of, but the <command>svn status</" "command> command will show you the state of any item in your working copy. " "For more information on that command, see <xref linkend=\"svn.tour.cycle." "examine.status\" />." msgstr "" "Das hört sich an, als müsse man jede Menge mitverfolgen, aber der " "<command>svn status</command> Befehl zeigt Ihnen den Zustand jedes Objektes " "in Ihrer Arbeitskopie. Weitergehende Informationen zu diesem Befehl finden " "Sie unter <xref linkend=\"svn.tour.cycle.examine.status\" />." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch01-fundamental-concepts.xml:791 msgid "Mixed Revision Working Copies" msgstr "Arbeitskopien mit gemischten Revisionen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch01-fundamental-concepts.xml:793 msgid "" "As a general principle, Subversion tries to be as flexible as possible. One " "special kind of flexibility is the ability to have a working copy containing " "files and directories with a mix of different working revision numbers. " "Unfortunately, this flexibility tends to confuse a number of new users. If " "the earlier example showing mixed revisions perplexed you, here's a primer " "on why the feature exists and how to make use of it." msgstr "" "Als allgemeingültiges Prinzip versucht Subversion, so flexibel wie möglich " "zu sein. Eine besondere Ausprägung der Flexibilität ist die Fähigkeit, eine " "Arbeitskopie bestehend aus Dateien und Verzeichnissen mit einer Mischung " "unterschiedlicher Revisionsnummern zu haben. Unglücklicherweise neigt diese " "Flexibilität dazu, eine Anzahl neuer Benutzer zu verwirren. Wenn Sie das " "vorangegangene Beispiel, das gemischte Revisionen vorgestellt hat, " "verwirrte, zeigen wir hier eine Einführung warum es diese Möglichkeit gibt " "und wie sie verwendet wird." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch01-fundamental-concepts.xml:804 msgid "Updates and commits are separate" msgstr "Updates und Commits sind getrennt" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:806 msgid "" "One of the fundamental rules of Subversion is that a <quote>push</quote> " "action does not cause a <quote>pull,</quote> nor vice versa. Just because " "you're ready to submit new changes to the repository doesn't mean you're " "ready to receive changes from other people. And if you have new changes " "still in progress, <command>svn update</command> should gracefully merge " "repository changes into your own, rather than forcing you to publish them." msgstr "" "Eine der grundlegenden Regeln von Subversion ist, dass eine Aktion, die in " "das Repository schreibt keine Aktion zur Folge hat, die aus dem Repository " "liest und umgekehrt. Wenn Sie bereit sind, neue Änderungen an das Repository " "zu übergeben, heißt das noch lange nicht, dass Sie auch die Änderungen " "anderer haben möchten. Und wenn Sie noch an Änderungen arbeiten, sollte " "<command>svn update</command> elegant die Änderungen aus dem Repository mit " "Ihren Änderungen zusammenführen anstatt Sie dazu zu zwingen, Ihre Änderungen " "zu veröffentlichen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:816 msgid "" "The main side effect of this rule is that it means a working copy has to do " "extra bookkeeping to track mixed revisions as well as be tolerant of the " "mixture. It's made more complicated by the fact that directories themselves " "are versioned." msgstr "" "Der hauptsächliche Nebeneffekt dieser Regel ist, dass eine Arbeitskopie " "zusätzlich buchhalten muss, um sowohl gemischte Revisionen zu verfolgen als " "auch diese Mischung vertragen zu können. Die Tatsache, dass auch " "Verzeichnisse selbst versioniert sind, verkompliziert die Sache nur." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:822 msgid "" "For example, suppose you have a working copy entirely at revision 10. You " "edit the file <filename>foo.html</filename> and then perform an <command>svn " "commit</command>, which creates revision 15 in the repository. After the " "commit succeeds, many new users would expect the working copy to be entirely " "at revision 15, but that's not the case! Any number of changes might have " "happened in the repository between revisions 10 and 15. The client knows " "nothing of those changes in the repository, since you haven't yet run " "<command>svn update</command>, and <command>svn commit</command> doesn't " "pull down new changes. If, on the other hand, <command>svn commit</command> " "were to automatically download the newest changes, it would be possible to " "set the entire working copy to revision 15—but then we'd be breaking " "the fundamental rule of <quote>push</quote> and <quote>pull</quote> " "remaining separate actions. Therefore, the only safe thing the Subversion " "client can do is mark the one file—<filename>foo.html</filename>—" "as being at revision 15. The rest of the working copy remains at revision " "10. Only by running <command>svn update</command> can the latest changes be " "downloaded and the whole working copy be marked as revision 15." msgstr "" "Nehmen wir zum Beispiel an, Ihre Arbeitskopie besteht komplett aus Revision " "10. Sie bearbeiten die Datei <filename>foo.html</filename> und führen ein " "<command>svn commit</command> aus, das die Revision 15 im Repository " "erzeugt. Nach dem erfolgreichen Commit würden viele neue Benutzer erwarten, " "dass die gesamte Arbeitskopie auf Revision 15 stehe, was aber nicht der Fall " "ist! Alle möglichen Änderungen können sich zwischen Revision 10 und 15 im " "Repository zugetragen haben. Der Client weiß nichts über diese Änderungen im " "Repository, da Sie noch nicht <command>svn update</command> aufgerufen " "haben, und <command>svn commit</command> zieht keine Änderungen herein. " "Wenn andererseits <command>svn commit</command> automatisch Änderungen " "hereinziehen würde, könnte die gesamte Arbeitskopie auf Revision 15 gebracht " "werden – doch dann wäre die grundlegende Regel verletzt, dass Lesen " "und Schreiben getrennte Aktionen sind. Deshalb ist das einzig Sichere, das " "der Subversion-Client tun kann, die eine Datei – <filename>foo.html</" "filename> – als zur Revision 15 gehörig zu kennzeichnen. Der Rest der " "Arbeitskopie verbleibt bei Revision 10. Nur durch <command>svn update</" "command> können die neuesten Änderungen hereingezogen und die gesamte " "Arbeitskopie als Revision 15 gekennzeichnet werden." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch01-fundamental-concepts.xml:851 msgid "Mixed revisions are normal" msgstr "Gemischte Revisionen sind normal" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:853 msgid "" "The fact is, <emphasis>every time</emphasis> you run <command>svn commit</" "command> your working copy ends up with some mixture of revisions. The " "things you just committed are marked as having larger working revisions than " "everything else. After several commits (with no updates in between), your " "working copy will contain a whole mixture of revisions. Even if you're the " "only person using the repository, you will still see this phenomenon. To " "examine your mixture of working revisions, use the <command>svn status</" "command> command with the <option>--verbose</option> option (see <xref " "linkend=\"svn.tour.cycle.examine.status\"/> for more information)." msgstr "" "Tatsache ist, dass <emphasis>jedes Mal</emphasis> wenn Sie <command>svn " "commit</command> aufgerufen haben, die Arbeitskopie aus irgendeiner Mischung " "von Revisionen besteht. Die Sachen, die Sie eben ins Repository gebracht " "haben, werden mit höheren Revisionsnummern gekennzeichnet als alles andere. " "Nach einigen Commits (ohne zwischenzeitliche Updates) ist Ihre Arbeitskopie " "eine Riesenmischung von Revisionen. Selbst wenn Sie die einzige Person sind, " "die das Repository benutzt, werden sie dieses Phänomen bemerken. Um Ihre " "Mischung aus Arbeitsrevisionen untersuchen zu können, verwenden Sie den " "Befehl <command>svn status</command> mit der <option>--verbose</option>-" "Option (siehe <xref linkend=\"svn.tour.cycle.examine.status\"/> für " "weitergehende Informationen)." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:866 msgid "" "Often, new users are completely unaware that their working copy contains " "mixed revisions. This can be confusing, because many client commands are " "sensitive to the working revision of the item they're examining. For " "example, the <command>svn log</command> command is used to display the " "history of changes to a file or directory (see <xref linkend=\"svn.tour." "history.log\"/>). When the user invokes this command on a working copy " "object, he expects to see the entire history of the object. But if the " "object's working revision is quite old (often because <command>svn update</" "command> hasn't been run in a long time), the history of the " "<emphasis>older</emphasis> version of the object is shown." msgstr "" "Oft ist neuen Benutzern überhaupt nicht bewusst, das ihre Arbeitskopie " "gemischte Revisionen beinhaltet. Das kann zur Verwirrung führen, weil viele " "Client-Programme empfindlich auf die Revision des Objektes reagieren, das " "sie untersuchen. Beispielsweise wird der <command>svn log</command>-Befehl " "verwendet, um die Historie der Änderungen einer Datei oder eines " "Verzeichnisses darzustellen (siehe <xref linkend=\"svn.tour.history.log\"/" ">). Wenn der Benutzer diesen Befehl auf ein Objekt in der Arbeitskopie " "anwendet, erwartet er, die gesamte Historie des Objektes zu sehen. Wenn " "jedoch die Arbeitsrevision des Objektes ziemlich alt ist (oftmals weil lange " "Zeit kein <command>svn update</command> aufgerufen wurde), wird die Historie " "der <emphasis>älteren</emphasis> Version des Objekts angezeigt." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch01-fundamental-concepts.xml:884 msgid "Mixed revisions are useful" msgstr "Gemischte Revisionen sind nützlich" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:886 msgid "" "If your project is sufficiently complex, you'll discover that it's sometimes " "nice to forcibly <firstterm>backdate</firstterm> (or update to a revision " "older than the one you already have) portions of your working copy to an " "earlier revision; you'll learn how to do that in <xref linkend=\"svn.tour\"/" ">. Perhaps you'd like to test an earlier version of a submodule contained " "in a subdirectory, or perhaps you'd like to figure out when a bug first came " "into existence in a specific file. This is the <quote>time machine</quote> " "aspect of a version control system—the feature that allows you to move " "any portion of your working copy forward and backward in history." msgstr "" "Wenn Ihr Projekt hinreichend komplex ist, werden Sie entdecken, dass es " "manchmal ganz nett sein kann, Teile Ihrer Arbeitskopie " "<firstterm>zurückzudatieren</firstterm> (oder auf eine ältere Version als " "die vorliegende zu aktualisieren); wie das gemacht wird, wird in <xref " "linkend=\"svn.tour\"/> gezeigt. Vielleicht möchten Sie eine ältere Version " "eines Teilmoduls in einem Unterverzeichnis testen, oder Sie möchten " "herausbekommen, wann ein Fehler das erste Mal in einer Datei auftauchte. " "Dies ist der <quote>Zeitmaschinen</quote>-Aspekt eines " "Versionskontrollsystems – die Eigenschaft, die es ermöglicht, " "irgendeinen Teil Ihrer Arbeitskopie zeitlich nach vorne oder nach hinten zu " "verschieben." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch01-fundamental-concepts.xml:904 msgid "Mixed revisions have limitations" msgstr "Gemischte Revisionen haben ihre Grenzen" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:906 msgid "" "However you make use of mixed revisions in your working copy, there are " "limitations to this flexibility." msgstr "" "Wie auch immer Sie gemischte Revisionen in Ihrer Arbeitskopie verwenden, " "diese Flexibilität hat ihre Grenzen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:909 msgid "" "First, you cannot commit the deletion of a file or directory that isn't " "fully up to date. If a newer version of the item exists in the repository, " "your attempt to delete will be rejected to prevent you from accidentally " "destroying changes you've not yet seen." msgstr "" "Erstens kann die Löschung einer Datei oder eines Verzeichnisses nicht an das " "Repository übergeben werden, wenn die Datei oder das Verzeichnis nicht ganz " "aktuell ist. Falls eine neuere Version im Repository existiert, wird Ihr " "Löschversuch abgelehnt, um zu vermeiden, dass Sie versehentlich Änderungen " "löschen, die Sie noch nicht gesehen haben." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch01-fundamental-concepts.xml:915 msgid "" "Second, you cannot commit a metadata change to a directory unless it's fully " "up to date. You'll learn about attaching <quote>properties</quote> to items " "in <xref linkend=\"svn.advanced\"/>. A directory's working revision defines " "a specific set of entries and properties, and thus committing a property " "change to an out-of-date directory may destroy properties you've not yet " "seen." msgstr "" "Zweitens können Sie keine Änderungen an Metadaten eines Verzeichnisses an " "das Repository übergeben, wenn das Verzeichnis nicht ganz aktuell ist. In " "<xref linkend=\"svn.advanced\"/> werden Sie lernen, wie man " "<quote>Propertys</quote> an Objekte hängt. Die Arbeitskopie eines " "Verzeichnisses definiert eine bestimmte Menge von Einträgen und Propertys, " "so dass eine Property-Änderung an einem veralteten Verzeichnis Propertys " "zerstören kann, die Sie noch nicht gesehen haben." # type: Content of: <chapter><sect1><title> #: ../en/book/ch01-fundamental-concepts.xml:933 #: ../en/book/ch02-basic-usage.xml:2276 #: ../en/book/ch03-advanced-topics.xml:4068 #: ../en/book/ch04-branching-and-merging.xml:3123 #: ../en/book/ch05-repository-admin.xml:3199 #: ../en/book/ch07-customizing-svn.xml:1305 #: ../en/book/ch08-embedding-svn.xml:1351 msgid "Summary" msgstr "Zusammenfassung" # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:935 msgid "We covered a number of fundamental Subversion concepts in this chapter:" msgstr "" "In diesem Kapitel haben wir eine Anzahl fundamentaler Konzepte von " "Subversion behandelt:" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:940 msgid "" "We introduced the notions of the central repository, the client working " "copy, and the array of repository revision trees." msgstr "" "Wir haben die Begriffe zentrales Repository, Arbeitskopie und Reihe von " "Revisionsbäumen des Repositorys eingeführt." # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:946 msgid "" "We saw some simple examples of how two collaborators can use Subversion to " "publish and receive changes from one another, using the <quote>copy-modify-" "merge</quote> model." msgstr "" "Wir haben einige einfache Beispiele gesehen, wie zwei Mitarbeiter Subversion " "verwenden können, um gegenseitig Änderungen auszutauschen, indem das " "<quote>kopieren-verändern-zusammenführen</quote>-Modell benutzt wird." # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch01-fundamental-concepts.xml:953 msgid "" "We talked a bit about the way Subversion tracks and manages information in a " "working copy." msgstr "" "Wir haben ein wenig darüber geredet, wie Subversion Informationen in einer " "Arbeitskopie verfolgt und verwaltet." # type: Content of: <chapter><sect1><para> #: ../en/book/ch01-fundamental-concepts.xml:959 msgid "" "At this point, you should have a good idea of how Subversion works in the " "most general sense. Armed with this knowledge, you should now be ready to " "move into the next chapter, which is a detailed tour of Subversion's " "commands and features." msgstr "" "An dieser Stelle sollten Sie eine gute Vorstellung haben, wie Subversion " "ganz allgemein arbeitet. Mit diesem Kenntnisstand sollten Sie in der Lage " "sein, das nächste Kapitel anzugehen, das ein detaillierter Rundgang durch " "die Befehle und Eigenschaften von Subversion ist." # type: Content of: <chapter><title> #: ../en/book/ch02-basic-usage.xml:2 msgid "Basic Usage" msgstr "Grundlegende Benutzung" # type: Content of: <chapter><para> #: ../en/book/ch02-basic-usage.xml:4 msgid "" "Now we will go into the details of using Subversion. By the time you reach " "the end of this chapter, you will be able to perform all the tasks you need " "to use Subversion in a normal day's work. You'll start with getting your " "files into Subversion, followed by an initial checkout of your code. We'll " "then walk you through making changes and examining those changes. You'll " "also see how to bring changes made by others into your working copy, examine " "them, and work through any conflicts that might arise." msgstr "" "Nun kommen wir zu den Details der Benutzung von Subversion. Bis Sie das " "Ende dieses Kapitels erreicht haben, werden Sie in der Lage sein, alle " "Aufgaben zu erledigen, die sich bei der normalen täglichen Arbeit mit " "Subversion stellen. Sie werden damit beginnen, Ihre Dateien in Subversion " "einzupflegen, gefolgt von einem initialen Checkout Ihres Codes. Dann werden " "wir bei unserem Rundgang zeigen, wie Änderungen gemacht und diese Änderungen " "untersucht werden. Sie werden auch sehen, wie Sie die Änderungen anderer in " "Ihre Arbeitskopie bringen, untersuchen, und sich durch eventuell auftretende " "Konflikte arbeiten können." # type: Content of: <chapter><para> #: ../en/book/ch02-basic-usage.xml:14 msgid "" "Note that this chapter is not meant to be an exhaustive list of all of " "Subversion's commands—rather, it's a conversational introduction to " "the most common Subversion tasks that you'll encounter. This chapter " "assumes that you've read and understood <xref linkend=\"svn.basic\"/> and " "are familiar with the general model of Subversion. For a complete reference " "of all commands, see <xref linkend=\"svn.ref\"/>." msgstr "" "Beachten Sie jedoch, dass dieses Kapitel nicht als erschöpfende Liste aller " "Befehle von Subversion gedacht ist – es ist eher eine Einführung in " "die gebräuchlichsten Aufgaben von Subversion, denen Sie begegnen werden. " "Dieses Kapitel setzt voraus, dass Sie <xref linkend=\"svn.basic\"/> gelesen " "und verstanden haben und dass Sie mit dem allgemeinen Subversion-Modell " "vertraut sind. Für eine vollständige Referenz aller Befehle, siehe <xref " "linkend=\"svn.ref\"/>." # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:27 ../en/book/ch09-reference.xml:2265 #: ../en/book/ch09-reference.xml:5784 ../en/book/ch09-reference.xml:7097 #: ../en/book/ch09-reference.xml:7821 msgid "Help!" msgstr "Hilfe!" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:29 msgid "" "Before reading on, here is the most important command you'll ever need when " "using Subversion: <command>svn help</command>. The Subversion command-line " "client is self-documenting—at any time, a quick <userinput>svn help " "<replaceable>subcommand</replaceable></userinput> will describe the syntax, " "options, and behavior of the subcommand." msgstr "" "Bevor Sie weiter lesen: hier ist der wichtigste Befehl den Sie benötigen, " "wenn Sie Subversion verwenden: <command>svn help</command>. Der Subversion-" "Kommandozeilen-Client ist selbst-dokumentierend – jederzeit erklärt " "Ihnen ein schnelles <userinput>svn help <replaceable>Unterbefehl</" "replaceable></userinput> die Syntax, die Optionen und das Verhalten des " "Unterbefehls." # type: Content of: <chapter><sect1><screen> #: ../en/book/ch02-basic-usage.xml:36 #, no-wrap msgid "" "\n" "$ svn help import\n" "import: Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" "\n" " Recursively commit a copy of PATH to URL.\n" " If PATH is omitted '.' is assumed.\n" " Parent directories are created as necessary in the repository.\n" " If PATH is a directory, the contents of the directory are added\n" " directly under URL.\n" " Unversionable items such as device files and pipes are ignored\n" " if --force is specified.\n" "\n" "Valid options:\n" " -q [--quiet] : print nothing, or only summary information\n" " -N [--non-recursive] : obsolete; try --depth=files or --depth=immediates\n" " --depth ARG : limit operation by depth ARG ('empty', 'files',\n" " 'immediates', or 'infinity')\n" "…\n" msgstr "" "\n" "$ svn help import\n" "import: Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" "\n" " Recursively commit a copy of PATH to URL.\n" " If PATH is omitted '.' is assumed.\n" " Parent directories are created as necessary in the repository.\n" " If PATH is a directory, the contents of the directory are added\n" " directly under URL.\n" " Unversionable items such as device files and pipes are ignored\n" " if --force is specified.\n" "\n" "Valid options:\n" " -q [--quiet] : print nothing, or only summary information\n" " -N [--non-recursive] : obsolete; try --depth=files or --depth=immediates\n" " --depth ARG : limit operation by depth ARG ('empty', 'files',\n" " 'immediates', or 'infinity')\n" "…\n" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch02-basic-usage.xml:58 msgid "Options and Switches and Flags, Oh My!" msgstr "Optionen und Schalter und Flags, oh Mann!" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:60 msgid "" "The Subversion command-line client has numerous command modifiers (which we " "call options), but there are two distinct kinds of options: short options " "are a single hyphen followed by a single letter, and long options consist of " "two hyphens followed by a number of letters (e.g., <literal>-s</literal> and " "<literal>--this-is-a-long-option</literal>, respectively). Every option has " "a long format, but only certain options have an additional short format " "(these are typically options that are frequently used). To maintain " "clarity, we <emphasis>usually</emphasis> use the long form in code examples, " "but when describing options, if there's a short form, we'll provide the long " "form (to improve clarity) and the short form (to make it easier to " "remember). You should use whichever one you're more comfortable with, but " "don't try to use both." msgstr "" "Der Subversion-Kommandozeilen-Client besitzt zahlreiche Befehlsmodifizierer " "(die wir Optionen nennen), doch davon gibt es zweierlei Arten: Kurzoptionen " "bestehen aus einem Bindestrich gefolgt von einem einzelnen Buchstaben, und " "Langoptionen bestehen aus zwei Bindestrichen gefolgt von mehr als einem " "Buchstaben (z.B. <literal>-s</literal> bzw. <literal>--dies-ist-eine-" "langoption</literal>). Jede Option besitzt ein Langformat, jedoch nur " "bestimmte Optionen haben zusätzlich ein Kurzformat (das sind typischerweise " "die meistgebrauchten Optionen). Um die Deutlichkeit zu wahren, benutzen wir " "in den Beispielen <emphasis>gewöhnlich</emphasis> die Langform, doch wenn " "Optionen beschrieben werden, die eine Kurzform besitzen, geben wir sowohl " "die Langform (um die Deutlichkeit zu verbessern) als auch die Kurzform (um " "sie sich leichter merken zu können) an. Sie sollten die Form benutzen, mit " "der Sie am besten zurechtkommen, jedoch versuchen Sie nicht, beide " "gleichzeitig zu benutzen." # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:85 msgid "Getting Data into Your Repository" msgstr "Wie Sie Daten in Ihr Repository bekommen" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:87 msgid "" "You can get new files into your Subversion repository in two ways: " "<command>svn import</command> and <command>svn add</command>. We'll discuss " "<command>svn import</command> now and will discuss <command>svn add</" "command> later in this chapter when we review a typical day with Subversion." msgstr "" "Sie können neue Dateien auf zweierlei Weisen in das Subversion-Repository " "bekommen: <command>svn import</command> und <command>svn add</command>. Wir " "werden <command>svn import</command> jetzt und <command>svn add</command> " "später in diesem Kapitel besprechen, wenn wir einen typischen Tag mit " "Subversion durchnehmen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:95 ../en/book/ch09-reference.xml:2313 msgid "svn import" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:97 msgid "" "The <command>svn import</command> command is a quick way to copy an " "unversioned tree of files into a repository, creating intermediate " "directories as necessary. <command>svn import</command> doesn't require a " "working copy, and your files are immediately committed to the repository. " "You typically use this when you have an existing tree of files that you want " "to begin tracking in your Subversion repository. For example:" msgstr "" "Mit dem <command>svn import</command>-Befehl kann ein unversionierter " "Verzeichnisbaum schnell in ein Repository kopiert werden, wobei benötigte " "Zwischenverzeichnisse nach Bedarf angelegt werden. <command>svn import</" "command> erfordert keine Arbeitskopie und pflegt Ihre Dateien sofort in das " "Repository ein. Typischerweise verwenden Sie diesen Befehl, wenn bereits ein " "Verzeichnisbaum besteht, den Sie aber in einem Subversion-Repository pflegen " "möchten. Zum Beispiel:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:105 #, no-wrap msgid "" "\n" "$ svnadmin create /var/svn/newrepos\n" "$ svn import mytree file:///var/svn/newrepos/some/project \\\n" " -m \"Initial import\"\n" "Adding mytree/foo.c\n" "Adding mytree/bar.c\n" "Adding mytree/subdir\n" "Adding mytree/subdir/quux.h\n" "\n" "Committed revision 1.\n" msgstr "" "\n" "$ svnadmin create /var/svn/newrepos\n" "$ svn import mytree file:///var/svn/newrepos/some/project \\\n" " -m \"Initial import\"\n" "Adding mytree/foo.c\n" "Adding mytree/bar.c\n" "Adding mytree/subdir\n" "Adding mytree/subdir/quux.h\n" "\n" "Committed revision 1.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:117 msgid "" "The previous example copied the contents of directory <filename>mytree</" "filename> under the directory <filename>some/project</filename> in the " "repository:" msgstr "" "Im vorstehenden Beispiel wurde der Inhalt des Verzeichnisses " "<filename>mytree</filename> unter dem Verzeichnis <filename>some/project</" "filename> im Repository abgelegt:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:121 #, no-wrap msgid "" "\n" "$ svn list file:///var/svn/newrepos/some/project\n" "bar.c\n" "foo.c\n" "subdir/\n" msgstr "" "\n" "$ svn list file:///var/svn/newrepos/some/project\n" "bar.c\n" "foo.c\n" "subdir/\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:128 msgid "" "Note that after the import is finished, the original tree is <emphasis>not</" "emphasis> converted into a working copy. To start working, you still need " "to <command>svn checkout</command> a fresh working copy of the tree." msgstr "" "Beachten Sie, dass nach dem Import der Originalbaum <emphasis>nicht</" "emphasis> in eine Arbeitskopie umgewandelt wird. Vor Beginn der Arbeit " "müssen Sie noch <command>svn checkout</command> ausführen, um eine frische " "Arbeitskopie des Baums zu erhalten." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:137 msgid "Recommended Repository Layout" msgstr "Empfohlene Repository Aufteilung" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:139 msgid "" "While Subversion's flexibility allows you to lay out your repository in any " "way that you choose, we recommend that you create a <filename>trunk</" "filename> directory to hold the <quote>main line</quote> of development, a " "<filename>branches</filename> directory to contain branch copies, and a " "<filename>tags</filename> directory to contain tag copies. For example:" msgstr "" "Obwohl die Flexibilität von Subversion es Ihnen erlaubt, Ihr Repository nach " "Belieben aufzuteilen, empfehlen wir, ein Verzeichnis <filename>trunk</" "filename> für die <quote>Hauptlinie</quote> der Entwicklung, ein Verzeichnis " "<filename>branches</filename> für Branch-Kopien und ein Verzeichnis " "<filename>tags</filename> für Tag-Kopien. Zum Beispiel:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:147 #, no-wrap msgid "" "\n" "$ svn list file:///var/svn/repos\n" "/trunk\n" "/branches\n" "/tags\n" msgstr "" "\n" "$ svn list file:///var/svn/repos\n" "/trunk\n" "/branches\n" "/tags\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:154 msgid "" "You'll learn more about tags and branches in <xref linkend=\"svn.branchmerge" "\"/>. For details and how to set up multiple projects, see <xref linkend=" "\"svn.branchmerge.maint.layout\"/> and <xref linkend=\"svn.reposadmin." "projects.chooselayout\"/> to read more about project roots." msgstr "" "In <xref linkend=\"svn.branchmerge\"/> werden Sie mehr über Branches und " "Tags erfahren. Details über das Aufsetzen mehrerer Projekte finden Sie in " "<xref linkend=\"svn.branchmerge.maint.layout\"/>, und in <xref linkend=\"svn." "reposadmin.projects.chooselayout\"/> lesen Sie mehr über Wurzelverzeichnisse " "von Projekten." # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:169 msgid "Initial Checkout" msgstr "Anfänglicher Checkout" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:171 msgid "" "Most of the time, you will start using a Subversion repository by doing a " "<firstterm>checkout</firstterm> of your project. Checking out a repository " "creates a <quote>working copy</quote> of it on your local machine. This " "copy contains the <literal>HEAD</literal> (latest revision) of the " "Subversion repository that you specify on the command line:" msgstr "" "In den meisten Fällen werden Sie ein Subversion-Repository zu nutzen " "beginnen, indem Sie einen <firstterm>Checkout</firstterm> Ihres Projektes " "vornehmen. Das Auschecken eines Repositorys erzeugt eine " "<quote>Arbeitskopie</quote> desselben auf Ihrem lokalen Rechner. Diese " "Arbeitskopie umfasst die Revision <literal>HEAD</literal> (die letzte " "Revision) des auf der Kommandozeile angegebenen Subversion-Repositorys:" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch02-basic-usage.xml:179 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk\n" "A trunk/Makefile.in\n" "A trunk/ac-helpers\n" "A trunk/ac-helpers/install.sh\n" "A trunk/ac-helpers/install-sh\n" "A trunk/build.conf\n" "…\n" "Checked out revision 8810.\n" msgstr "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk\n" "A trunk/Makefile.in\n" "A trunk/ac-helpers\n" "A trunk/ac-helpers/install.sh\n" "A trunk/ac-helpers/install-sh\n" "A trunk/build.conf\n" "…\n" "Checked out revision 8810.\n" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch02-basic-usage.xml:191 msgid "What's in a Name?" msgstr "Was steckt in einem Namen?" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:193 msgid "" "Subversion tries hard not to limit the type of data you can place under " "version control. The contents of files and property values are stored and " "transmitted as binary data, and <xref linkend=\"svn.advanced.props.special." "mime-type\"/> tells you how to give Subversion a hint that <quote>textual</" "quote> operations don't make sense for a particular file. There are a few " "places, however, where Subversion places restrictions on information it " "stores." msgstr "" "Subversion gibt sich alle Mühe, nicht die Art der Daten einzuschränken, die " "Sie unter Versionskontrolle setzen können. Der Inhalt von Dateien und " "Property-Werte werden als binäre Daten gespeichert und übermittelt, und " "<xref linkend=\"svn.advanced.props.special.mime-type\"/> sagt Ihnen, wie Sie " "Subversion darauf hinweisen, dass <quote>Text</quote>-Operationen für eine " "bestimmte Datei keinen Sinn ergeben. Trotzdem gibt es einige wenige Stellen, " "an denen Subversion Einschränkungen für gespeicherte Informationen vorsieht." # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:203 msgid "" "Subversion internally handles certain bits of data—for example, " "property names, pathnames, and log messages—as UTF-8-encoded Unicode. " "This is not to say that all your interactions with Subversion must involve " "UTF-8, though. As a general rule, Subversion clients will gracefully and " "transparently handle conversions between UTF-8 and the encoding system in " "use on your computer, if such a conversion can meaningfully be done (which " "is the case for most common encodings in use today)." msgstr "" "Subversion behandelt intern bestimmte Dateneinheiten – z.B. Property-" "Namen, Pfadnamen und Logmitteilungen – als UTF-8-kodiertes Unicode. " "Das heißt aber nicht, dass all Ihre Interaktionen mit Subversion in UTF-8 " "erfolgen müssen. Im Allgemeinen werden Subversion-Clients die Umwandlungen " "zwischen UTF-8 und dem auf Ihrem Computer verwendeten Kodiersystem großzügig " "und transparent vornehmen, sofern eine solche Umwandlung sinnvollerweise " "durchgeführt werden kann (was bei den meisten gebräuchlichsten Kodierungen " "heutzutage der Fall ist)." # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:213 msgid "" "In WebDAV exchanges and older versions of some of Subversion's " "administrative files, paths are used as XML attribute values, and property " "names in XML tag names. This means that pathnames can contain only legal " "XML (1.0) characters, and properties are further limited to ASCII " "characters. Subversion also prohibits TAB, CR, and LF characters in path " "names to prevent paths from being broken up in diffs or in the output of " "commands such as <command>svn log</command> or <command>svn status</command>." msgstr "" "Darüber hinaus werden Pfadnamen sowohl bei WebDAV-Übertragungen als auch in " "einigen der Steuerdateien von Subversion als XML-Attributwerte verwendet. " "Das bedeutet, dass Pfadnamen nur aus zulässigen XML (1.0) Zeichen bestehen " "dürfen. Subversion verbietet ebenfalls TAB, CR und LF Zeichen in Pfadnamen, " "um zu verhindern, das Pfade in Vergleichen oder bei Befehlsausgaben, wie " "<command>svn log</command> oder <command>svn status</command> zerrissen " "werden." # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:223 msgid "" "While it may seem like a lot to remember, in practice these limitations are " "rarely a problem. As long as your locale settings are compatible with UTF-8 " "and you don't use control characters in path names, you should have no " "trouble communicating with Subversion. The command-line client adds an " "extra bit of help—to create <quote>legally correct</quote> versions " "for internal use it will automatically escape illegal path characters as " "needed in URLs that you type." msgstr "" "Obwohl es sich anhört, als müsse man sich eine Menge merken, sind diese " "Einschränkungen selten ein Problem. Solange Ihre Locale-Einstellungen " "kompatibel zu UTF-8 sind und Sie keine Kontrollzeichen in den Pfadnamen " "verwenden, sollten Sie keine Probleme habe, mit Subversion zu kommunizieren. " "Der Kommandozeilen-Client bietet Ihnen noch ein wenig Extrahilfe – um " "<quote>korrekte</quote> Versionen für den internen Gebrauch zu erzeugen, " "maskiert er bei Bedarf automatisch illegale Zeichen in URL-Pfaden, die Sie " "eingeben." # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:235 msgid "" "Although the preceding example checks out the trunk directory, you can just " "as easily check out any deep subdirectory of a repository by specifying the " "subdirectory in the checkout URL:" msgstr "" "Obwohl im vorangehenden Beispiel das Verzeichnis <filename>trunk</filename> " "ausgecheckt wird, können Sie genauso leicht irgendein tiefliegendes " "Unterverzeichnis aus einem Repository auschecken, indem Sie das " "Unterverzeichnis im URL beim Checkout angeben:" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch02-basic-usage.xml:240 #, no-wrap msgid "" "\n" "$ svn checkout \\\n" " http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline/\n" "A cmdline/revert_tests.py\n" "A cmdline/diff_tests.py\n" "A cmdline/autoprop_tests.py\n" "A cmdline/xmltests\n" "A cmdline/xmltests/svn-test.sh\n" "…\n" "Checked out revision 8810.\n" msgstr "" "\n" "$ svn checkout \\\n" " http://svn.collab.net/repos/svn/trunk/subversion/tests/cmdline/\n" "A cmdline/revert_tests.py\n" "A cmdline/diff_tests.py\n" "A cmdline/autoprop_tests.py\n" "A cmdline/xmltests\n" "A cmdline/xmltests/svn-test.sh\n" "…\n" "Checked out revision 8810.\n" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:252 msgid "" "Since Subversion uses a copy-modify-merge model instead of lock-modify-" "unlock (see <xref linkend=\"svn.basic.vsn-models\"/>), you can immediately " "make changes to the files and directories in your working copy. Your " "working copy is just like any other collection of files and directories on " "your system. You can edit and change it, move it around, even delete the " "entire working copy and forget about it." msgstr "" "Da Subversion ein <emphasis>copy-modify-merge</emphasis>-Modell (kopieren-" "ändern-zusammenführen) statt eines <emphasis>lock-modify-unlock</emphasis>-" "Modells (sperren-ändern-freigeben) verwendet (siehe <xref linkend=\"svn." "basic.vsn-models\"/>), können Sie sofort damit beginnen, Änderungen an den " "Dateien und Verzeichnissen Ihrer Arbeitskopie vorzunehmen. Ihre Arbeitskopie " "ist wie jede beliebige andere Ansammlung aus Dateien und Verzeichnissen auf " "Ihrem System. Sie können sie bearbeiten, ändern, verschieben und sie sogar " "löschen und vergessen." # type: Content of: <chapter><sect1><warning><para> #: ../en/book/ch02-basic-usage.xml:262 msgid "" "While your working copy is <quote>just like any other collection of files " "and directories on your system,</quote> you can edit files at will, but you " "must tell Subversion about <emphasis>everything else</emphasis> that you " "do. For example, if you want to copy or move an item in a working copy, you " "should use <command>svn copy</command> or <command>svn move</command> " "instead of the copy and move commands provided by your operating system. " "We'll talk more about them later in this chapter." msgstr "" "Obwohl sich Ihre Arbeitskopie <quote>wie jede beliebige andere Ansammlung " "aus Dateien und Verzeichnissen auf Ihrem System</quote> verhält, können Sie " "zwar beliebig Dateien editieren, doch Sie müssen Subversion über " "<emphasis>alles andere</emphasis> was Sie tun in Kenntnis setzen. Wenn Sie z." "B. ein Objekt in der Arbeitskopie kopieren oder verschieben möchten, " "sollten Sie <command>svn copy</command> oder <command>svn move</command> " "verwenden statt der Kopier- oder Verschiebebefehle Ihres Betriebssystems. " "Wir werden darauf später im Kapitel näher eingehen." # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:273 msgid "" "Unless you're ready to commit the addition of a new file or directory or " "changes to existing ones, there's no need to further notify the Subversion " "server that you've done anything." msgstr "" "Sofern Sie nicht bereit sind, das Hinzufügen einer neuen Datei oder eines " "neuen Verzeichnisses oder Änderungen an bestehenden Objekten an das " "Repository zu übergeben, besteht keine Notwendigkeit, dem Subversion-Server " "mitzuteilen, dass Sie irgendetwas gemacht haben." # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch02-basic-usage.xml:279 msgid "What's with the .svn Directory?" msgstr "Was hat es mit dem Verzeichnis .svn auf sich?" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:281 msgid "" "Every directory in a working copy contains an administrative area—a " "subdirectory named <filename>.svn</filename>. Usually, directory listing " "commands won't show this subdirectory, but it is nevertheless an important " "directory. Whatever you do, don't delete or change anything in the " "administrative area! Subversion depends on it to manage your working copy." msgstr "" "Jedes Verzeichnis in einer Arbeitskopie beinhaltet einen Verwaltungsbereich " "– ein Verzeichnis namens <filename>.svn</filename>. Normalerweise " "wird dieses Unterverzeichnis nicht vom Befehl zum Auflisten des " "Verzeichnisinhaltes angezeigt, trotzdem ist es ein wichtiges Verzeichnis. " "Egal, was Sie machen, löschen oder ändern Sie nichts im Verwaltungsbereich! " "Subversion ist darauf angewiesen, um Ihre Arbeitskopie zu verwalten." # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch02-basic-usage.xml:289 msgid "" "If you accidentally remove the <filename>.svn</filename> subdirectory, the " "easiest way to fix the problem is to remove the entire containing directory " "(a normal system deletion, not <command>svn delete</command>), then run " "<userinput>svn update</userinput> from a parent directory. The Subversion " "client will download the directory you've deleted, with a new <filename>." "svn</filename> area as well." msgstr "" "Sollten Sie versehentlich das Verzeichnis <filename>.svn</filename> löschen, " "besteht die einfachste Lösung des Problems darin, das komplette " "darüberliegende Verzeichnis zu löschen (mit dem Betriebssystem-Löschbefehl, " "nicht mit <command>svn delete</command>) und dann wiederum <userinput>svn " "update</userinput> von einem darüberliegenden Verzeichnis aus aufzurufen. " "Der Subversion-Client wird das von Ihnen gelöschte Verzeichnis herunterladen " "und dabei auch einen neuen <filename>.svn</filename>-Bereich anlegen." # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:298 msgid "" "While you can certainly check out a working copy with the URL of the " "repository as the only argument, you can also specify a directory after your " "repository URL. This places your working copy in the new directory that you " "name. For example:" msgstr "" "Obwohl Sie sicherlich eine Arbeitskopie mit dem Repository-URL als einziges " "Argument auschecken können, haben sie auch die Möglichkeit, ein Verzeichnis " "hinter dem Repository-URL anzugeben. Das erstellt Ihre Arbeitskopie in dem " "angegebenen Verzeichnis. Zum Beispiel:" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch02-basic-usage.xml:303 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk subv\n" "A subv/Makefile.in\n" "A subv/ac-helpers\n" "A subv/ac-helpers/install.sh\n" "A subv/ac-helpers/install-sh\n" "A subv/build.conf\n" "…\n" "Checked out revision 8810.\n" msgstr "" "\n" "$ svn checkout http://svn.collab.net/repos/svn/trunk subv\n" "A subv/Makefile.in\n" "A subv/ac-helpers\n" "A subv/ac-helpers/install.sh\n" "A subv/ac-helpers/install-sh\n" "A subv/build.conf\n" "…\n" "Checked out revision 8810.\n" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:314 msgid "" "That will place your working copy in a directory named <literal>subv</" "literal> instead of a directory named <literal>trunk</literal> as we did " "previously. The directory <literal>subv</literal> will be created if it " "doesn't already exist." msgstr "" "Das legt Ihre Arbeitskopie in einem Verzeichnis namens <literal>subv</" "literal> ab anstatt in <literal>trunk</literal> so wie wir es früher schon " "einmal gemacht haben. Das Verzeichnis <literal>subv</literal> wird angelegt, " "sofern es nicht bereits vorhanden ist." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:322 msgid "Disabling Password Caching" msgstr "Das Zwischenspeichern des Passwortes abstellen" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch02-basic-usage.xml:324 msgid "" "When you perform a Subversion operation that requires you to authenticate, " "by default Subversion caches your authentication credentials on disk. This " "is done for convenience so that you don't have to continually reenter your " "password for future operations. If you're concerned about caching your " "Subversion passwords, <footnote>" msgstr "" "Wenn Sie eine Subversion-Operation ausführen, für die Sie sich " "authentifizieren müssen, speichert Subversion Ihre Zugangsdaten " "standardmäßig auf der Platte. Das geschieht zu Ihrer Annehmlichkeit, damit " "Sie bei künftigen Operationen nicht ständig Ihr Passwort eingeben müssen. " "Falls Sie wegen der Speicherung besorgt sein sollten <footnote>" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch02-basic-usage.xml:331 msgid "" "Of course, you're not terribly worried—first because you know that you " "can't <emphasis>really</emphasis> delete anything from Subversion, and " "second because your Subversion password isn't the same as any of the other 3 " "million passwords you have, right? Right?" msgstr "" "Natürlich sind Sie nicht ernsthaft besorgt – erstens, weil Sie wissen, " "dass Sie nichts <emphasis>wirklich</emphasis> aus Subversion löschen können " "und zweitens, weil Ihr Subversion-Passwort nicht das gleiche ist wie " "irgendein anderes Ihrer 3 Millionen Passwörter, nicht wahr?" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:337 msgid "" "</footnote> you can disable caching either permanently or on a case-by-case " "basis." msgstr "" "</footnote>, können Sie das Zwischenspeichern entweder dauerhaft oder von " "Fall zu Fall abstellen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:341 msgid "" "To disable password caching for a particular one-time command, pass the " "<option >--no-auth-cache</option > option on the command line. To " "permanently disable caching, you can add the line <literal>store-passwords = " "no</literal> to your local machine's Subversion configuration file. See " "<xref linkend=\"svn.serverconfig.netmodel.credcache\"/> for details." msgstr "" "Um das Passwort-Caching für einen bestimmten einmaligen Befehl zu " "unterbinden, übergeben Sie die <option>--no-auth-cache</option>-Option auf " "der Kommandozeile. Um das Caching dauerhaft abzustellen, können Sie der " "Subversion-Konfigurationsdatei Ihres lokalen Rechners die Zeile " "<literal>store-passwords = no</literal> hinzufügen. Für Details siehe <xref " "linkend=\"svn.serverconfig.netmodel.credcache\"/>." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:352 msgid "Authenticating As a Different User" msgstr "Authentifizierung als ein anderer Anwender" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:354 msgid "" "Since Subversion caches auth credentials by default (both username and " "password), it conveniently remembers who you were acting as the last time " "you modified your working copy. But sometimes that's not helpful—" "particularly if you're working in a shared working copy such as a system " "configuration directory or a web server document root. In this case, just " "pass the <option>--username</option> option on the command line, and " "Subversion will attempt to authenticate as that user, prompting you for a " "password if necessary." msgstr "" "Da Subversion standardmäßig Zugangsdaten speichert (sowohl den Benutzernamen " "als auch das Passwort), erinnert es sich bequemerweise, wer Sie das letzte " "Mal waren, als Sie Ihre Arbeitskopie modifizierten. Doch manchmal ist das " "nicht hilfreich – besonders, wenn Sie in einer gemeinsam benutzten " "Arbeitskopie arbeiten wie in einem Konfigurationsverzeichnis oder im " "Dokumenten-Wurzelverzeichnis eines Webservers. In diesem Fall brauchen Sie " "nur die <option>--username</option>-Option auf der Kommandozeile zu " "übergeben und Subversion versucht, sich als dieser Benutzer zu " "authentifizieren und wird Sie, wenn nötig, zur Eingabe eines Passworts " "auffordern." # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:372 msgid "Basic Work Cycle" msgstr "Der grundlegende Arbeitszyklus" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:374 msgid "" "Subversion has numerous features, options, bells, and whistles, but on a day-" "to-day basis, odds are that you will use only a few of them. In this " "section, we'll run through the most common things that you might find " "yourself doing with Subversion in the course of a day's work." msgstr "" "Subversion hat zahlreiche Features, Optionen und noch jede Menge " "Schnickschnack, aber für die tägliche Arbeit ist die Wahrscheinlichkeit " "groß, nur wenig davon zu benutzen. In diesem Abschnitt gehen wir durch die " "gebräuchlichsten Dinge, die Sie während des Tagesgeschäftes mit Subversion " "machen werden." # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:380 msgid "The typical work cycle looks like this:" msgstr "Der typische Arbeitszyklus sieht so aus:" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:384 ../en/book/ch09-reference.xml:5149 msgid "Update your working copy." msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:387 ../en/book/ch02-basic-usage.xml:437 msgid "<command>svn update</command>" msgstr "<command>svn update</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:394 msgid "Make changes." msgstr "Nehmen Sie Änderungen vor." # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:397 msgid "<command>svn add</command>" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:400 msgid "<command>svn delete</command>" msgstr "<command>svn delete</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:403 msgid "<command>svn copy</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:406 msgid "<command>svn move</command>" msgstr "<command>svn move</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:412 msgid "Examine your changes." msgstr "Untersuchen Sie Ihre Änderungen." # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:424 msgid "Possibly undo some changes." msgstr "Nehmen Sie eventuell einige Änderungen zurück." # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:434 msgid "Resolve conflicts (merge others' changes)." msgstr "Lösen Sie Konflikte auf (arbeiten Sie die Änderungen anderer ein)." # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:440 msgid "<command>svn resolve</command>" msgstr "<command>svn resolve</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:446 msgid "Commit your changes." msgstr "Bringen Sie Ihre Änderungen ins Repository." # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:449 msgid "<command>svn commit</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:457 msgid "Update Your Working Copy" msgstr "Aktualisieren Sie Ihre Arbeitskopie" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:459 msgid "" "When working on a project with a team, you'll want to update your working " "copy to receive any changes other developers on the project have made since " "your last update. Use <command>svn update</command> to bring your working " "copy into sync with the latest revision in the repository:" msgstr "" "Wenn Sie in einem Projekt im Team zusammenarbeiten, sollten Sie Ihre " "Arbeitskopie aktualisieren, um die Änderungen zu bekommen, die die anderen " "Entwickler im Projekt seit Ihrer letzten Aktualisierung vorgenommen haben. " "Benutzen Sie <command>svn update</command> um Ihre Arbeitskopie synchron mit " "der letzten Revision im Repository zu bekommen:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:465 #, no-wrap msgid "" "\n" "$ svn update\n" "U foo.c\n" "U bar.c\n" "Updated to revision 2.\n" msgstr "" "\n" "$ svn update\n" "U foo.c\n" "U bar.c\n" "Updated to revision 2.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:472 msgid "" "In this case, it appears that someone checked in modifications to both " "<filename>foo.c</filename> and <filename>bar.c</filename> since the last " "time you updated, and Subversion has updated your working copy to include " "those changes." msgstr "" "In diesem Fall sieht es so aus, dass jemand Änderungen sowohl an " "<filename>foo.c</filename> als auch an <filename>bar.c</filename> " "eingecheckt hat, seit Sie das letzte Mal aktualisiert haben, und Subversion " "hat Ihre Arbeitskopie aktualisiert, damit sie beide Änderungen enthält." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:478 msgid "" "When the server sends changes to your working copy via <command>svn update</" "command>, a letter code is displayed next to each item to let you know what " "actions Subversion performed to bring your working copy up to date. To find " "out what these letters mean, run <userinput>svn help update</userinput>." msgstr "" "Wenn der Server über <command>svn update</command> Änderungen an Ihre " "Arbeitskopie schickt, wird ein Buchstabencode neben jedem Objekt angezeigt, " "um Ihnen anzuzeigen, was Subversion gemacht hat, um die Arbeitskopie auf den " "neuesten Stand zu bringen. Zur Bedeutung der Buchstaben, rufen Sie " "<userinput>svn help update</userinput> auf." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:488 msgid "Make Changes to Your Working Copy" msgstr "Nehmen Sie Änderungen an Ihrer Arbeitskopie vor" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:490 msgid "" "Now you can get to work and make changes in your working copy. It's usually " "most convenient to decide on a discrete change (or set of changes) to make, " "such as writing a new feature, fixing a bug, and so on. The Subversion " "commands that you will use here are <command>svn add</command>, <command>svn " "delete</command>, <command>svn copy</command>, <command>svn move</command>, " "and <command>svn mkdir</command>. However, if you are merely editing files " "that are already in Subversion, you may not need to use any of these " "commands until you commit." msgstr "" "Nun können Sie loslegen und Änderungen an Ihrer Arbeitskopie vornehmen. " "Normalerweise ist es am einfachsten, sich für eine bestimmte Änderung (oder " "eine Menge von Änderungen) zu entscheiden, etwa ein neues Feature zu " "implementieren oder einen Fehler zu beseitigen usw. Die Subversion-Befehle, " "die Sie hierfür verwenden werden sind <command>svn add</command>, " "<command>svn delete</command>, <command>svn copy</command>, <command>svn " "move</command> und <command>svn mkdir</command>. Falls Sie jedoch " "größtenteils Dateien editieren, die bereits mit Subversion verwaltet werden, " "brauchen Sie keinen dieser Befehle, bis Sie die Änderungen committen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:501 msgid "" "You can make two kinds of changes to your working copy: <firstterm>file " "changes</firstterm> and <firstterm>tree changes</firstterm>. You don't need " "to tell Subversion that you intend to change a file; just make your changes " "using your text editor, word processor, graphics program, or whatever tool " "you would normally use. Subversion automatically detects which files have " "been changed, and in addition, it handles binary files just as easily as it " "handles text files—and just as efficiently, too. For tree changes, " "you can ask Subversion to <quote>mark</quote> files and directories for " "scheduled removal, addition, copying, or moving. These changes may take " "place immediately in your working copy, but no additions or removals will " "happen in the repository until you commit them." msgstr "" "Sie können zwei Arten von Änderungen an Ihrer Arbeitskopie vornehmen: " "<firstterm>Dateiänderungen</firstterm> und " "<firstterm>Verzeichnisbaumänderungen</firstterm>. Sie brauchen Subversion " "nicht mitzuteilen, dass Sie beabsichtigen, eine Datei zu ändern; nehmen Sie " "einfach die Änderungen mit Ihrem Texteditor, Textverarbeitungsprogramm, " "Grafikprogramm oder sonstigen Programm vor, wie Sie es gewohnt sind. " "Subversion stellt automatisch fest, welche Dateien sich geändert haben und " "behandelt dabei Binärdateien genauso einfach wie Textdateien – und " "genauso effizient. Für Änderungen am Verzeichnisbaum können Sie Subversion " "mitteilen, Dateien und Verzeichnisse zum geplanten Entfernen, Hinzufügen, " "Kopieren oder Verschieben <quote>vorzumerken</quote>. Diese Änderungen " "finden sofort in Ihrer Arbeitskopie statt, doch nichts wird dem Repository " "hinzugefügt oder daraus entfernt, bevor Sie die Änderungen committen." # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch02-basic-usage.xml:517 msgid "Versioning Symbolic Links" msgstr "Versionierung symbolischer Links" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:519 msgid "" "On non-Windows platforms, Subversion is able to version files of the special " "type <firstterm>symbolic link</firstterm> (or <quote>symlink</quote>). A " "symlink is a file that acts as a sort of transparent reference to some other " "object in the filesystem, allowing programs to read and write to those " "objects indirectly by way of performing operations on the symlink itself." msgstr "" "Auf Nicht-Windows-Systemen kann Subversion den besonderen Dateityp " "<firstterm>symbolischer Link</firstterm> (oder <firstterm>Symlink</" "firstterm>) versionieren. Ein Symlink ist eine Datei, die sich wie eine " "transparente Referenz auf ein anderes Objekt im Dateisystem verhält, und " "somit Programmen die Möglichkeit bietet, indirekt auf dieses Objekt " "zuzugreifen, indem sie Operationen auf dem Symlink ausführen." # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:527 msgid "" "When a symlink is committed into a Subversion repository, Subversion " "remembers that the file was in fact a symlink, as well as the object to " "which the symlink <quote>points.</quote> When that symlink is checked out to " "another working copy on a non-Windows system, Subversion reconstructs a real " "filesystem-level symbolic link from the versioned symlink. But that doesn't " "in any way limit the usability of working copies on systems such as Windows " "that do not support symlinks. On such systems, Subversion simply creates a " "regular text file whose contents are the path to which to the original " "symlink pointed. While that file can't be used as a symlink on a Windows " "system, it also won't prevent Windows users from performing their other " "Subversion-related activities." msgstr "" "Wenn ein Symlink in Subversion committet wird, merkt sich Subversion sowohl, " "dass die Datei eigentlich ein Symlink ist, als auch das Objekt, auf das der " "Symlink <quote>zeigt</quote>. Wenn dieser Symlink auf einem Nicht-Windows-" "System in einer anderen Arbeitskopie ausgecheckt wird, rekonstruiert " "Subversion aus dem versionierten Symlink einen echten Symlink auf " "Dateisystemebene. Jedoch beeinträchtigt das keineswegs die Benutzbarkeit von " "Arbeitskopien auf Systemen wie Windows, die keine Symlinks unterstützen. Auf " "diesen Systemen erzeugt Subversion einfach eine Textdatei, deren Inhalt der " "Pfad ist, auf den der ursprüngliche Symlink gezeigt hat. Obwohl diese Datei " "unter Windows nicht als Symlink verwendet werden kann, hindert es Windows-" "Benutzer nicht an der Ausübung anderer Tätigkeiten mit Subversion." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:542 msgid "" "Here is an overview of the five Subversion subcommands that you'll use most " "often to make tree changes:" msgstr "" "Hier ist ein Überblick der fünf Subversion-Unterbefehle, die Sie am " "häufigsten benutzen werden, um Änderungen am Verzeichnisbaum vorzunehmen:" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:548 msgid "<userinput>svn add foo</userinput>" msgstr "<userinput>svn add foo</userinput>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:550 msgid "" "Schedule file, directory, or symbolic link <filename>foo</filename> to be " "added to the repository. When you next commit, <filename>foo</filename> " "will become a child of its parent directory. Note that if <filename>foo</" "filename> is a directory, everything underneath <filename>foo</filename> " "will be scheduled for addition. If you want only to add <filename>foo</" "filename> itself, pass the <option>--depth empty</option> option." msgstr "" "Die Datei, das Verzeichnis oder den symbolischen Link <filename>foo</" "filename> zum Hinzufügen in das Repository vormerken. Wenn Sie das nächste " "Mal committen, wird <filename>foo</filename> ein Kind seines " "Elternverzeichnisses. Beachten Sie, dass alles unterhalb von <filename>foo</" "filename> zum Hinzufügen vorgemerkt wird, falls <filename>foo</filename> ein " "Verzeichnis ist. Falls Sie nur <filename>foo</filename> selber hinzufügen " "möchten, geben Sie die <option>--depth empty</option>-Option an." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:563 msgid "<userinput>svn delete foo</userinput>" msgstr "<userinput>svn delete foo</userinput>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote> #: ../en/book/ch02-basic-usage.xml:565 msgid "" "Schedule file, directory, or symbolic link <filename>foo</filename> to be " "deleted from the repository. If <filename>foo</filename> is a file or link, " "it is immediately deleted from your working copy. If <filename>foo</" "filename> is a directory, it is not deleted, but Subversion schedules it for " "deletion. When you commit your changes, <filename>foo</filename> will be " "entirely removed from your working copy and the repository. <footnote>" msgstr "" "Die Datei, das Verzeichnis oder den symbolischen Link <filename>foo</" "filename> zum Löschen aus dem Repository vormerken. <filename>foo</filename> " "wird sofort aus der Arbeitskopie entfernt, falls es eine Datei oder ein Link " "ist. Falls <filename>foo</filename> ein Verzeichnis ist, wird es nicht " "gelöscht, sondern zum Löschen vorgemerkt. Wenn Sie Ihre Änderungen " "committen, wird das gesamte Verzeichnis <filename>foo</filename> aus der " "Arbeitskopie und dem Repository entfernt. <footnote>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote><para> #: ../en/book/ch02-basic-usage.xml:575 msgid "" "Of course, nothing is ever totally deleted from the repository—just " "from the <literal>HEAD</literal> of the repository. You can get back " "anything you delete by checking out (or updating your working copy to) a " "revision earlier than the one in which you deleted it. Also see <xref " "linkend=\"svn.branchmerge.basicmerging.resurrect\" />." msgstr "" "Selbstverständlich wird nichts jemals vollständig aus dem Repository " "gelöscht – lediglich aus der <literal>HEAD</literal>-Revision des " "Repositorys. Sie können alles was Sie gelöscht haben zurückholen, indem Sie " "eine Revision auschecken (oder hierauf aktualisieren), die älter ist, als " "die Revision Ihrer Löschung. Siehe auch <xref linkend=\"svn.branchmerge." "basicmerging.resurrect\" />." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:589 msgid "<userinput>svn copy foo bar</userinput>" msgstr "<userinput>svn copy foo bar</userinput>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:591 msgid "" "Create a new item <filename>bar</filename> as a duplicate of <filename>foo</" "filename> and automatically schedule <filename>bar</filename> for addition. " "When <filename>bar</filename> is added to the repository on the next commit, " "its copy history is recorded (as having originally come from <filename>foo</" "filename>). <command>svn copy</command> does not create intermediate " "directories unless you pass the <option>--parents</option> option." msgstr "" "Erzeuge ein neues Objekt <filename>bar</filename> als Duplikat von " "<filename>foo</filename> und merke <filename>bar</filename> automatisch zum " "Hinzufügen vor. Wird beim nächsten Commit <filename>bar</filename> dem " "Repository hinzugefügt, wird die Historie der Kopie mitaufgezeichnet (so wie " "sie ursprünglich in <filename>foo</filename> war). <command>svn copy</" "command> erzeugt keine Zwischenverzeichnisse, sofern nicht die Option " "<option>--parents</option> angegeben wird.." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:604 msgid "<userinput>svn move foo bar</userinput>" msgstr "<userinput>svn move foo bar</userinput>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:606 msgid "" "This command is exactly the same as running <userinput>svn copy foo bar; svn " "delete foo</userinput>. That is, <filename>bar</filename> is scheduled for " "addition as a copy of <filename>foo</filename>, and <filename>foo</filename> " "is scheduled for removal. <command>svn move</command> does not create " "intermediate directories unless you pass the <option>--parents</option> " "option." msgstr "" "Dieser Befehl macht genau das gleiche wie <userinput>svn copy foo bar; svn " "delete foo</userinput>. D.h., <filename>bar</filename> wird zum Hinzufügen " "als Kopie von <filename>foo</filename> und <filename>foo</filename> selbst " "zum Löschen vorgemerkt. <command>svn move</command> erzeugt keine " "Zwischenverzeichnisse, sofern nicht die Option <option>--parents</option> " "angegeben wird." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:618 msgid "<userinput>svn mkdir blort</userinput>" msgstr "<userinput>svn mkdir blort</userinput>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:620 msgid "" "This command is exactly the same as running <userinput>mkdir blort; svn add " "blort</userinput>. That is, a new directory named <filename>blort</" "filename> is created and scheduled for addition." msgstr "" "Dieser Befehl macht genau das gleiche wie <userinput>mkdir blort; svn add " "blort</userinput>. D.h., ein neues Verzeichnis namens <filename>blort</" "filename> wird angelegt und zum Hinzufügen vorgemerkt." # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch02-basic-usage.xml:630 msgid "Changing the Repository Without a Working Copy" msgstr "Ändern des Repositorys ohne Arbeitskopie" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:632 msgid "" "There <emphasis>are</emphasis> some use cases that immediately commit tree " "changes to the repository. This happens only when a subcommand is operating " "directly on a URL, rather than on a working-copy path. In particular, " "specific uses of <command>svn mkdir</command>, <command>svn copy</command>, " "<command>svn move</command>, and <command>svn delete</command> can work with " "URLs (and don't forget that <command>svn import</command> always makes " "changes to a URL)." msgstr "" "Es <emphasis>gibt</emphasis> einige Anwendungsfälle, die Änderungen am " "Verzeichnisbaum unmittelbar in das Repository übertragen. Das passiert nur, " "wenn ein Unterbefehl direkt auf einen URL statt auf einen Pfad in der " "Arbeitskopie angewendet wird. Im Einzelnen können spezielle Anwendungen der " "Befehle <command>svn mkdir</command>, <command>svn copy</command>, " "<command>svn move</command> und <command>svn delete</command> mit URLs " "arbeiten (und vergessen Sie nicht, dass <command>svn import</command> immer " "Änderungen über einen URL macht)." # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:642 msgid "" "URL operations behave in this manner because commands that operate on a " "working copy can use the working copy as a sort of <quote>staging area</" "quote> to set up your changes before committing them to the repository. " "Commands that operate on URLs don't have this luxury, so when you operate " "directly on a URL, any of the aforementioned actions represents an immediate " "commit." msgstr "" "URL Operationen verhalten sich auf diese Weise, da Befehle, die auf einer " "Arbeitskopie arbeiten, diese als eine Art <quote>Bereitstellungsraum</quote> " "verwenden, in denen Ihre Änderungen vorbereitet werden können, bevor sie in " "das Repository committet werden. Befehle, die auf URLs arbeiten, haben " "diesen Luxus nicht, so dass die Arbeit direkt mit einem URL bei den oben " "genannten Aktionen einen sofortigen Commit repräsentiert." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:656 msgid "Examine Your Changes" msgstr "Untersuchen Sie Ihre Änderungen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:658 msgid "" "Once you've finished making changes, you need to commit them to the " "repository, but before you do so, it's usually a good idea to take a look at " "exactly what you've changed. By examining your changes before you commit, " "you can make a more accurate log message. You may also discover that you've " "inadvertently changed a file, and this gives you a chance to revert those " "changes before committing. Additionally, this is a good opportunity to " "review and scrutinize changes before publishing them. You can see an " "overview of the changes you've made by using <command>svn status</command>, " "and dig into the details of those changes by using <command>svn diff</" "command>." msgstr "" "Sobald Sie mit Ihren Änderungen fertig sind, müssen Sie sie ins Repository " "bringen; bevor Sie das jedoch machen, ist es normalerweise eine gute Idee, " "sich die Änderungen noch einmal anzusehen. Dadurch, dass Sie die Änderungen " "noch einmal begutachten, können Sie eine genauere Log-Nachricht schreiben. " "Sie könnten auch feststellen, dass Sie versehentlich eine Datei geändert " "haben, und hier haben Sie die Möglichkeit, vor dem Commit die Änderung " "rückgängig zu machen. Zusätzlich bietet sich hierbei eine gute Gelegenheit, " "die Änderungen vor der Veröffentlichung noch einmal genau durchzugehen. Sie " "können sich mit <command>svn status</command> einen Überblick über Ihre " "Änderungen verschaffen und mit <command>svn diff</command> die Änderungen im " "Detail anzeigen lassen." # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch02-basic-usage.xml:672 msgid "Look Ma! No Network!" msgstr "Guck mal, Mutti, kein Netzwerk!" # type: Content of: <chapter><sect1><sect2><sidebar><para><footnote> #: ../en/book/ch02-basic-usage.xml:674 msgid "" "You can use the commands <command>svn status</command>, <command>svn diff</" "command>, and <command>svn revert</command> without any network access even " "if your repository <emphasis>is</emphasis> across the network. This makes " "it easy to manage your changes-in-progress when you are somewhere without a " "network connection, such as traveling on an airplane, riding a commuter " "train, or hacking on the beach. <footnote>" msgstr "" "Sie können die Befehle <command>svn status</command>, <command>svn diff</" "command> und <command>svn revert</command> ohne Netzzugriff verwenden, " "selbst wenn das Repository im Netz <emphasis>ist</emphasis>. Das macht es " "leicht, Ihre momentanen Änderungen zu verwalten, wenn Sie irgendwo ohne " "Netzverbindung sind, etwa im Flugzeug, im Pendlerzug oder am Strand. " "<footnote>" # type: Content of: <chapter><sect1><sect2><sidebar><para><footnote><para> #: ../en/book/ch02-basic-usage.xml:683 msgid "And you don't have a WLAN card. Thought you got us, huh?" msgstr "" "Und Sie haben keine WLAN-Karte. Sie dachten wohl, Sie kriegen uns, was?" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:688 msgid "" "Subversion does this by keeping private caches of pristine versions of each " "versioned file inside the <filename>.svn</filename> administrative areas. " "This allows Subversion to report—and revert—local modifications " "to those files <emphasis>without network access</emphasis>. This cache " "(called the <quote>text-base</quote>) also allows Subversion to send the " "user's local modifications during a commit to the server as a compressed " "<firstterm>delta</firstterm> (or <quote>difference</quote>) against the " "pristine version. Having this cache is a tremendous benefit—even if " "you have a fast Internet connection, it's much faster to send only a file's " "changes rather than the whole file to the server." msgstr "" "Subversion bewerkstelligt das, indem es unveränderte Versionen jeder " "versionierten Datei in einem privaten Cache innerhalb des <filename>.svn</" "filename>-Verwaltungsbereichs vorhält. Das erlaubt Subversion, lokale " "Änderungen an diesen Dateien <emphasis>ohne Netzzugriff</emphasis> " "anzuzeigen – und rückgängig zu machen. Dieser Cache (<quote>Text-Base</" "quote> genannt) erlaubt es Subversion ebenfalls, bei einem Commit die " "lokalen Änderungen des Benutzers als komprimiertes <firstterm>Delta</" "firstterm> (oder <quote>Differenz</quote>) gegenüber der unveränderten " "Version zum Server zu senden. Diesen Cache zu haben, bedeutet einen riesigen " "Vorteil – selbst wenn Sie eine schnelle Internet-Verbindung haben, ist " "es viel schneller, nur die Änderungen an einer Datei an den Server zu " "übermitteln, anstatt die gesamte Datei." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:705 msgid "" "Subversion has been optimized to help you with this task, and it is able to " "do many things without communicating with the repository. In particular, " "your working copy contains a hidden cached <quote>pristine</quote> copy of " "each version-controlled file within the <filename>.svn</filename> area. " "Because of this, Subversion can quickly show you how your working files have " "changed or even allow you to undo your changes without contacting the " "repository." msgstr "" "Subversion ist optimiert worden, um Ihnen bei dieser Aufgabe zu helfen, und " "es ist in der Lage, viele Dinge zu tun, ohne mit dem Repository " "kommunizieren zu müssen. Im Besonderen enthält Ihre Arbeitskopie eine " "versteckte <quote>unveränderte</quote> Kopie jeder versionskontrollierten " "Datei innerhalb des <filename>.svn</filename>-Bereichs. Deswegen kann Ihnen " "Subversion schnell zeigen, wie sich Ihre bearbeiteten Dateien geändert " "haben, und es erlaubt Ihnen sogar, Ihre Änderungen zurückzunehmen, ohne " "Verbindung mit dem Repository aufnehmen zu müssen." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:716 msgid "See an overview of your changes" msgstr "Verschaffen Sie sich einen Überblick über Ihre Änderungen" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:718 msgid "" "To get an overview of your changes, you'll use the <command>svn status</" "command> command. You'll probably use <command>svn status</command> more " "than any other Subversion command." msgstr "" "Um einen Überblick über Ihre Änderungen zu bekommen, werden Sie den " "<command>svn status</command>-Befehl verwenden. Wahrscheinlich werden Sie " "den Befehl <command>svn status</command> häufiger benutzen als alle anderen " "Subversion-Befehle." # type: Content of: <chapter><sect1><sect2><sect3><sidebar><title> #: ../en/book/ch02-basic-usage.xml:724 msgid "CVS Users: Hold That Update!" msgstr "CVS Anwender: Zurückhaltung mit Update!" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para> #: ../en/book/ch02-basic-usage.xml:726 msgid "" "You're probably used to using <command>cvs update</command> to see what " "changes you've made to your working copy. <command>svn status</command> " "will give you all the information you need regarding what has changed in " "your working copy—without accessing the repository or potentially " "incorporating new changes published by other users." msgstr "" "Sehr wahrscheinlich sind Sie es gewohnt, <command>cvs update</command> zu " "benutzen, um zu sehen, welche Änderungen Sie an Ihrer Arbeitskopie " "vorgenommen haben. <command>svn status</command> stellt Ihnen alle " "Informationen zur Verfügung, die Sie über Änderungen an der Arbeitskopie " "benötigen – ohne mit dem Repository in Verbindung zu treten oder " "möglicherweise neue Änderungen von anderen Benutzern einzupflegen." # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para> #: ../en/book/ch02-basic-usage.xml:734 msgid "" "In Subversion, <command>svn update</command> does just that—it updates " "your working copy with any changes committed to the repository since the " "last time you updated your working copy. You may have to break the habit of " "using the <command>update</command> command to see what local modifications " "you've made." msgstr "" "In Subversion, macht <command>svn update</command> genau das – es " "aktualisiert Ihre Arbeitskopie mit jeglichen Änderungen, die seit Ihrer " "letzten Aktualisierung in das Repository eingebracht worden sind. Sie " "sollten sich abgewöhnen, <command>update</command> zu verwenden, um " "nachzusehen, welche lokalen Änderungen Sie gemacht haben." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:743 msgid "" "If you run <command>svn status</command> at the top of your working copy " "with no arguments, it will detect all file and tree changes you've made. " "Here are a few examples of the most common status codes that <command>svn " "status</command> can return. (Note that the text following <literal>#</" "literal> is not actually printed by <command>svn status</command>.)" msgstr "" "Wenn Sie <command>svn status</command> ganz oben in Ihrer Arbeitskopie " "aufrufen, werden alle Datei- und Verzeichnisbaumänderungen erfasst, die Sie " "gemacht haben. Hier sind einige Beispiele der häufigsten Statuscodes, die " "<command>svn status</command> zurückgeben kann. (Beachten Sie, dass der " "Text, der <literal>#</literal> folgt, nicht von <command>svn status</" "command> ausgegeben wird.)" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:751 #, no-wrap msgid "" "\n" "? scratch.c # file is not under version control\n" "A stuff/loot/bloo.h # file is scheduled for addition\n" "C stuff/loot/lump.c # file has textual conflicts from an update\n" "D stuff/fish.c # file is scheduled for deletion\n" "M bar.c # the content in bar.c has local modifications\n" msgstr "" "\n" "? scratch.c # Datei ist nicht versionskontrolliert\n" "A stuff/loot/bloo.h # Datei ist zum Hinzufügen vorgemerkt\n" "C stuff/loot/lump.c # Datei hat Konflikte durch einen Update\n" "D stuff/fish.c # Datei ist zum Löschen vorgemerkt\n" "M bar.c # Der Inhalt von bar.c hat lokale Änderungen\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:759 msgid "" "In this output format, <command>svn status</command> prints six columns of " "characters, followed by several whitespace characters, followed by a file or " "directory name. The first column tells the status of a file or directory " "and/or its contents. The codes we listed are:" msgstr "" "In diesem Ausgabeformat zeigt <command>svn status</command> sechs Spalten " "mit Zeichen, gefolgt von mehreren Leerzeichen, gefolgt von einem Datei- oder " "Verzeichnisnamen an. Die erste Spalte gibt Aufschluss über den Zustand einer " "Datei oder eines Verzeichnisses und/oder des entsprechenden Inhalts." # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:768 msgid "<computeroutput>A item</computeroutput>" msgstr "<computeroutput>A item</computeroutput>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:770 msgid "" "The file, directory, or symbolic link <filename>item</filename> has been " "scheduled for addition into the repository." msgstr "" "Die Datei, das Verzeichnis oder der symbolische Link <filename>item</" "filename> ist zum Hinzufügen in das Repository vorgemerkt." # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:777 msgid "<computeroutput>C item</computeroutput>" msgstr "<computeroutput>C item</computeroutput>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:780 msgid "" "The file <filename>item</filename> is in a state of conflict. That is, " "changes received from the server during an update overlap with local changes " "that you have in your working copy (and weren't resolved during the " "update). You must resolve this conflict before committing your changes to " "the repository." msgstr "" "Die Datei <filename>item</filename> befindet sich in einem Konfliktzustand. " "D.h., Änderungen, die vom Server bei einer Aktualisierung empfangen wurden, " "überlappen sich mit lokalen Änderungen, die Sie in Ihrer Arbeitskopie haben " "(und konnten beim Aktualisieren nicht automatisch aufgelöst werden). Sie " "müssen den Konflikt auflösen, bevor Sie Ihre Änderungen in das Repository " "committen können." # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:792 msgid "<computeroutput>D item</computeroutput>" msgstr "<computeroutput>D item</computeroutput>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:794 msgid "" "The file, directory, or symbolic link <filename>item</filename> has been " "scheduled for deletion from the repository." msgstr "" "Die Datei, das Verzeichnis oder der symbolische Link <filename>item</" "filename> ist zum Löschen im Repository vorgemerkt." # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:801 msgid "<computeroutput>M item</computeroutput>" msgstr "<computeroutput>M item</computeroutput>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:803 msgid "The contents of the file <filename>item</filename> have been modified." msgstr "Der Inhalt der Datei <filename>item</filename> ist geändert worden." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:810 msgid "" "If you pass a specific path to <command>svn status</command>, you get " "information about that item alone:" msgstr "" "Wenn Sie einen speziellen Pfad an <command>svn status</command> übergeben, " "bekommen Sie nur Informationen über das Objekt alleine:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:814 #, no-wrap msgid "" "\n" "$ svn status stuff/fish.c\n" "D stuff/fish.c\n" msgstr "" "\n" "$ svn status stuff/fish.c\n" "D stuff/fish.c\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:819 msgid "" "<command>svn status</command> also has a <option>--verbose</option> " "(<option>-v</option>) option, which will show you the status of " "<emphasis>every</emphasis> item in your working copy, even if it has not " "been changed:" msgstr "" "<command>svn status</command> hat auch eine <option>--verbose</option>-" "Option (<option>-v</option>), die Ihnen den Zustand <emphasis>jedes</" "emphasis> Objektes in der Arbeitskopie anzeigt, selbst wenn es sich nicht " "geändert hat:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:825 #, no-wrap msgid "" "\n" "$ svn status -v\n" "M 44 23 sally README\n" " 44 30 sally INSTALL\n" "M 44 20 harry bar.c\n" " 44 18 ira stuff\n" " 44 35 harry stuff/trout.c\n" "D 44 19 ira stuff/fish.c\n" " 44 21 sally stuff/things\n" "A 0 ? ? stuff/things/bloo.h\n" " 44 36 harry stuff/things/gloo.c\n" msgstr "" "\n" "$ svn status -v\n" "M 44 23 sally README\n" " 44 30 sally INSTALL\n" "M 44 20 harry bar.c\n" " 44 18 ira stuff\n" " 44 35 harry stuff/trout.c\n" "D 44 19 ira stuff/fish.c\n" " 44 21 sally stuff/things\n" "A 0 ? ? stuff/things/bloo.h\n" " 44 36 harry stuff/things/gloo.c\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:838 msgid "" "This is the <quote>long form</quote> output of <command>svn status</" "command>. The letters in the first column mean the same as before, but the " "second column shows the working revision of the item. The third and fourth " "columns show the revision in which the item last changed, and who changed it." msgstr "" "Dies ist das <quote>lange Format</quote> der Ausgabe von <command>svn " "status</command>. Die Buchstaben in der ersten Spalte bedeuten dasselbe wie " "vorher, jedoch zeigt die zweite Spalte die Arbeitsrevision des Objektes an. " "Die dritte und vierte Spalte zeigen die Revision der letzten Änderung an und " "wer es geändert hat." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:845 msgid "" "None of the prior invocations to <command>svn status</command> contact the " "repository—instead, they compare the metadata in the <filename>.svn</" "filename> directory with the working copy. Finally, there is the <option>--" "show-updates</option> (<option>-u</option>) option, which contacts the " "repository and adds information about things that are out of date:" msgstr "" "Keiner der vorangegangenen Aufrufe von <command>svn status</command> stellt " "eine Verbindung zum Repository her – stattdessen werden die Metadaten " "im Verzeichnis <filename>.svn</filename> mit der Arbeitskopie verglichen. " "Schließlich gibt es die <option>--show-updates</option>-Option (<option>-u</" "option>), die eine Verbindung zum Repository herstellt, und Informationen " "darüber bereitstellt, was nicht mehr aktuell ist:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:853 #, no-wrap msgid "" "\n" "$ svn status -u -v\n" "M * 44 23 sally README\n" "M 44 20 harry bar.c\n" " * 44 35 harry stuff/trout.c\n" "D 44 19 ira stuff/fish.c\n" "A 0 ? ? stuff/things/bloo.h\n" "Status against revision: 46\n" msgstr "" "\n" "$ svn status -u -v\n" "M * 44 23 sally README\n" "M 44 20 harry bar.c\n" " * 44 35 harry stuff/trout.c\n" "D 44 19 ira stuff/fish.c\n" "A 0 ? ? stuff/things/bloo.h\n" "Status against revision: 46\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:863 msgid "" "Notice the two asterisks: if you were to run <userinput>svn update</" "userinput> at this point, you would receive changes to <filename>README</" "filename> and <filename>trout.c</filename>. This tells you some very useful " "information—you'll need to update and get the server changes on " "<filename>README</filename> before you commit, or the repository will reject " "your commit for being out of date (more on this subject later)." msgstr "" "Beachten Sie die zwei Sternchen: Wenn Sie an dieser Stelle <userinput>svn " "update</userinput> aufrufen würden, erhielten Sie Änderungen an " "<filename>README</filename> und <filename>trout.c</filename>. Das gibt Ihnen " "einige sehr wichtige Informationen – Sie müssen aktualisieren, um die " "Änderungen auf dem Server an <filename>README</filename> mitzubekommen, " "bevor Sie committen, oder das Repository wird Ihren Commit ablehnen, da er " "nicht aktuell ist (mehr dazu später)." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:872 msgid "" "<command>svn status</command> can display much more information about the " "files and directories in your working copy than we've shown here—for " "an exhaustive description of <command>svn status</command> and its output, " "see <xref linkend=\"svn.ref.svn.c.status\"/>." msgstr "" "<command>svn status</command> kann viel mehr Informationen über Dateien und " "Verzeichnisse in Ihrer Arbeitskopie anzeigen als wir hier gezeigt haben " "– für eine erschöpfende Beschreibung von <command>svn status</command> " "und dessen Ausgabe, siehe <xref linkend=\"svn.ref.svn.c.status\"/>." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:882 msgid "Examine the details of your local modifications" msgstr "Untersuchen Sie die Details Ihrer lokalen Änderungen" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:884 msgid "" "Another way to examine your changes is with the <command>svn diff</command> " "command. You can find out <emphasis>exactly</emphasis> how you've modified " "things by running <userinput>svn diff</userinput> with no arguments, which " "prints out file changes in <firstterm>unified diff format</firstterm>:" msgstr "" "Eine andere Möglichkeit, Ihre Änderungen zu untersuchen, ist, den " "<command>svn diff</command>-Befehl zu verwenden. Sie können " "<emphasis>genau</emphasis> herausfinden, wie sie etwas geändert haben, indem " "Sie <userinput>svn diff</userinput> ohne Argumente aufrufen, das Ihnen " "Dateiänderungen im <firstterm>unified-diff-Format</firstterm> anzeigt:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:891 #, no-wrap msgid "" "\n" "$ svn diff\n" "Index: bar.c\n" "===================================================================\n" "--- bar.c\t(revision 3)\n" "+++ bar.c\t(working copy)\n" "@@ -1,7 +1,12 @@\n" "+#include <sys/types.h>\n" "+#include <sys/stat.h>\n" "+#include <unistd.h>\n" "+\n" "+#include <stdio.h>\n" "\n" " int main(void) {\n" "- printf(\"Sixty-four slices of American Cheese...\\n\");\n" "+ printf(\"Sixty-five slices of American Cheese...\\n\");\n" " return 0;\n" " }\n" "\n" "Index: README\n" "===================================================================\n" "--- README\t(revision 3)\n" "+++ README\t(working copy)\n" "@@ -193,3 +193,4 @@\n" "+Note to self: pick up laundry.\n" "\n" "Index: stuff/fish.c\n" "===================================================================\n" "--- stuff/fish.c\t(revision 1)\n" "+++ stuff/fish.c\t(working copy)\n" "-Welcome to the file known as 'fish'.\n" "-Information on fish will be here soon.\n" "\n" "Index: stuff/things/bloo.h\n" "===================================================================\n" "--- stuff/things/bloo.h\t(revision 8)\n" "+++ stuff/things/bloo.h\t(working copy)\n" "+Here is a new file to describe\n" "+things about bloo.\n" msgstr "" "\n" "$ svn diff\n" "Index: bar.c\n" "===================================================================\n" "--- bar.c\t(revision 3)\n" "+++ bar.c\t(working copy)\n" "@@ -1,7 +1,12 @@\n" "+#include <sys/types.h>\n" "+#include <sys/stat.h>\n" "+#include <unistd.h>\n" "+\n" "+#include <stdio.h>\n" "\n" " int main(void) {\n" "- printf(\"Sixty-four slices of American Cheese...\\n\");\n" "+ printf(\"Sixty-five slices of American Cheese...\\n\");\n" " return 0;\n" " }\n" "\n" "Index: README\n" "===================================================================\n" "--- README\t(revision 3)\n" "+++ README\t(working copy)\n" "@@ -193,3 +193,4 @@\n" "+Note to self: pick up laundry.\n" "\n" "Index: stuff/fish.c\n" "===================================================================\n" "--- stuff/fish.c\t(revision 1)\n" "+++ stuff/fish.c\t(working copy)\n" "-Welcome to the file known as 'fish'.\n" "-Information on fish will be here soon.\n" "\n" "Index: stuff/things/bloo.h\n" "===================================================================\n" "--- stuff/things/bloo.h\t(revision 8)\n" "+++ stuff/things/bloo.h\t(working copy)\n" "+Here is a new file to describe\n" "+things about bloo.\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:932 msgid "" "The <command>svn diff</command> command produces this output by comparing " "your working files against the cached <quote>pristine</quote> copies within " "the <filename>.svn</filename> area. Files scheduled for addition are " "displayed as all added text, and files scheduled for deletion are displayed " "as all deleted text." msgstr "" "Der <command>svn diff</command>-Befehl erzeugt diese Ausgabe, indem er Ihre " "Arbeitsdateien mit den <quote>unveränderten</quote> Kopien im Cache " "innerhalb des <filename>.svn</filename>-Bereichs vergleicht. Dateien, die " "zum Hinzufügen vorgemerkt sind, werden vollständig als hinzugefügter Text " "dargestellt, und Dateien, die zum Löschen vorgemerkt sind, werden " "vollständig als gelöschter Text dargestellt." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:940 msgid "" "Output is displayed in unified diff format. That is, removed lines are " "prefaced with <literal>-</literal>, and added lines are prefaced with " "<literal>+</literal>. <command>svn diff</command> also prints filename and " "offset information useful to the <command>patch</command> program, so you " "can generate <quote>patches</quote> by redirecting the diff output to a file:" msgstr "" "Die Ausgabe wird im unified-diff-Format dargestellt. D.h., gelöschte Zeilen " "werden mit einem vorangestellten <literal>-</literal> und hinzugefügte " "Zeilen mit einem vorangestellten <literal>+</literal> angezeigt. " "<command>svn diff</command> gibt auch Dateinamen und Offset-Informationen " "aus, die das <command>patch</command>-Programm verwenden kann, so dass Sie " "<quote>Patches</quote> erzeugen können, indem Sie die diff-Ausgabe in eine " "Datei umleiten:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:949 #, no-wrap msgid "" "\n" "$ svn diff > patchfile\n" msgstr "" "\n" "$ svn diff > patchfile\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:953 msgid "" "You could, for example, email the patch file to another developer for review " "or testing prior to a commit." msgstr "" "Zum Beispiel können Sie die Patch-Datei vor einem Commit an einen anderen " "Entwickler zur Kontrolle oder zum Testen schicken." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:956 msgid "" "Subversion uses its internal diff engine, which produces unified diff " "format, by default. If you want diff output in a different format, specify " "an external diff program using <option>--diff-cmd</option> and pass any " "flags you'd like to it using the <option>--extensions</option> (<option>-x</" "option>) option. For example, to see local differences in file " "<filename>foo.c</filename> in context output format while ignoring case " "differences, you might run <userinput>svn diff --diff-cmd /usr/bin/diff --" "extensions '-i' foo.c</userinput>." msgstr "" "Subversion verwendet seinen eingebauten diff-Algorithmus, der standardmäßig " "das unified-diff-Format benutzt. Falls Sie die Ausgabe von diff in einem " "anderen Format haben möchten, geben Sie ein externes diff-Programm mit der " "<option>--diff-cmd</option>-Option an, und übergeben Sie ihm beliebige Flags " "mit der <option>--extensions</option>-Option (<option>-x</option>). Um z.B. " "lokale Unterschiede in der Datei <filename>foo.c</filename> im Kontext-" "Ausgabeformat anzeigen zu lassen und dabei die Groß- und Kleinschreibung zu " "ignorieren, könnten Sie <userinput>svn diff --diff-cmd /usr/bin/diff --" "extensions '-i' foo.c</userinput> aufrufen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:974 msgid "Undoing Working Changes" msgstr "Zurücknehmen von Änderungen in der Arbeitskopie" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:977 msgid "" "Suppose while viewing the output of <command>svn diff</command> you " "determine that all the changes you made to a particular file are mistakes. " "Maybe you shouldn't have changed the file at all, or perhaps it would be " "easier to make different changes starting from scratch." msgstr "" "Angenommen, Sie stellen beim Ansehen der Ausgabe von <command>svn diff</" "command> fest, dass alle Änderungen, die Sie an einer bestimmten Datei " "gemacht haben, fehlerhaft waren. Vielleicht hätten Sie die Datei überhaupt " "nicht ändern sollen, oder es wäre einfacher, von Anfang an unterschiedliche " "Änderungen zu machen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:983 msgid "This is a perfect opportunity to use <command>svn revert</command>:" msgstr "" "Dies ist die perfekte Gelegenheit, <command>svn revert</command> zu benutzen:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:986 #, no-wrap msgid "" "\n" "$ svn revert README\n" "Reverted 'README'\n" msgstr "" "\n" "$ svn revert README\n" "Reverted 'README'\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:991 msgid "" "Subversion reverts the file to its premodified state by overwriting it with " "the cached <quote>pristine</quote> copy from the <filename>.svn</filename> " "area. But also note that <command>svn revert</command> can undo " "<emphasis>any</emphasis> scheduled operations—for example, you might " "decide that you don't want to add a new file after all:" msgstr "" "Subversion stellt die Datei wieder so her, wie sie vor der Änderung war, " "indem sie mit der <quote>unveränderten</quote> Kopie aus dem Cache im " "<filename>.svn</filename>-Bereich überschrieben wird. Beachten Sie aber " "auch, dass <command>svn revert</command> <emphasis>jegliche</emphasis> " "vorgemerkten Operationen rückgängig machen kann – z.B. könnten Sie " "sich entscheiden, eine neue Datei erst gar nicht hinzufügen zu wollen:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:999 #, no-wrap msgid "" "\n" "$ svn status foo\n" "? foo\n" "\n" "$ svn add foo\n" "A foo\n" "\n" "$ svn revert foo\n" "Reverted 'foo'\n" "\n" "$ svn status foo\n" "? foo\n" msgstr "" "\n" "$ svn status foo\n" "? foo\n" "\n" "$ svn add foo\n" "A foo\n" "\n" "$ svn revert foo\n" "Reverted 'foo'\n" "\n" "$ svn status foo\n" "? foo\n" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch02-basic-usage.xml:1014 msgid "" "<userinput>svn revert <replaceable>item</replaceable></userinput> has " "exactly the same effect as deleting <replaceable>item</replaceable> from " "your working copy and then running <userinput>svn update -r BASE " "<replaceable>item</replaceable></userinput>. However, if you're reverting a " "file, <command>svn revert</command> has one very noticeable difference—" "it doesn't have to communicate with the repository to restore your file." msgstr "" "<userinput>svn revert <replaceable>item</replaceable></userinput> hat genau " "denselben Effekt, wie <replaceable>item</replaceable> aus der Arbeitskopie " "zu löschen und dann <command>svn update -r BASE</command> <replaceable>item</" "replaceable> aufzurufen. Allerdings hat <command>svn revert</command> beim " "Rückgängigmachen einer Datei einen merklichen Unterschied – es muss " "beim Wiederherstellen der Datei nicht Verbindung mit dem Repository " "aufnehmen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1024 msgid "Or perhaps you mistakenly removed a file from version control:" msgstr "" "Oder vielleicht haben Sie die Datei versehentlich aus der Versionsverwaltung " "gelöscht:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1027 #, no-wrap msgid "" "\n" "$ svn status README\n" "\n" "$ svn delete README\n" "D README\n" "\n" "$ svn revert README\n" "Reverted 'README'\n" "\n" "$ svn status README\n" msgstr "" "\n" "$ svn status README\n" "\n" "$ svn delete README\n" "D README\n" "\n" "$ svn revert README\n" "Reverted 'README'\n" "\n" "$ svn status README\n" "\n" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:1043 msgid "Resolve Conflicts (Merging Others' Changes)" msgstr "Konflikte auflösen (Änderungen anderer einarbeiten)" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1045 msgid "" "We've already seen how <userinput>svn status -u</userinput> can predict " "conflicts. Suppose you run <userinput>svn update</userinput> and some " "interesting things occur:" msgstr "" "Wir haben bereits gesehen, wie <userinput>svn status -u</userinput> " "Konflikte vorhersagen kann. Angenommen, Sie starten <command>svn update</" "command> und einige interessante Dinge passieren:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1049 #, no-wrap msgid "" "\n" "$ svn update\n" "U INSTALL\n" "G README\n" "Conflict discovered in 'bar.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options:\n" msgstr "" "\n" "$ svn update\n" "U INSTALL\n" "G README\n" "Conflict discovered in 'bar.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options:\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1058 msgid "" "The <computeroutput>U</computeroutput> and <computeroutput>G</" "computeroutput> codes are no cause for concern; those files cleanly absorbed " "changes from the repository. The files marked with <computeroutput>U</" "computeroutput> contained no local changes but were <computeroutput>U</" "computeroutput>pdated with changes from the repository. The " "<computeroutput>G</computeroutput> stands for mer<computeroutput>G</" "computeroutput>ed, which means that the file had local changes to begin " "with, but the changes coming from the repository didn't overlap with the " "local changes." msgstr "" "Die Codes <computeroutput>U</computeroutput> und <computeroutput>G</" "computeroutput> sind kein Grund zur Beunruhigung; diese Dateien haben die " "Änderungen aus dem Repository sauber aufgenommen. Die mit <computeroutput>U</" "computeroutput> markierten Dateien enthielten keine lokalen Änderungen, " "wurden jedoch mit Änderungen aus dem Repository ge<computeroutput>U</" "computeroutput>pdatet. Das <computeroutput>G</computeroutput> steht für " "mer<computeroutput>G</computeroutput>ed, was bedeutet, dass die Datei zwar " "lokale Änderungen enthielt, die Änderungen aus dem Repository sich aber " "nicht damit überschnitten haben." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1070 msgid "" "But the next two lines are part of a feature (new in Subversion 1.5) called " "<firstterm>interactive conflict resolution</firstterm>. This means that the " "changes from the server overlapped with your own, and you have the " "opportunity to resolve this conflict. The most commonly used options are " "displayed, but you can see all of the options by typing <replaceable>h</" "replaceable>:" msgstr "" "Die nächsten beiden Zeilen jedoch sind Teil eines Features (neu in " "Subversion 1.5) namens <firstterm>interaktive Konfliktauflösung</firstterm>. " "Das bedeutet, dass die Änderungen vom Server sich mit Ihren eigenen " "überschneiden, uns Sie nun die Gelegenheit haben, den Konflikt aufzulösen. " "Die gebräuchlichsten Optionen werden angezeigt, aber alle Optionen können " "sie sehen, wenn Sie <replaceable>h</replaceable> eintippen:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1078 #, no-wrap msgid "" "\n" "…\n" " (p) postpone - mark the conflict to be resolved later\n" " (df) diff-full - show all changes made to merged file\n" " (e) edit - change merged file in an editor\n" " (r) resolved - accept merged version of file\n" " (mf) mine-full - accept my version of entire file (ignore their changes)\n" " (tf) theirs-full - accept their version of entire file (lose my changes)\n" " (l) launch - launch external tool to resolve conflict\n" " (h) help - show this list\n" msgstr "" "\n" "…\n" " (p) postpone - mark the conflict to be resolved later\n" " (df) diff-full - show all changes made to merged file\n" " (e) edit - change merged file in an editor\n" " (r) resolved - accept merged version of file\n" " (mf) mine-full - accept my version of entire file (ignore their changes)\n" " (tf) theirs-full - accept their version of entire file (lose my changes)\n" " (l) launch - launch external tool to resolve conflict\n" " (h) help - show this list\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1090 msgid "" "Let's briefly review each of these options before we go into detail on what " "each option means." msgstr "" "Bevor wir im Detail erklären, was jede Option bedeutet, gehen wir noch mal " "eben die Optionen durch." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1095 msgid "(<computeroutput>p</computeroutput>)ostpone" msgstr "(<computeroutput>p</computeroutput>)ostpone" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1098 msgid "" "Leave the file in a conflicted state for you to resolve after your update is " "complete." msgstr "" "Die Datei im Konfliktzustand lassen, um nach Abschluss der Aktualisierung " "die Konfliktauflösung durchzuführen." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1107 msgid "(<computeroutput>d</computeroutput>)iff" msgstr "(<computeroutput>d</computeroutput>)iff" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1110 msgid "" "Display the differences between the base revision and the conflicted file " "itself in unified diff format." msgstr "" "Die Unterschiede zwischen der Basisrevision und der Konfliktdatei im unified-" "diff-Format anzeigen." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1118 msgid "(<computeroutput>e</computeroutput>)dit" msgstr "(<computeroutput>e</computeroutput>)dit" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1121 msgid "" "Open the file in conflict with your favorite editor, as set in the " "environment variable <literal>EDITOR</literal>." msgstr "" "Die Konfliktdatei im bevorzugten Editor, wie in der Umgebungsvariablen " "<literal>EDITOR</literal> angegeben, öffnen." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1130 msgid "(<computeroutput>r</computeroutput>)esolved" msgstr "(<computeroutput>r</computeroutput>)esolved" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1133 msgid "" "After editing a file, tell <command>svn</command> that you've resolved the " "conflicts in the file and that it should accept the current contents—" "basically that you've <quote>resolved</quote> the conflict." msgstr "" "Nach dem Bearbeiten einer Datei teilen Sie <command>svn</command> mit, dass " "Sie die Konflikte in der Datei aufgelöst haben und der aktuelle Inhalt " "übernommen werden soll." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1143 msgid "" "(<computeroutput>m</computeroutput>)ine-(<computeroutput>f</computeroutput>)" "ull" msgstr "" "(<computeroutput>m</computeroutput>)ine-(<computeroutput>f</computeroutput>)" "ull" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1146 msgid "" "Discard the newly received changes from the server and use only your local " "changes for the file under review." msgstr "" "Die neuen vom Server erhaltenen Änderungen verwerfen und nur Ihre lokalen " "Änderungen an der zu überprüfenden Datei verwenden." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1153 msgid "" "(<computeroutput>t</computeroutput>)heirs-(<computeroutput>f</" "computeroutput>)ull" msgstr "" "(<computeroutput>t</computeroutput>)heirs-(<computeroutput>f</" "computeroutput>)ull" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1156 msgid "" "Discard your local changes to the file under review and use only the newly " "received changes from the server." msgstr "" "Ihre lokalen Änderungen an der zu überprüfenden Datei verwerfen und nur die " "neuen vom Server erhaltenen Änderungen verwenden." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1164 msgid "(<computeroutput>l</computeroutput>)aunch" msgstr "(<computeroutput>l</computeroutput>)aunch" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1167 msgid "" "Launch an external program to perform the conflict resolution. This " "requires a bit of preparation beforehand." msgstr "" "Ein externes Programm zur Konfliktauflösung starten. Das setzt " "Vorbereitungen voraus." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1175 msgid "(<computeroutput>h</computeroutput>)elp" msgstr "(<computeroutput>h</computeroutput>)elp" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1178 msgid "" "Show the list of all possible commands you can use in interactive conflict " "resolution." msgstr "" "Die Liste aller bei der interaktiven Konfliktauflösung möglichen Befehle " "anzeigen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1186 msgid "" "We'll cover these commands in more detail now, grouping them together by " "related functionality." msgstr "" "Wir werden diese Befehle nun detaillierter behandeln, wobei sie nach " "Funktionalität gruppiert werden." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1193 msgid "Viewing conflict differences interactively" msgstr "Interaktive Begutachtung der Konflikte" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1195 msgid "" "Before deciding how to attack a conflict interactively, odds are that you'd " "like to see exactly what is in conflict, and the <firstterm>diff</firstterm> " "command (<userinput>d</userinput>) is what you'll use for this:" msgstr "" "Bevor Sie entscheiden, wie Sie einen Konflikt beseitigen wollen, wollen Sie " "wahrscheinlich genau sehen, worin der Konflikt besteht, und benutzen hierfür " "den Befehl <firstterm>diff</firstterm> (<userinput>d</userinput>):" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1200 #, no-wrap msgid "" "\n" "…\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h)elp for more options : d\n" "--- .svn/text-base/sandwich.txt.svn-base Tue Dec 11 21:33:57 2007\n" "+++ .svn/tmp/tempfile.32.tmp Tue Dec 11 21:34:33 2007\n" "@@ -1 +1,5 @@\n" "-Just buy a sandwich.\n" "+<<<<<<< .mine\n" "+Go pick up a cheesesteak.\n" "+=======\n" "+Bring me a taco!\n" "+>>>>>>> .r32\n" "…\n" msgstr "" "\n" "…\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h)elp for more options : d\n" "--- .svn/text-base/sandwich.txt.svn-base Tue Dec 11 21:33:57 2007\n" "+++ .svn/tmp/tempfile.32.tmp Tue Dec 11 21:34:33 2007\n" "@@ -1 +1,5 @@\n" "-Just buy a sandwich.\n" "+<<<<<<< .mine\n" "+Go pick up a cheesesteak.\n" "+=======\n" "+Bring me a taco!\n" "+>>>>>>> .r32\n" "…\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1216 msgid "" "The first line of the diff content shows the previous contents of the " "working copy (the <literal>BASE</literal> revision), the next content line " "is your change, and the last content line is the change that was just " "received from the server (<emphasis>usually</emphasis> the <literal>HEAD</" "literal> revision). With this information in hand, you're ready to move on " "to the next action." msgstr "" "Die erste Zeile des diff-Inhalts zeigt den vorherigen Inhalt der " "Arbeitskopie (die <literal>BASE</literal>-Revision), die nächste Zeile " "beinhaltet Ihre Änderung und die letzte Zeile ist die Änderung, die soeben " "vom Server empfangen worden ist (<emphasis>gewöhnlich</emphasis> die " "<literal>HEAD</literal>-Revision). Mit diesen Informationen sind Sie bereit " "für den nächsten Schritt." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1229 msgid "Resolving conflict differences interactively" msgstr "Interaktive Konfliktauflösung" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1231 msgid "" "There are four different ways to resolve conflicts interactively—two " "of which allow you to selectively merge and edit changes, and two of which " "allow you to simply pick a version of the file and move along." msgstr "" "Es gibt vier verschiedene Wege, um Konflikte interaktiv aufzulösen – " "von denen Ihnen zwei erlauben, Änderungen selektiv zusammenzuführen und zu " "editieren und zwei, die es Ihnen erlauben, einfach eine Version der Datei " "auszuwählen und weiterzumachen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1236 msgid "" "If you wish to choose some combination of your local changes, you can use " "the <quote>edit</quote> command (<userinput>e</userinput>) to manually edit " "the file with conflict markers in a text editor (determined by the " "<literal>EDITOR</literal> environment variable). Editing the file by hand " "in your favorite text editor is a somewhat low-tech way of remedying " "conflicts (see <xref linkend=\"svn.tour.cycle.resolve.byhand\"/> for a " "walkthrough), so some people like to use fancy graphical merge tools instead." msgstr "" "Falls Sie eine beliebige Kombination Ihrer lokalen Änderungen auswählen " "wollen, können Sie den <quote>edit</quote>-Befehl (<userinput>e</" "userinput>) verwenden, um die Datei mit den Konfliktmarken manuell in einem " "Texteditor (der durch die Umgebungsvariable <literal>EDITOR</literal> " "bestimmt wird) zu bearbeiten. Die Datei händisch in Ihrem Lieblingseditor zu " "bearbeiten ist eine Art Konflikte zu beseitigen, die sich einer ziemlich " "schlichten Technik bedient (siehe <xref linkend=\"svn.tour.cycle.resolve." "byhand\"/> für einen Beispieldurchgang), so dass manche Leute lieber feinste " "Merge-Tools benutzen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1247 msgid "" "To use a merge tool, you need to either set the <literal>SVN_MERGE</literal> " "environment variable or define the <literal>merge-tool-cmd</literal> option " "in your Subversion configuration file (see <xref linkend=\"svn.advanced." "confarea.opts\"/> for more details). Subversion will pass four arguments to " "the merge tool: the <literal>BASE</literal> revision of the file, the " "revision of the file received from the server as part of the update, the " "copy of the file containing your local edits, and the merged copy of the " "file (which contains conflict markers). If your merge tool is expecting " "arguments in a different order or format, you'll need to write a wrapper " "script for Subversion to invoke. After you've edited the file, if you're " "satisfied with the changes you've made, you can tell Subversion that the " "edited file is no longer in conflict by using the <quote>resolve</quote> " "command (<literal>r</literal>)." msgstr "" "Um ein Merge-Tool benutzen zu können, müssen Sie entweder die " "Umgebungsvariable <literal>SVN_MERGE</literal> setzen oder die " "<literal>merge-tool-cmd</literal>-Option in Ihrer Subversion-" "Konfigurationsdatei definieren (siehe <xref linkend=\"svn.advanced.confarea." "opts\"/> für weitere Details). Subversion übergibt vier Argumente an das " "Merge-Tool: die <literal>BASE</literal>-Revision der Datei, die " "Dateirevision, die durch die Aktualisierung vom Server empfangen wurde, die " "Dateirevision, die Ihre lokale Bearbeitung beinhaltet und die " "zusammengeführte Kopie der Datei (die Konfliktmarken enthält). Falls Ihr " "Merge-Tool die Argumente in einer anderen Reihenfolge oder in einem anderen " "Format erwartet, werden Sie ein Wrapper-Script schreiben müssen, das von " "Subversion aufgerufen wird. Nachdem Sie die Datei bearbeitet haben und " "zufrieden mit Ihren Änderungen sind, können Sie Subversion mitteilen, dass " "für die bearbeitete Datei kein Konflikt mehr besteht, indem sie den " "<quote>resolve</quote>-Befehl (<literal>r</literal>) benutzen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1268 msgid "" "If you decide that you don't need to merge any changes, but just want to " "accept one version of the file or the other, you can either choose your " "changes (a.k.a. <quote>mine</quote>) by using the <quote>mine-full</quote> " "command (<userinput>mf</userinput>) or choose theirs by using the " "<quote>theirs-full</quote> command (<userinput>tf</userinput>)." msgstr "" "Falls Sie entscheiden, dass Sie keine Änderungen zusammenführen brauchen, " "sondern lediglich eine der beiden Dateiversionen akzeptieren wollen, können " "Sie entweder Ihre Änderungen (auch <quote>meine</quote>) mit dem <quote>mine-" "full</quote>-Befehl (<userinput>mf</userinput>) oder die der Anderen mit " "dem <quote>theirs-full</quote>-Befehl (<userinput>tf</userinput>) auswählen." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1281 msgid "Postponing conflict resolution" msgstr "Aufschieben der Konfliktauflösung" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1283 msgid "" "This may sound like an appropriate section for avoiding marital " "disagreements, but it's actually still about Subversion, so read on. If " "you're doing an update and encounter a conflict that you're not prepared to " "review or resolve, you can type <userinput>p</userinput> to postpone " "resolving a conflict on a file-by-file basis when you run <userinput>svn " "update</userinput>. If you're running an update and don't want to resolve " "any conflicts, you can pass the <option>--non-interactive</option> option to " "<command>svn update</command>, and any file in conflict will be marked with " "a <computeroutput>C</computeroutput> automatically." msgstr "" "Das hört sich vielleicht an wie ein passender Abschnitt zur Vermeidung von " "Ehestreitigkeiten, doch es geht immer noch um Subversion; also lesen Sie " "weiter. Falls Sie eine Aktualisierung vornehmen und ein Konflikt auftaucht, " "den Sie nicht begutachten oder auflösen können, ermöglicht Ihnen das " "Eingeben von <userinput>p</userinput> die Konfliktauflösung Datei für Datei " "aufzuschieben, wenn Sie <userinput>svn update</userinput> aufrufen. Falls " "Sie aktualisieren wollen, ohne Konflikte aufzulösen, können Sie die " "<option>--non-interactive</option>-Option an <command>svn update</command> " "übergeben, und jede Datei mit Konflikten wird automatisch mit einem " "<computeroutput>C</computeroutput> gekennzeichnet." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1296 msgid "" "The <computeroutput>C</computeroutput> stands for <computeroutput>c</" "computeroutput>onflict. This means that the changes from the server " "overlapped with your own, and now you have to manually choose between them " "after the update has completed. When you postpone a conflict resolution, " "<command>svn</command> typically does three things to assist you in noticing " "and resolving that conflict:" msgstr "" "Das <computeroutput>C</computeroutput> bedeutet <computeroutput>c</" "computeroutput>onflict. Das heißt, dass die Änderungen vom Server sich mit " "Ihren eigenen überschneiden, und Sie nach Abschluss der Aktualisierung " "manuell aus den Änderungen wählen müssen. Wenn Sie eine Konfliktauflösung " "verschieben, macht <command>svn</command> typischerweise drei Dinge, um " "Ihnen bei der Konfliktauflösung zu helfen:" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1308 msgid "" "Subversion prints a <computeroutput>C</computeroutput> during the update and " "remembers that the file is in a state of conflict." msgstr "" "Subversion gibt ein <computeroutput>C</computeroutput> während der " "Aktualisierung aus und merkt sich, dass die Datei in einem Konfliktzustand " "ist." # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1314 msgid "" "If Subversion considers the file to be mergeable, it places " "<firstterm>conflict markers</firstterm>—special strings of text that " "delimit the <quote>sides</quote> of the conflict—into the file to " "visibly demonstrate the overlapping areas. (Subversion uses the " "<literal>svn:mime-type</literal> property to decide whether a file is " "capable of contextual, line-based merging. See <xref linkend=\"svn.advanced." "props.special.mime-type\"/> to learn more.)" msgstr "" "Falls Subversion die Datei als geeignet zum Zusammenführen ansieht, fügt es " "<firstterm>Konfliktmarken</firstterm> – besondere Zeichenketten, die " "die Konfliktregion begrenzen – in die Datei ein, um die überlappenden " "Bereiche besonders hervorzuheben. (Subversion verwendet das <literal>svn:" "mime-type</literal>-Property, um festzustellen, ob sich die Datei " "kontextuell zeilenweise zusammenführen lässt. Siehe <xref linkend=\"svn." "advanced.props.special.mime-type\"/>, um mehr zu erfahren.)" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1327 msgid "" "For every conflicted file, Subversion places three extra unversioned files " "in your working copy:" msgstr "" "Für jede Datei mit Konflikten stellt Subversion drei zusätzliche " "unversionierte Dateien in Ihre Arbeitskopie:" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1333 msgid "<filename>filename.mine</filename>" msgstr "<filename>filename.mine</filename>" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1335 msgid "" "This is your file as it existed in your working copy before you updated your " "working copy—that is, without conflict markers. This file has only " "your latest changes in it. (If Subversion considers the file to be " "unmergeable, the <filename>.mine</filename> file isn't created, since it " "would be identical to the working file.)" msgstr "" "Dies ist Ihre Datei aus der Arbeitskopie bevor Sie aktualisierten – d." "h. ohne Konfliktmarken. Diese Datei beinhaltet nur Ihre letzten Änderungen. " "(Falls Subversion diese Datei als nicht-zusammenführbar erachtet, wird die " "<filename>.mine</filename>-Datei nicht erstellt, da sie identisch mit der " "Datei der Arbeitskopie wäre.)" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1346 msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1349 msgid "" "This is the file that was the <literal>BASE</literal> revision before you " "updated your working copy. That is, the file that you checked out before " "you made your latest edits." msgstr "" "Dies ist die Datei, die die <literal>BASE</literal>-Revision war bevor Sie " "Ihre Arbeitskopie aktualisiert haben; also die Datei, die Sie ausgecheckt " "hatten, bevor Sie Ihre letzten Änderungen machten." # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:1358 msgid "<filename>filename.r<replaceable>NEWREV</replaceable> </filename>" msgstr "<filename>filename.r<replaceable>NEWREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1361 msgid "" "This is the file that your Subversion client just received from the server " "when you updated your working copy. This file corresponds to the " "<literal>HEAD</literal> revision of the repository." msgstr "" "Dies ist die Datei, die Ihr Subversion-Client soeben vom Server erhalten hat " "als Sie Ihre Arbeitskopie aktualisierten. Diese Datei entspricht der " "<literal>HEAD</literal>-Revision des Repositorys." # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1371 msgid "" "Here <replaceable>OLDREV</replaceable> is the revision number of the file in " "your <filename>.svn</filename> directory, and <replaceable>NEWREV</" "replaceable> is the revision number of the repository <literal>HEAD</" "literal>." msgstr "" "Hierbei ist <replaceable>OLDREV</replaceable> die Revisionsnummer der Datei " "in Ihrem Verzeichnis <filename>.svn</filename>, und <replaceable>NEWREV</" "replaceable> ist die Revisionsnummer von <literal>HEAD</literal> im " "Repository." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1379 msgid "" "For example, Sally makes changes to the file <filename>sandwich.txt</" "filename> in the repository. Harry has just changed the file in his working " "copy and checked it in. Sally updates her working copy before checking in " "and she gets a conflict, which she postpones:" msgstr "" "Beispielsweise ändert Sally die Datei <filename>sandwich.txt</filename> aus " "dem Repository. Harry hat gerade diese Datei in seiner Arbeitskopie geändert " "und eingecheckt. Sally aktualisiert Ihre Arbeitskopie vor dem einchecken und " "bekommt einen Konflikt, den sie verschiebt:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1385 #, no-wrap msgid "" "\n" "$ svn update\n" "Conflict discovered in 'sandwich.txt'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h)elp for more options : p\n" "C sandwich.txt\n" "Updated to revision 2.\n" "$ ls -1\n" "sandwich.txt\n" "sandwich.txt.mine\n" "sandwich.txt.r1\n" "sandwich.txt.r2\n" msgstr "" "\n" "$ svn update\n" "Conflict discovered in 'sandwich.txt'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h)elp for more options : p\n" "C sandwich.txt\n" "Updated to revision 2.\n" "$ ls -1\n" "sandwich.txt\n" "sandwich.txt.mine\n" "sandwich.txt.r1\n" "sandwich.txt.r2\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1399 msgid "" "At this point, Subversion will <emphasis>not</emphasis> allow Sally to " "commit the file <filename>sandwich.txt</filename> until the three temporary " "files are removed:" msgstr "" "An dieser Stelle erlaubt Subversion Sally <emphasis>nicht</emphasis>, die " "Datei <filename>sandwich.txt</filename> an das Repository zu übergeben, " "solange die drei temporären Dateien nicht entfernt werden:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1404 #, no-wrap msgid "" "\n" "$ svn commit -m \"Add a few more things\"\n" "svn: Commit failed (details follow):\n" "svn: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains in conflict\n" msgstr "" "\n" "$ svn commit -m \"Add a few more things\"\n" "svn: Commit failed (details follow):\n" "svn: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains in conflict\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1410 msgid "" "If you've postponed a conflict, you need to resolve the conflict before " "Subversion will allow you to commit your changes. You'll do this with the " "<command>svn resolve</command> command and one of several arguments to the " "<option>--accept</option> option." msgstr "" "Falls Sie eine Konfliktauflösung aufgeschoben haben, müssen Sie den Konflikt " "auflösen, bevor Ihnen Subversion erlaubt, Ihre Änderungen in das Repository " "einzustellen. Sie werden dafür den <command>svn resolve</command>-Befehl mit " "einem von mehreren Argumenten für die <option>--accept</option>-Option " "aufrufen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1416 msgid "" "If you want to choose the version of the file that you last checked out " "before making your edits, choose the <replaceable>base</replaceable> " "argument." msgstr "" "Falls Sie die Dateiversion vor Ihren Änderungen haben möchten, wählen Sie " "das <replaceable>base</replaceable>-Argument." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1420 msgid "" "If you want to choose the version that contains only your edits, choose the " "<replaceable>mine-full</replaceable> argument." msgstr "" "Falls Sie die Version möchten, die nur Ihre Änderungen enthält, wählen Sie " "das <replaceable>mine-full</replaceable>-Argument." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1424 msgid "" "If you want to choose the version that your most recent update pulled from " "the server (and thus discarding your edits entirely), choose the " "<replaceable>theirs-full</replaceable> argument." msgstr "" "Falls Sie die Version möchten, die Ihre letzte Aktualisierung vom Server " "gezogen hat (und somit Ihre Änderungen vollständig verwerfen wollen), wählen " "Sie das Argument <replaceable>theirs-full</replaceable>." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1429 msgid "" "However, if you want to pick and choose from your changes and the changes " "that your update fetched from the server, merge the conflicted text " "<quote>by hand</quote> (by examining and editing the conflict markers within " "the file) and then choose the <replaceable>working</replaceable> argument." msgstr "" "Wenn Sie jedoch frei aus Ihren Änderungen und den Änderungen vom Server " "wählen möchten, führen Sie den konfliktbehafteten Text <quote>händisch</" "quote> zusammen (indem Sie die Konfliktmarken in der Datei begutachten und " "editieren) und wählen das <replaceable>working</replaceable>-Argument." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1436 msgid "" "<command>svn resolve</command> removes the three temporary files and accepts " "the version of the file that you specified with the <option>--accept</" "option> option, and Subversion no longer considers the file to be in a state " "of conflict:" msgstr "" "<command>svn resolve</command> entfernt die drei temporären Dateien und " "akzeptiert die Version, die Sie mit der <option>--accept</option>-Option " "angeben. Subversion betrachtet die Datei nun als nicht mehr konfliktbehaftet:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1442 #, no-wrap msgid "" "\n" "$ svn resolve --accept working sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" msgstr "" "\n" "$ svn resolve --accept working sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1451 msgid "Merging conflicts by hand" msgstr "Manuelle Konfliktauflösung" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1453 msgid "" "Merging conflicts by hand can be quite intimidating the first time you " "attempt it, but with a little practice, it can become as easy as falling off " "a bike." msgstr "" "Das manuelle Auflösen von Konflikten kann ganz schön einschüchternd sein, " "wenn Sie es das erste Mal versuchen; jedoch kann es mit etwas Übung so " "leicht werden, wie vom Fahrrad zu fallen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1457 msgid "" "Here's an example. Due to a miscommunication, you and Sally, your " "collaborator, both edit the file <filename>sandwich.txt</filename> at the " "same time. Sally commits her changes, and when you go to update your " "working copy, you get a conflict and you're going to have to edit " "<filename>sandwich.txt</filename> to resolve the conflict. First, let's " "take a look at the file:" msgstr "" "Hier ist ein Beispiel. Aufgrund einer schlechten Absprache bearbeiten Sie " "und Ihre Mitarbeiterin Sally gleichzeitig die Datei <filename>sandwich.txt</" "filename>. Sally übergibt ihre Änderungen an das Repository, und sobald Sie " "versuchen, Ihre Arbeitskopie zu aktualisieren, erhalten Sie einen Konflikt " "und müssen <filename>sandwich.txt</filename> bearbeiten, um den Konflikt " "aufzulösen. Zunächst wollen wir uns die Datei einmal ansehen:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1465 #, no-wrap msgid "" "\n" "$ cat sandwich.txt\n" "Top piece of bread\n" "Mayonnaise\n" "Lettuce\n" "Tomato\n" "Provolone\n" "<<<<<<< .mine\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "=======\n" "Sauerkraut\n" "Grilled Chicken\n" ">>>>>>> .r2\n" "Creole Mustard\n" "Bottom piece of bread\n" msgstr "" "\n" "$ cat sandwich.txt\n" "Top piece of bread\n" "Mayonnaise\n" "Lettuce\n" "Tomato\n" "Provolone\n" "<<<<<<< .mine\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "=======\n" "Sauerkraut\n" "Grilled Chicken\n" ">>>>>>> .r2\n" "Creole Mustard\n" "Bottom piece of bread\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1484 msgid "" "The strings of less-than signs, equals signs, and greater-than signs are " "conflict markers and are not part of the actual data in conflict. You " "generally want to ensure that those are removed from the file before your " "next commit. The text between the first two sets of markers is composed of " "the changes you made in the conflicting area:" msgstr "" "Die Zeichenketten aus Kleiner-als-Zeichen, Gleichheitszeichen und Größer-als-" "Zeichen sind Konfliktmarken und gehören nicht zu den eigentlichen Daten, die " "in Konflikt stehen. Im Allgemeinen werden Sie sicherstellen wollen, dass die " "Konflikte aus der Datei entfernt werden, bevor sie das nächste Mal einen " "Commit durchführen. Der Text zwischen den ersten beiden Marken besteht aus " "den Änderungen, die Sie im Konfliktbereich vorgenommen haben:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1492 #, no-wrap msgid "" "\n" "<<<<<<< .mine\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "=======\n" msgstr "" "\n" "<<<<<<< .mine\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "=======\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1500 msgid "" "The text between the second and third sets of conflict markers is the text " "from Sally's commit:" msgstr "" "Der Text zwischen der zweiten und der dritten Marke ist der Text aus Sallys " "Commit:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1503 #, no-wrap msgid "" "\n" "=======\n" "Sauerkraut\n" "Grilled Chicken\n" ">>>>>>> .r2\n" msgstr "" "\n" "=======\n" "Sauerkraut\n" "Grilled Chicken\n" ">>>>>>> .r2\n" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch02-basic-usage.xml:1510 msgid "" "Usually you won't want to just delete the conflict markers and Sally's " "changes—she's going to be awfully surprised when the sandwich arrives " "and it's not what she wanted. This is where you pick up the phone or walk " "across the office and explain to Sally that you can't get sauerkraut from an " "Italian deli. <footnote>" msgstr "" "Für gewöhnlich werden Sie nicht einfach die Konfliktmarken mitsamt der " "Änderungen von Sally löschen wollen – sie wird furchtbar überrascht " "sein, wenn das Sandwich kommt und nicht das drauf ist, was sie wollte. Hier " "ist der Zeipunkt gekommen, zu dem Sie zum Telefon greifen oder durch das " "Büro gehen und Sally erklären, dass man in einem italienischen " "Delikatessenladen kein Sauerkraut bekommt. <footnote>" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch02-basic-usage.xml:1517 msgid "" "And if you ask them for it, they may very well ride you out of town on a " "rail." msgstr "" "Und wenn Sie danach fragen, wird man Sie wahrscheinlich auf einer Schiene " "aus der Stadt tragen." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1519 msgid "" "</footnote> Once you've agreed on the changes you will check in, edit your " "file and remove the conflict markers:" msgstr "" "</footnote> Sobald Sie sich über die einzucheckenden Änderungen einig sind, " "können Sie Ihre Datei bearbeiten und die Konfliktmarken entfernen:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1523 #, no-wrap msgid "" "\n" "Top piece of bread\n" "Mayonnaise\n" "Lettuce\n" "Tomato\n" "Provolone\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "Creole Mustard\n" "Bottom piece of bread\n" msgstr "" "\n" "Top piece of bread\n" "Mayonnaise\n" "Lettuce\n" "Tomato\n" "Provolone\n" "Salami\n" "Mortadella\n" "Prosciutto\n" "Creole Mustard\n" "Bottom piece of bread\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1536 msgid "" "Now use <command>svn resolve</command>, and you're ready to commit your " "changes:" msgstr "" "Verwenden Sie jetzt <command>svn resolve</command>, und Sie sind bereit, " "Ihre Änderungen an das repository zu übergeben:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1539 #, no-wrap msgid "" "\n" "$ svn resolve --accept working sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" "$ svn commit -m \"Go ahead and use my sandwich, discarding Sally's edits.\"\n" msgstr "" "\n" "$ svn resolve --accept working sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" "$ svn commit -m \"Go ahead and use my sandwich, discarding Sally's edits.\"\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1545 msgid "" "Note that <command>svn resolve</command>, unlike most of the other commands " "we deal with in this chapter, requires that you explicitly list any " "filenames that you wish to resolve. In any case, you want to be careful and " "use <command>svn resolve</command> only when you're certain that you've " "fixed the conflict in your file—once the temporary files are removed, " "Subversion will let you commit the file even if it still contains conflict " "markers." msgstr "" "Beachten Sie, dass <command>svn resolve</command>, anders als die meisten " "anderen Befehle, die wir in diesem Kapitel behandeln, erwartet, dass Sie " "ausdrücklich alle Dateien aufzählen, deren Konflikt Sie beseitigt haben. Auf " "alle Fälle sollten Sie sorgfältig vorgehen und <command>svn resolve</" "command> nur verwenden, falls Sie sicher sind, den Konflikt in Ihrer Datei " "beseitigt zu haben – sobald die temporären Dateien entfernt sind, " "lässt Subversion zu, dass Sie die Datei in das Repository stellen, selbst " "wenn sie noch Konfliktmarken enthält." # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1554 msgid "" "If you ever get confused while editing the conflicted file, you can always " "consult the three files that Subversion creates for you in your working " "copy—including your file as it was before you updated. You can even " "use a third-party interactive merging tool to examine those three files." msgstr "" "Falls Sie mal bei der Bearbeitung der konfliktbehafteten Datei verwirrt sein " "sollten, können Sie jederzeit in den drei Dateien nachsehen, die Subversion " "für Sie in der Arbeitskopie bereitstellt – dazu gehört auch Ihre Datei " "vor der Aktualisierung. Sie können sogar ein Merge-Tool eines Drittanbieters " "verwenden, um diese drei Dateien zu untersuchen." # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1565 msgid "Discarding your changes in favor of a newly fetched revision" msgstr "" "Verwerfen Ihrer Änderungen zugunsten einer aktualisierten Revision aus dem " "Repository" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1567 msgid "" "If you get a conflict and decide that you want to throw out your changes, " "you can run <userinput>svn resolve --accept theirs-full " "<replaceable>CONFLICTED-PATH</replaceable></userinput> and Subversion will " "discard your edits and remove the temporary files:" msgstr "" "Falls Sie einen Konflikt erhalten und entscheiden, dass Sie Ihre Änderungen " "verwerfen wollen, können Sie <userinput>svn resolve --accept theirs-full " "<replaceable>CONFLICTED-PATH</replaceable></userinput> aufrufen, und " "Subversion wird Ihre Änderungen ignorieren und die temporären Dateien " "entfernen:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1572 #, no-wrap msgid "" "\n" "$ svn update\n" "Conflict discovered in 'sandwich.txt'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options: p\n" "C sandwich.txt\n" "Updated to revision 2.\n" "$ ls sandwich.*\n" "sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1\n" "$ svn resolve --accept theirs-full sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" msgstr "" "\n" "$ svn update\n" "Conflict discovered in 'sandwich.txt'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options: p\n" "C sandwich.txt\n" "Updated to revision 2.\n" "$ ls sandwich.*\n" "sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1\n" "$ svn resolve --accept theirs-full sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1589 msgid "Punting: Using svn revert" msgstr "Die Verwendung von svn revert" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1591 msgid "" "If you decide that you want to throw out your changes and start your edits " "again (whether this occurs after a conflict or anytime), just revert your " "changes:" msgstr "" "Falls Sie sich entscheiden, Ihre Änderungen zu verwerfen und erneut mit der " "Bearbeitung zu beginnen (ob nach einem Konflikt oder sonst zu jeder Zeit), " "machen Sie einfach Ihre Änderungen rückgängig:" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1595 #, no-wrap msgid "" "\n" "$ svn revert sandwich.txt\n" "Reverted 'sandwich.txt'\n" "$ ls sandwich.*\n" "sandwich.txt\n" msgstr "" "\n" "$ svn revert sandwich.txt\n" "Reverted 'sandwich.txt'\n" "$ ls sandwich.*\n" "sandwich.txt\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1602 msgid "" "Note that when you revert a conflicted file, you don't have to use " "<command>svn resolve</command>." msgstr "" "Beachten Sie, dass Sie beim Rückgängigmachen einer konfliktbehafteten Datei " "nicht <command>svn resolve</command> zu verwenden brauchen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:1611 msgid "Commit Your Changes" msgstr "Übergeben Ihrer Änderungen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1613 msgid "" "Finally! Your edits are finished, you've merged all changes from the server, " "and you're ready to commit your changes to the repository." msgstr "" "Endlich! Sie haben die Bearbeitung abgeschlossen, Sie haben alle Änderungen " "vom Server eingearbeitet, und Sie sind bereit, Ihre Änderungen an das " "Repository zu übergeben." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1617 msgid "" "The <command>svn commit</command> command sends all of your changes to the " "repository. When you commit a change, you need to supply a <firstterm>log " "message</firstterm> describing your change. Your log message will be " "attached to the new revision you create. If your log message is brief, you " "may wish to supply it on the command line using the <option>--message</" "option> (or <option>-m</option>) option:" msgstr "" "Der Befehl <command>svn commit</command> schickt all Ihre Änderungen zum " "Repository. Wenn Sie eine Änderung übergeben, müssen Sie einen " "<firstterm>Protokolleintrag</firstterm> erstellen, der die Änderung " "beschreibt. Dieser Eintrag wird mit der von Ihnen erzeugten neuen Revision " "verknüpft. Wenn Ihr Eintrag kurz ist, können Sie ihn mit der Option " "<option>--message</option> (oder <option>-m</option>) in der Kommandozeile " "angeben:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1626 #, no-wrap msgid "" "\n" "$ svn commit -m \"Corrected number of cheese slices.\"\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 3.\n" msgstr "" "\n" "$ svn commit -m \"Corrected number of cheese slices.\"\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 3.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1633 msgid "" "However, if you've been composing your log message as you work, you may want " "to tell Subversion to get the message from a file by passing the filename " "with the <option>--file</option> (<option>-F</option>) option:" msgstr "" "Falls Sie jedoch Ihren Protokolleintrag während der Arbeit erstellen " "möchten, können Sie Subversion mitteilen, sich den Eintrag aus einer Datei " "zu holen, indem Sie den Dateinamen mit der Option <option>--file</option> " "(<option>-F</option>) angeben:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1638 #, no-wrap msgid "" "\n" "$ svn commit -F logmsg\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 4.\n" msgstr "" "\n" "$ svn commit -F logmsg\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 4.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1645 msgid "" "If you fail to specify either the <option>--message</option> or <option>--" "file</option> option, Subversion will automatically launch your favorite " "editor (see the information on <literal>editor-cmd</literal> in <xref " "linkend=\"svn.advanced.confarea.opts.config\"/>) for composing a log message." msgstr "" "Sollten Sie vergessen, entweder die Option <option>--message</option> oder " "die <option>--file</option>-Option anzugeben, startet Subversion automatisch " "Ihren Lieblingseditor (siehe die Information zu <literal>editor-cmd</" "literal> in <xref linkend=\"svn.advanced.confarea.opts.config\"/>), damit " "Sie einen Protokolleintrag erstellen können." # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch02-basic-usage.xml:1653 msgid "" "If you're in your editor writing a commit message and decide that you want " "to cancel your commit, you can just quit your editor without saving " "changes. If you've already saved your commit message, simply delete the " "text, save again, and then abort:" msgstr "" "Wenn Sie gerade in Ihrem Editor einen Eintrag schreiben und sich " "entschließen, die Übergabe abzubrechen, können Sie einfach Ihren Editor " "beenden, ohne die Änderungen zu sichern. Falls Sie den Eintrag bereits " "gesichert haben sollten, löschen Sie einfach den Text, sichern Sie erneut " "und brechen dann ab:" # type: Content of: <chapter><sect1><sect2><tip><screen> #: ../en/book/ch02-basic-usage.xml:1659 #, no-wrap msgid "" "\n" "$ svn commit\n" "Waiting for Emacs...Done\n" "\n" "Log message unchanged or not specified\n" "(a)bort, (c)ontinue, (e)dit\n" "a\n" "$\n" msgstr "" "\n" "$ svn commit\n" "Waiting for Emacs...Done\n" "\n" "Log message unchanged or not specified\n" "(a)bort, (c)ontinue, (e)dit\n" "a\n" "$\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1670 msgid "" "The repository doesn't know or care whether your changes make any sense as a " "whole; it checks only to make sure nobody else has changed any of the same " "files that you did when you weren't looking. If somebody <emphasis>has</" "emphasis> done that, the entire commit will fail with a message informing " "you that one or more of your files are out of date:" msgstr "" "Das Repository weiß nicht, ob Ihre Änderung im Ganzen einen Sinn ergeben, es " "ist ihm auch egal; es überprüft lediglich, ob nicht irgendjemand anderes " "irgendeine derselben Dateien geändert hat wie Sie, als Sie mal weggeschaut " "haben. Falls jemand das gemacht <emphasis>hat</emphasis>, wird die gesamte " "Übergabe mit einer Meldung fehlschlagen, dass eine oder mehrere Ihrer " "Dateien nicht mehr aktuell sind:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1677 #, no-wrap msgid "" "\n" "$ svn commit -m \"Add another rule\"\n" "Sending rules.txt\n" "svn: Commit failed (details follow):\n" "svn: File '/sandwich.txt' is out of date\n" "…\n" msgstr "" "\n" "$ svn commit -m \"Add another rule\"\n" "Sending rules.txt\n" "svn: Commit failed (details follow):\n" "svn: File '/sandwich.txt' is out of date\n" "…\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1685 msgid "" "(The exact wording of this error message depends on the network protocol and " "server you're using, but the idea is the same in all cases.)" msgstr "" "(Der genaue Wortlaut dieser Fehlermeldung hängt vom verwendeten " "Netzwerkprotokoll und vom Server ab, doch die Bedeutung ist in allen Fällen " "gleich.)" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1689 msgid "" "At this point, you need to run <userinput>svn update</userinput>, deal with " "any merges or conflicts that result, and attempt your commit again." msgstr "" "Zu diesem Zeitpunkt müssen Sie <userinput>svn update</userinput> aufrufen, " "sich um eventuelle Zusammenführungen oder Konflikte kümmern und die Übergabe " "erneut versuchen." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1693 msgid "" "That covers the basic work cycle for using Subversion. Subversion offerse " "many other features that you can use to manage your repository and working " "copy, but most of your day-to-day use of Subversion will involve only the " "commands that we've discussed so far in this chapter. We will, however, " "cover a few more commands that you'll use fairly often." msgstr "" "Das deckt den grundlegenden Arbeitszyklus für die Verwendung von Subversion " "ab. Subversion bietet viele andere Möglichkeiten, die Sie benutzen können, " "um Ihr Repository und Ihre Arbeitskopie zu verwalten, doch der größte Teil " "Ihrer täglichen Arbeit mit Subversion wird lediglich die in diesem Kapitel " "behandelten Befehle berühren. Wir werden jedoch noch ein paar mehr Befehle " "behandeln, die Sie ziemlich oft verwenden werden." # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:1709 msgid "Examining History" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:1711 msgid "" "Your Subversion repository is like a time machine. It keeps a record of " "every change ever committed and allows you to explore this history by " "examining previous versions of files and directories as well as the metadata " "that accompanies them. With a single Subversion command, you can check out " "the repository (or restore an existing working copy) exactly as it was at " "any date or revision number in the past. However, sometimes you just want " "to <emphasis>peer into</emphasis> the past instead of <emphasis>going into</" "emphasis> it." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:1721 msgid "" "Several commands can provide you with historical data from the repository:" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1727 #, fuzzy #| msgid "<command>svn copy</command>" msgid "<command>svn log</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1729 msgid "" "Shows you broad information: log messages with date and author information " "attached to revisions and which paths changed in each revision" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1738 msgid "Shows line-level details of a particular change" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1743 #, fuzzy #| msgid "<command>svn add</command>" msgid "<command>svn cat</command>" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1745 msgid "" "Retrieves a file as it existed in a particular revision number and displays " "it on your screen" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1751 #, fuzzy #| msgid "<command>svn delete</command>" msgid "<command>svn list</command>" msgstr "<command>svn delete</command>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch02-basic-usage.xml:1753 msgid "Displays the files in a directory for any given revision" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:1763 msgid "Generating a List of Historical Changes" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1765 msgid "" "To find information about the history of a file or directory, use the " "<command>svn log</command> command. <command>svn log</command> will provide " "you with a record of who made changes to a file or directory, at what " "revision it changed, the time and date of that revision, and—if it was " "provided—the log message that accompanied the commit:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1773 #, no-wrap msgid "" "\n" "$ svn log\n" "------------------------------------------------------------------------\n" "r3 | sally | 2008-05-15 23:09:28 -0500 (Thu, 15 May 2008) | 1 line\n" "\n" "Added include lines and corrected # of cheese slices.\n" "------------------------------------------------------------------------\n" "r2 | harry | 2008-05-14 18:43:15 -0500 (Wed, 14 May 2008) | 1 line\n" "\n" "Added main() methods.\n" "------------------------------------------------------------------------\n" "r1 | sally | 2008-05-10 19:50:31 -0500 (Sat, 10 May 2008) | 1 line\n" "\n" "Initial import\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1790 msgid "" "Note that the log messages are printed in <emphasis>reverse chronological " "order</emphasis> by default. If you wish to see a different range of " "revisions in a particular order or just a single revision, pass the " "<option>--revision</option> (<option>-r</option>) option:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1797 #, no-wrap msgid "" "\n" "$ svn log -r 5:19 # shows logs 5 through 19 in chronological order\n" "\n" "$ svn log -r 19:5 # shows logs 5 through 19 in reverse order\n" "\n" "$ svn log -r 8 # shows log for revision 8\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1805 msgid "" "You can also examine the log history of a single file or directory. For " "example:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1808 #, no-wrap msgid "" "\n" "$ svn log foo.c\n" "…\n" "$ svn log http://foo.com/svn/trunk/code/foo.c\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1815 msgid "" "These will display log messages <emphasis>only</emphasis> for those " "revisions in which the working file (or URL) changed." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch02-basic-usage.xml:1821 msgid "Why Does svn log Not Show Me What I Just Committed?" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:1824 msgid "" "If you make a commit and immediately type <userinput>svn log</userinput> " "with no arguments, you may notice that your most recent commit doesn't show " "up in the list of log messages. This is due to a combination of the " "behavior of <command>svn commit</command> and the default behavior of " "<command>svn log</command>. First, when you commit changes to the " "repository, <command>svn</command> bumps only the revision of files (and " "directories) that it commits, so usually the parent directory remains at the " "older revision (See <xref linkend=\"svn.basic.in-action.mixedrevs.update-" "commit\"/> for an explanation of why). <command>svn log</command> then " "defaults to fetching the history of the directory at its current revision, " "and thus you don't see the newly committed changes. The solution here is to " "either update your working copy or explicitly provide a revision number to " "<command>svn log</command> by using the <option>--revision</option> " "(<option>-r</option>) option." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1845 msgid "" "If you want even more information about a file or directory, <command>svn " "log</command> also takes a <option>--verbose</option> (<option>-v</option>) " "option. Because Subversion allows you to move and copy files and " "directories, it is important to be able to track path changes in the " "filesystem. So, in verbose mode, <command>svn log</command> will include a " "list of changed paths in a revision in its output:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:1854 #, no-wrap msgid "" "\n" "$ svn log -r 8 -v\n" "------------------------------------------------------------------------\n" "r8 | sally | 2008-05-21 13:19:25 -0500 (Wed, 21 May 2008) | 1 line\n" "Changed paths:\n" " M /trunk/code/foo.c\n" " M /trunk/code/bar.h\n" " A /trunk/code/doc/README\n" "\n" "Frozzled the sub-space winch.\n" "\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1869 #, fuzzy #| msgid "" #| "<command>svn status</command> also has a <option>--verbose</option> " #| "(<option>-v</option>) option, which will show you the status of " #| "<emphasis>every</emphasis> item in your working copy, even if it has not " #| "been changed:" msgid "" "<command>svn log</command> also takes a <option>--quiet</option> (<option>-" "q</option>) option, which suppresses the body of the log message. When " "combined with <option>--verbose</option>, it gives just the names of the " "changed files." msgstr "" "<command>svn status</command> hat auch eine <option>--verbose</option>-" "Option (<option>-v</option>), die Ihnen den Zustand <emphasis>jedes</" "emphasis> Objektes in der Arbeitskopie anzeigt, selbst wenn es sich nicht " "geändert hat:" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch02-basic-usage.xml:1875 msgid "Why Does svn log Give Me an Empty Response?" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:1878 msgid "" "After working with Subversion for a bit, most users will come across " "something like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch02-basic-usage.xml:1881 #, no-wrap msgid "" "\n" "$ svn log -r 2\n" "------------------------------------------------------------------------\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch02-basic-usage.xml:1887 msgid "" "At first glance, this seems like an error. But recall that while revisions " "are repository-wide, <command>svn log</command> operates on a path in the " "repository. If you supply no path, Subversion uses the current working " "directory as the default target. As a result, if you're operating in a " "subdirectory of your working copy and attempt to see the log of a revision " "in which neither that directory nor any of its children was changed, " "Subversion will show you an empty log. If you want to see what changed in " "that revision, try pointing <command>svn log</command> directly at the " "topmost URL of your repository, as in <userinput>svn log -r 2 http://svn." "collab.net/repos/svn</userinput>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1906 #, fuzzy #| msgid "Examine the details of your local modifications" msgid "Examining the Details of Historical Changes" msgstr "Untersuchen Sie die Details Ihrer lokalen Änderungen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1908 msgid "" "We've already seen <command>svn diff</command> before—it displays file " "differences in unified diff format; we used it to show the local " "modifications made to our working copy before committing to the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:1913 msgid "" "In fact, it turns out that there are <emphasis>three</emphasis> distinct " "uses of <command>svn diff</command>:" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1920 ../en/book/ch02-basic-usage.xml:1935 #, fuzzy #| msgid "Examine your changes." msgid "Examining local changes" msgstr "Untersuchen Sie Ihre Änderungen." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:1924 #, fuzzy #| msgid "How Working Copies Track the Repository" msgid "Comparing your working copy to the repository" msgstr "Wie Arbeitskopien das Repository verfolgen" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch02-basic-usage.xml:1928 msgid "Comparing one repository to another" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1937 msgid "" "As we've seen, invoking <userinput>svn diff</userinput> with no options will " "compare your working files to the cached <quote>pristine</quote> copies in " "the <filename>.svn</filename> area:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1942 #, no-wrap msgid "" "\n" "$ svn diff\n" "Index: rules.txt\n" "===================================================================\n" "--- rules.txt\t(revision 3)\n" "+++ rules.txt\t(working copy)\n" "@@ -1,4 +1,5 @@\n" " Be kind to others\n" " Freedom = Responsibility\n" " Everything in moderation\n" "-Chew with your mouth open\n" "+Chew with your mouth closed\n" "+Listen when others are speaking\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:1962 #, fuzzy #| msgid "How Working Copies Track the Repository" msgid "Comparing working copy to repository" msgstr "Wie Arbeitskopien das Repository verfolgen" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1964 msgid "" "If a single <option>--revision</option> (<option>-r</option>) number is " "passed, your working copy is compared to the specified revision in the " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1969 #, no-wrap msgid "" "\n" "$ svn diff -r 3 rules.txt\n" "Index: rules.txt\n" "===================================================================\n" "--- rules.txt\t(revision 3)\n" "+++ rules.txt\t(working copy)\n" "@@ -1,4 +1,5 @@\n" " Be kind to others\n" " Freedom = Responsibility\n" " Everything in moderation\n" "-Chew with your mouth open\n" "+Chew with your mouth closed\n" "+Listen when others are speaking\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch02-basic-usage.xml:1989 msgid "Comparing repository to repository" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:1991 msgid "" "If two revision numbers, separated by a colon, are passed via <option>--" "revision</option> (<option>-r</option>), the two revisions are directly " "compared:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:1996 #, no-wrap msgid "" "\n" "$ svn diff -r 2:3 rules.txt\n" "Index: rules.txt\n" "===================================================================\n" "--- rules.txt\t(revision 2)\n" "+++ rules.txt\t(revision 3)\n" "@@ -1,4 +1,4 @@\n" " Be kind to others\n" "-Freedom = Chocolate Ice Cream\n" "+Freedom = Responsibility\n" " Everything in moderation\n" " Chew with your mouth open\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2011 msgid "" "A more convenient way of comparing one revision to the previous revision is " "to use the <option>--change</option> (<option>-c</option>) option:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:2015 #, no-wrap msgid "" "\n" "$ svn diff -c 3 rules.txt\n" "Index: rules.txt\n" "===================================================================\n" "--- rules.txt\t(revision 2)\n" "+++ rules.txt\t(revision 3)\n" "@@ -1,4 +1,4 @@\n" " Be kind to others\n" "-Freedom = Chocolate Ice Cream\n" "+Freedom = Responsibility\n" " Everything in moderation\n" " Chew with your mouth open\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2030 msgid "" "Lastly, you can compare repository revisions even when you don't have a " "working copy on your local machine, just by including the appropriate URL on " "the command line:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:2034 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.example.com:9834/repos\n" #| "…\n" msgid "" "\n" "$ svn diff -c 5 http://svn.example.com/repos/example/trunk/text/rules.txt\n" "…\n" "$\n" msgstr "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:2046 #, fuzzy #| msgid "The Repository" msgid "Browsing the Repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2048 msgid "" "Using <command>svn cat</command> and <command>svn list</command>, you can " "view various revisions of files and directories without changing the working " "revision of your working copy. In fact, you don't even need a working copy " "to use either one." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch02-basic-usage.xml:2056 ../en/book/ch09-reference.xml:967 #, fuzzy #| msgid "svn" msgid "svn cat" msgstr "svn" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2059 msgid "" "If you want to examine an earlier version of a file and not necessarily the " "differences between two files, you can use <command>svn cat</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:2063 #, no-wrap msgid "" "\n" "$ svn cat -r 2 rules.txt\n" "Be kind to others\n" "Freedom = Chocolate Ice Cream\n" "Everything in moderation\n" "Chew with your mouth open\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2072 msgid "You can also redirect the output directly into a file:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:2075 #, no-wrap msgid "" "\n" "$ svn cat -r 2 rules.txt > rules.txt.v2\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:2084 ../en/book/ch09-reference.xml:2607 #, fuzzy #| msgid "svn import" msgid "svn list" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2086 msgid "" "The <command>svn list</command> command shows you what files are in a " "repository directory without actually downloading the files to your local " "machine:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:2090 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn list file:///var/svn/repos\n" #| "/trunk\n" #| "/branches\n" #| "/tags\n" msgid "" "\n" "$ svn list http://svn.collab.net/repos/svn\n" "README\n" "branches/\n" "clients/\n" "tags/\n" "trunk/\n" msgstr "" "\n" "$ svn list file:///var/svn/repos\n" "/trunk\n" "/branches\n" "/tags\n" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2099 msgid "" "If you want a more detailed listing, pass the <option>--verbose</option> " "(<option>-v</option>) flag to get output like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch02-basic-usage.xml:2103 #, no-wrap msgid "" "\n" "$ svn list -v http://svn.collab.net/repos/svn\n" " 20620 harry 1084 Jul 13 2006 README\n" " 23339 harry Feb 04 01:40 branches/\n" " 21282 sally Aug 27 09:41 developer-resources/\n" " 23198 harry Jan 23 17:17 tags/\n" " 23351 sally Feb 05 13:26 trunk/\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch02-basic-usage.xml:2112 msgid "" "The columns tell you the revision at which the file or directory was last " "modified, the user who modified it, the size if it is a file, the date it " "was last modified, and the item's name." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><warning><para> #: ../en/book/ch02-basic-usage.xml:2118 msgid "" "The <userinput>svn list</userinput> command with no arguments defaults to " "the <emphasis>repository URL</emphasis> of the current working directory, " "<emphasis>not</emphasis> the local working copy directory. After all, if " "you want a listing of your local directory, you could use just plain " "<command>ls</command> (or any reasonable non-Unixy equivalent)." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:2133 #, fuzzy #| msgid "Recommended Repository Layout" msgid "Fetching Older Repository Snapshots" msgstr "Empfohlene Repository Aufteilung" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch02-basic-usage.xml:2135 msgid "" "In addition to all of the previous commands, you can use <command>svn " "update</command> and <command>svn checkout</command> with the <option>--" "revision</option> option to take an entire working copy <quote>back in time</" "quote>: <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch02-basic-usage.xml:2140 msgid "See? We told you that Subversion was a time machine." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:2144 #, no-wrap msgid "" "\n" "$ svn checkout -r 1729 # Checks out a new working copy at r1729\n" "…\n" "$ svn update -r 1729 # Updates an existing working copy to r1729\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch02-basic-usage.xml:2152 msgid "" "Many Subversion newcomers attempt to use the preceding <command>svn update</" "command> example to <quote>undo</quote> committed changes, but this won't " "work as you can't commit changes that you obtain from backdating a working " "copy if the changed files have newer revisions. See <xref linkend=\"svn." "branchmerge.basicmerging.resurrect\"/> for a description of how to " "<quote>undo</quote> a commit." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2161 msgid "" "Lastly, if you're building a release and wish to bundle up your files from " "Subversion but don't want those pesky <filename>.svn</filename> directories " "in the way, you can use <command>svn export</command> to create a local copy " "of all or part of your repository sans <filename>.svn</filename> " "directories. As with <command>svn update</command> and <command>svn " "checkout</command>, you can also pass the <option>--revision</option> option " "to <command>svn export</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:2172 #, no-wrap msgid "" "\n" "$ svn export http://svn.example.com/svn/repos1 # Exports latest revision\n" "…\n" "$ svn export http://svn.example.com/svn/repos1 -r 1729\n" "# Exports revision r1729\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch02-basic-usage.xml:2189 msgid "Sometimes You Just Need to Clean Up" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:2191 msgid "" "Now that we've covered the day-to-day tasks that you'll frequently use " "Subversion for, we'll review a few administrative tasks relating to your " "working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:2198 #, fuzzy #| msgid "Update Your Working Copy" msgid "Disposing of a Working Copy" msgstr "Aktualisieren Sie Ihre Arbeitskopie" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2200 msgid "" "Subversion doesn't track either the state or the existence of working copies " "on the server, so there's no server overhead to keeping working copies " "around. Likewise, there's no need to let the server know that you're going " "to delete a working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2206 msgid "" "If you're likely to use a working copy again, there's nothing wrong with " "just leaving it on disk until you're ready to use it again, at which point " "all it takes is an <command>svn update</command> to bring it up to date and " "ready for use." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2212 msgid "" "However, if you're definitely not going to use a working copy again, you can " "safely delete the entire thing, but you'd be well served to take a look " "through the working copy for unversioned files. To find these files, run " "<userinput>svn status</userinput> and review any files that are prefixed " "with a <literal>?</literal> to make certain that they're not of importance. " "After you're done reviewing, you can safely delete your working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch02-basic-usage.xml:2225 msgid "Recovering from an Interruption" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2227 msgid "" "When Subversion modifies your working copy (or any information within " "<filename>.svn</filename>), it tries to do so as safely as possible. Before " "changing the working copy, Subversion writes its intentions to a logfile. " "Next, it executes the commands in the logfile to apply the requested change, " "holding a lock on the relevant part of the working copy while it works—" "to prevent other Subversion clients from accessing the working copy mid-" "change. Finally, Subversion removes the logfile. Architecturally, this is " "similar to a journaled filesystem. If a Subversion operation is interrupted " "(e.g, if the process is killed or if the machine crashes), the logfiles " "remain on disk. By reexecuting the logfiles, Subversion can complete the " "previously started operation, and your working copy can get itself back into " "a consistent state." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2243 msgid "" "And this is exactly what <command>svn cleanup</command> does: it searches " "your working copy and runs any leftover logs, removing working copy locks in " "the process. If Subversion ever tells you that some part of your working " "copy is <quote>locked,</quote> this is the command that you should run. " "Also, <command>svn status</command> will display an <literal>L</literal> " "next to locked items:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch02-basic-usage.xml:2251 #, no-wrap msgid "" "\n" "$ svn status\n" " L somedir\n" "M somedir/foo.c\n" "\n" "$ svn cleanup\n" "$ svn status\n" "M somedir/foo.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch02-basic-usage.xml:2261 msgid "" "Don't confuse these working copy locks with the ordinary locks that " "Subversion users create when using the lock-modify-unlock model of " "concurrent version control; see the sidebar <xref linkend=\"svn.advanced." "locking.meanings\"/> for clarification." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch02-basic-usage.xml:2278 msgid "" "Now we've covered most of the Subversion client commands. Notable " "exceptions are those dealing with branching and merging (see <xref linkend=" "\"svn.branchmerge\"/>) and properties (see <xref linkend=\"svn.advanced.props" "\"/>). However, you may want to take a moment to skim through <xref linkend=" "\"svn.ref\"/> to get an idea of all the different commands that Subversion " "has—and how you can use them to make your work easier." msgstr "" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch03-advanced-topics.xml:2 #, fuzzy #| msgid "Advanced users" msgid "Advanced Topics" msgstr "Fortgeschrittene" # type: Content of: <chapter><para> #: ../en/book/ch03-advanced-topics.xml:4 msgid "" "If you've been reading this book chapter by chapter, from start to finish, " "you should by now have acquired enough knowledge to use the Subversion " "client to perform the most common version control operations. You " "understand how to check out a working copy from a Subversion repository. " "You are comfortable with submitting and receiving changes using the " "<command>svn commit</command> and <command>svn update</command> operations. " "You've probably even developed a reflex that causes you to run the " "<command>svn status</command> command almost unconsciously. For all intents " "and purposes, you are ready to use Subversion in a typical environment." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch03-advanced-topics.xml:16 msgid "" "But the Subversion feature set doesn't stop at <quote>common version control " "operations.</quote> It has other bits of functionality besides just " "communicating file and directory changes to and from a central repository." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch03-advanced-topics.xml:21 msgid "" "This chapter highlights some of Subversion's features that, while important, " "aren't part of the typical user's daily routine. It assumes that you are " "familiar with Subversion's basic file and directory versioning " "capabilities. If you aren't, you'll want to first read <xref linkend=\"svn." "basic\" /> and <xref linkend=\"svn.tour\" />. Once you've mastered those " "basics and consumed this chapter, you'll be a Subversion power user!" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:34 #, fuzzy #| msgid "Revisions" msgid "Revision Specifiers" msgstr "Revisionen" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:36 msgid "" "As we described in <xref linkend=\"svn.basic.in-action.revs\" />, revision " "numbers in Subversion are pretty straightforward—integers that keep " "getting larger as you commit more changes to your versioned data. Still, it " "doesn't take long before you can no longer remember exactly what happened in " "each and every revision. Fortunately, the typical Subversion workflow " "doesn't often demand that you supply arbitrary revisions to the Subversion " "operations you perform. For operations that <emphasis>do</emphasis> require " "a revision specifier, you generally supply a revision number that you saw in " "a commit email, in the output of some other Subversion operation, or in some " "other context that would give meaning to that particular number." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:50 msgid "" "But occasionally, you need to pinpoint a moment in time for which you don't " "already have a revision number memorized or handy. So besides the integer " "revision numbers, <command>svn</command> allows as input some additional " "forms of revision specifiers: <firstterm>revision keywords</firstterm> and " "revision dates." msgstr "" # type: Content of: <chapter><sect1><note><para> #: ../en/book/ch03-advanced-topics.xml:58 msgid "" "The various forms of Subversion revision specifiers can be mixed and matched " "when used to specify revision ranges. For example, you can use <option>-r " "<replaceable>REV1</replaceable>:<replaceable>REV2</replaceable></option> " "where <replaceable>REV1</replaceable> is a revision keyword and " "<replaceable>REV2</replaceable> is a revision number, or where " "<replaceable>REV1</replaceable> is a date and <replaceable>REV2</" "replaceable> is a revision keyword, and so on. The individual revision " "specifiers are independently evaluated, so you can put whatever you want on " "the opposite sides of that colon." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:73 #, fuzzy #| msgid "Revisions" msgid "Revision Keywords" msgstr "Revisionen" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:76 #: ../en/book/ch03-advanced-topics.xml:183 #, fuzzy #| msgid "Revisions" msgid "revisions" msgstr "Revisionen" # type: Content of: <preface><sect1><sect2><para><indexterm> #: ../en/book/ch03-advanced-topics.xml:78 #: ../en/book/ch03-advanced-topics.xml:81 #: ../en/book/ch03-advanced-topics.xml:84 #: ../en/book/ch03-advanced-topics.xml:87 #, fuzzy #| msgid "<indexterm>" msgid "</indexterm> <indexterm>" msgstr "<indexterm>" # type: Content of: <chapter><sect1><sect2><indexterm><primary> #: ../en/book/ch03-advanced-topics.xml:80 msgid "HEAD" msgstr "" # type: Content of: <chapter><sect1><sect2><indexterm><primary> #: ../en/book/ch03-advanced-topics.xml:83 msgid "BASE" msgstr "" # type: Content of: <chapter><sect1><sect2><indexterm><primary> #: ../en/book/ch03-advanced-topics.xml:86 msgid "COMMITTED" msgstr "" # type: Content of: <chapter><sect1><sect2><indexterm><primary> #: ../en/book/ch03-advanced-topics.xml:89 msgid "PREV" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:92 msgid "" "The Subversion client understands a number of revision keywords. These " "keywords can be used instead of integer arguments to the <option>--revision</" "option> (<option>-r</option>) option, and are resolved into specific " "revision numbers by Subversion:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:101 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>HEAD</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:103 msgid "The latest (or <quote>youngest</quote>) revision in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:109 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>BASE</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:111 msgid "" "The revision number of an item in a working copy. If the item has been " "locally modified, this refers to the way the item appears without those " "local modifications." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:119 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>COMMITTED</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:121 msgid "" "The most recent revision prior to, or equal to, <literal>BASE</literal>, in " "which an item changed." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:127 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>PREV</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:129 msgid "" "The revision immediately <emphasis>before</emphasis> the last revision in " "which an item changed. Technically, this boils down to <literal>COMMITTED</" "literal>−1." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:138 msgid "" "As can be derived from their descriptions, the <literal>PREV</literal>, " "<literal>BASE</literal>, and <literal>COMMITTED</literal> revision keywords " "are used only when referring to a working copy path—they don't apply " "to repository URLs. <literal>HEAD</literal>, on the other hand, can be used " "in conjunction with both of these path types." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:146 msgid "Here are some examples of revision keywords in action:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:149 #, no-wrap msgid "" "\n" "$ svn diff -r PREV:COMMITTED foo.c\n" "# shows the last change committed to foo.c\n" "\n" "$ svn log -r HEAD\n" "# shows log message for the latest repository commit\n" "\n" "$ svn diff -r HEAD\n" "# compares your working copy (with all of its local changes) to the\n" "# latest version of that tree in the repository\n" "\n" "$ svn diff -r BASE:HEAD foo.c\n" "# compares the unmodified version of foo.c with the latest version of\n" "# foo.c in the repository\n" "\n" "$ svn log -r BASE:HEAD\n" "# shows all commit logs for the current versioned directory since you\n" "# last updated\n" "\n" "$ svn update -r PREV foo.c\n" "# rewinds the last change on foo.c, decreasing foo.c's working revision\n" "\n" "$ svn diff -r BASE:14 foo.c\n" "# compares the unmodified version of foo.c with the way foo.c looked\n" "# in revision 14\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:180 #, fuzzy #| msgid "Revisions" msgid "Revision Dates" msgstr "Revisionen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:187 msgid "" "Revision numbers reveal nothing about the world outside the version control " "system, but sometimes you need to correlate a moment in real time with a " "moment in version history. To facilitate this, the <option>--revision</" "option> (<option>-r</option>) option can also accept as input date " "specifiers wrapped in curly braces (<literal>{</literal> and <literal>}</" "literal>). Subversion accepts the standard ISO-8601 date and time formats, " "plus a few others. Here are some examples. (Remember to use quotes around " "any date that contains spaces.)" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:198 #, no-wrap msgid "" "\n" "$ svn checkout -r {2006-02-17}\n" "$ svn checkout -r {15:30}\n" "$ svn checkout -r {15:30:00.200000}\n" "$ svn checkout -r {\"2006-02-17 15:30\"}\n" "$ svn checkout -r {\"2006-02-17 15:30 +0230\"}\n" "$ svn checkout -r {2006-02-17T15:30}\n" "$ svn checkout -r {2006-02-17T15:30Z}\n" "$ svn checkout -r {2006-02-17T15:30-04:00}\n" "$ svn checkout -r {20060217T1530}\n" "$ svn checkout -r {20060217T1530Z}\n" "$ svn checkout -r {20060217T1530-0500}\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:213 msgid "" "When you specify a date, Subversion resolves that date to the most recent " "revision of the repository as of that date, and then continues to operate " "against that resolved revision number:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:218 #, no-wrap msgid "" "\n" "$ svn log -r {2006-11-28}\n" "------------------------------------------------------------------------\n" "r12 | ira | 2006-11-27 12:31:51 -0600 (Mon, 27 Nov 2006) | 6 lines\n" "…\n" msgstr "" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:226 #, fuzzy #| msgid "Is Subversion the Right Tool?" msgid "Is Subversion a Day Early?" msgstr "Ist Subversion das richtige Werkzeug?" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:228 msgid "" "If you specify a single date as a revision without specifying a time of day " "(for example <literal>2006-11-27</literal>), you may think that Subversion " "should give you the last revision that took place on the 27th of November. " "Instead, you'll get back a revision from the 26th, or even earlier. " "Remember that Subversion will find the <emphasis>most recent revision of the " "repository</emphasis> as of the date you give. If you give a date without a " "timestamp, such as <literal>2006-11-27</literal>, Subversion assumes a time " "of 00:00:00, so looking for the most recent revision won't return anything " "on the 27th." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:241 msgid "" "If you want to include the 27th in your search, you can either specify the " "27th with the time (<literal>{\"2006-11-27 23:59\"}</literal>), or just " "specify the next day (<literal>{2006-11-28}</literal>)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:248 msgid "" "You can also use a range of dates. Subversion will find all revisions " "between both dates, inclusive:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:251 #, no-wrap msgid "" "\n" "$ svn log -r {2006-11-20}:{2006-11-29}\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch03-advanced-topics.xml:257 msgid "" "Since the timestamp of a revision is stored as an unversioned, modifiable " "property of the revision (see <xref linkend=\"svn.advanced.props\" />), " "revision timestamps can be changed to represent complete falsifications of " "true chronology, or even removed altogether. Subversion's ability to " "correctly convert revision dates into real revision numbers depends on " "revision datestamps maintaining a sequential ordering—the younger the " "revision, the younger its timestamp. If this ordering isn't maintained, you " "will likely find that trying to use dates to specify revision ranges in your " "repository doesn't always return the data you might have expected." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:279 msgid "Properties" msgstr "" # type: Content of: <chapter><sect1><indexterm><primary> #: ../en/book/ch03-advanced-topics.xml:281 msgid "properties" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:284 msgid "" "We've already covered in detail how Subversion stores and retrieves various " "versions of files and directories in its repository. Whole chapters have " "been devoted to this most fundamental piece of functionality provided by the " "tool. And if the versioning support stopped there, Subversion would still " "be complete from a version control perspective." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:291 msgid "But it doesn't stop there." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:293 msgid "" "In addition to versioning your directories and files, Subversion provides " "interfaces for adding, modifying, and removing versioned metadata on each of " "your versioned directories and files. We refer to this metadata as " "<firstterm>properties</firstterm>, and they can be thought of as two-column " "tables that map property names to arbitrary values attached to each item in " "your working copy. Generally speaking, the names and values of the " "properties can be whatever you want them to be, with the constraint that the " "names must contain only ASCII characters. And the best part about these " "properties is that they, too, are versioned, just like the textual contents " "of your files. You can modify, commit, and revert property changes as " "easily as you can file content changes. And the sending and receiving of " "property changes occurs as part of your typical commit and update " "operations—you don't have to change your basic processes to " "accommodate them." msgstr "" # type: Content of: <chapter><sect1><note><para> #: ../en/book/ch03-advanced-topics.xml:311 msgid "" "Subversion has reserved the set of properties whose names begin with " "<literal>svn:</literal> as its own. While there are only a handful of such " "properties in use today, you should avoid creating custom properties for " "your own needs whose names begin with this prefix. Otherwise, you run the " "risk that a future release of Subversion will grow support for a feature or " "behavior driven by a property of the same name but with perhaps an entirely " "different interpretation." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:321 msgid "" "Properties show up elsewhere in Subversion, too. Just as files and " "directories may have arbitrary property names and values attached to them, " "each revision as a whole may have arbitrary properties attached to it. The " "same constraints apply—human-readable names and anything-you-want " "binary values. The main difference is that revision properties are not " "versioned. In other words, if you change the value of, or delete, a " "revision property, there's no way, within the scope of Subversion's " "functionality, to recover the previous value." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:331 msgid "" "Subversion has no particular policy regarding the use of properties. It " "asks only that you not use property names that begin with the prefix " "<literal>svn:</literal>. That's the namespace that it sets aside for its " "own use. And Subversion does, in fact, use properties—both the " "versioned and unversioned variety. Certain versioned properties have " "special meaning or effects when found on files and directories, or they " "house a particular bit of information about the revisions on which they are " "found. Certain revision properties are automatically attached to revisions " "by Subversion's commit process, and they carry information about the " "revision. Most of these properties are mentioned elsewhere in this or other " "chapters as part of the more general topics to which they are related. For " "an exhaustive list of Subversion's predefined properties, see <xref linkend=" "\"svn.ref.properties\" />." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:347 msgid "" "In this section, we will examine the utility—both to users of " "Subversion and to Subversion itself—of property support. You'll learn " "about the property-related <command>svn</command> subcommands and how " "property modifications affect your normal Subversion workflow." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:355 msgid "Why Properties?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:357 msgid "" "Just as Subversion uses properties to store extra information about the " "files, directories, and revisions that it contains, you might also find " "properties to be of similar use. You might find it useful to have a place " "close to your versioned data to hang custom metadata about that data." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:364 msgid "" "Say you wish to design a web site that houses many digital photos and " "displays them with captions and a datestamp. Now, your set of photos is " "constantly changing, so you'd like to have as much of this site automated as " "possible. These photos can be quite large, so as is common with sites of " "this nature, you want to provide smaller thumbnail images to your site " "visitors." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:372 msgid "" "Now, you can get this functionality using traditional files. That is, you " "can have your <filename>image123.jpg</filename> and an <filename>image123-" "thumbnail.jpg</filename> side by side in a directory. Or if you want to " "keep the filenames the same, you might have your thumbnails in a different " "directory, such as <filename>thumbnails/image123.jpg</filename>. You can " "also store your captions and datestamps in a similar fashion, again " "separated from the original image file. But the problem here is that your " "collection of files multiplies with each new photo added to the site." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:384 msgid "" "Now consider the same web site deployed in a way that makes use of " "Subversion's file properties. Imagine having a single image file, " "<filename>image123.jpg</filename>, with properties set on that file that are " "named <literal>caption</literal>, <literal>datestamp</literal>, and even " "<literal>thumbnail</literal>. Now your working copy directory looks much " "more manageable—in fact, it looks to the casual browser like there are " "nothing but image files in it. But your automation scripts know better. " "They know that they can use <command>svn</command> (or better yet, they can " "use the Subversion language bindings—see <xref linkend=\"svn.developer." "usingapi\" />) to dig out the extra information that your site needs to " "display without having to read an index file or play path manipulation games." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch03-advanced-topics.xml:400 msgid "" "While Subversion places few restrictions on the names and values you use for " "properties, it has not been designed to optimally carry large property " "values or large sets of properties on a given file or directory. Subversion " "commonly holds all the property names and values associated with a single " "item in memory at the same time, which can cause detrimental performance or " "failed operations when extremely large property sets are used." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:410 msgid "" "Custom revision properties are also frequently used. One common such use is " "a property whose value contains an issue tracker ID with which the revision " "is associated, perhaps because the change made in that revision fixes a bug " "filed in the tracker issue with that ID. Other uses include hanging more " "friendly names on the revision—it might be hard to remember that " "revision 1935 was a fully tested revision. But if there's, say, a " "<literal>test-results</literal> property on that revision with the value " "<literal>all passing</literal>, that's meaningful information to have." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:422 msgid "Searchability (or, Why <emphasis>Not</emphasis> Properties)" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:425 msgid "" "For all their utility, Subversion properties—or, more accurately, the " "available interfaces to them—have a major shortcoming: while it is a " "simple matter to <emphasis>set</emphasis> a custom property, " "<emphasis>finding</emphasis> that property later is a whole different ball " "of wax." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:432 msgid "" "Trying to locate a custom revision property generally involves performing a " "linear walk across all the revisions of the repository, asking of each " "revision, \"Do you have the property I'm looking for?\" Trying to find a " "custom versioned property is painful, too, and often involves a recursive " "<command>svn propget</command> across an entire working copy. In your " "situation, that might not be as bad as a linear walk across all revisions. " "But it certainly leaves much to be desired in terms of both performance and " "likelihood of success, especially if the scope of your search would require " "a working copy from the root of your repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:445 msgid "" "For this reason, you might choose—especially in the revision property " "use case—to simply add your metadata to the revision's log message " "using some policy-driven (and perhaps programmatically enforced) formatting " "that is designed to be quickly parsed from the output of <command>svn log</" "command>. It is quite common to see the following in Subversion log " "messages:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><programlisting> #: ../en/book/ch03-advanced-topics.xml:453 #, no-wrap msgid "" "\n" "Issue(s): IZ2376, IZ1919\n" "Reviewed by: sally\n" "\n" "This fixes a nasty segfault in the wort frabbing process\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:461 msgid "" "But here again lies some misfortune. Subversion doesn't yet provide a log " "message templating mechanism, which would go a long way toward helping users " "be consistent with the formatting of their log-embedded revision metadata." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:472 msgid "Manipulating Properties" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:474 msgid "" "The <command>svn</command> program affords a few ways to add or modify file " "and directory properties. For properties with short, human-readable values, " "perhaps the simplest way to add a new property is to specify the property " "name and value on the command line of the <command>svn propset</command> " "subcommand:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:481 #, no-wrap msgid "" "\n" "$ svn propset copyright '(c) 2006 Red-Bean Software' calc/button.c\n" "property 'copyright' set on 'calc/button.c'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:487 msgid "" "But we've been touting the flexibility that Subversion offers for your " "property values. And if you are planning to have a multiline textual, or " "even binary, property value, you probably do not want to supply that value " "on the command line. So the <command>svn propset</command> subcommand takes " "a <option>--file</option> (<option>-F</option>) option for specifying the " "name of a file that contains the new property value." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:496 #, no-wrap msgid "" "\n" "$ svn propset license -F /path/to/LICENSE calc/button.c\n" "property 'license' set on 'calc/button.c'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch03-advanced-topics.xml:502 msgid "" "There are some restrictions on the names you can use for properties. A " "property name must start with a letter, a colon (<literal>:</literal>), or " "an underscore (<literal>_</literal>); after that, you can also use digits, " "hyphens (<literal>-</literal>), and periods (<literal>.</literal>). " "<footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:509 msgid "" "If you're familiar with XML, this is pretty much the ASCII subset of the " "syntax for XML \"Name\"." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:514 msgid "" "In addition to the <command>propset</command> command, the <command>svn</" "command> program supplies the <command>propedit</command> command. This " "command uses the configured editor program (see <xref linkend=\"svn.advanced." "confarea.opts.config\" />) to add or modify properties. When you run the " "command, <command>svn</command> invokes your editor program on a temporary " "file that contains the current value of the property (or that is empty, if " "you are adding a new property). Then, you just modify that value in your " "editor program until it represents the new value you wish to store for the " "property, save the temporary file, and then exit the editor program. If " "Subversion detects that you've actually changed the existing value of the " "property, it will accept that as the new property value. If you exit your " "editor without making any changes, no property modification will occur:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:531 #, no-wrap msgid "" "\n" "$ svn propedit copyright calc/button.c ### exit the editor without changes\n" "No changes to property 'copyright' on 'calc/button.c'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:537 msgid "" "We should note that, as with other <command>svn</command> subcommands, those " "related to properties can act on multiple paths at once. This enables you " "to modify properties on whole sets of files with a single command. For " "example, we could have done the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:543 #, no-wrap msgid "" "\n" "$ svn propset copyright '(c) 2006 Red-Bean Software' calc/*\n" "property 'copyright' set on 'calc/Makefile'\n" "property 'copyright' set on 'calc/button.c'\n" "property 'copyright' set on 'calc/integer.c'\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:552 msgid "" "All of this property adding and editing isn't really very useful if you " "can't easily get the stored property value. So the <command>svn</command> " "program supplies two subcommands for displaying the names and values of " "properties stored on files and directories. The <command>svn proplist</" "command> command will list the names of properties that exist on a path. " "Once you know the names of the properties on the node, you can request their " "values individually using <command>svn propget</command>. This command " "will, given a property name and a path (or set of paths), print the value of " "the property to the standard output stream." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:564 #, no-wrap msgid "" "\n" "$ svn proplist calc/button.c\n" "Properties on 'calc/button.c':\n" " copyright\n" " license\n" "$ svn propget copyright calc/button.c\n" "(c) 2006 Red-Bean Software\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:573 msgid "" "There's even a variation of the <command>proplist</command> command that " "will list both the name and the value for all of the properties. Simply " "supply the <option>--verbose</option> (<option>-v</option>) option." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:578 #, no-wrap msgid "" "\n" "$ svn proplist -v calc/button.c\n" "Properties on 'calc/button.c':\n" " copyright : (c) 2006 Red-Bean Software\n" " license : ================================================================\n" "Copyright (c) 2006 Red-Bean Software. All rights reserved.\n" "\n" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions \n" "are met:\n" "\n" "1. Redistributions of source code must retain the above copyright\n" "notice, this list of conditions, and the recipe for Fitz's famous\n" "red-beans-and-rice.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:595 msgid "" "The last property-related subcommand is <command>propdel</command>. Since " "Subversion allows you to store properties with empty values, you can't " "remove a property altogether using <command>svn propedit</command> or " "<command>svn propset</command>. For example, this command will " "<emphasis>not</emphasis> yield the desired effect:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:602 #, no-wrap msgid "" "\n" "$ svn propset license '' calc/button.c\n" "property 'license' set on 'calc/button.c'\n" "$ svn proplist -v calc/button.c\n" "Properties on 'calc/button.c':\n" " copyright : (c) 2006 Red-Bean Software\n" " license : \n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:612 msgid "" "You need to use the <command>propdel</command> subcommand to delete " "properties altogether. The syntax is similar to the other property commands:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:616 #, no-wrap msgid "" "\n" "$ svn propdel license calc/button.c\n" "property 'license' deleted from 'calc/button.c'.\n" "$ svn proplist -v calc/button.c\n" "Properties on 'calc/button.c':\n" " copyright : (c) 2006 Red-Bean Software\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch03-advanced-topics.xml:625 msgid "" "Remember those unversioned revision properties? You can modify those, too, " "using the same <command>svn</command> subcommands that we just described. " "Simply add the <option>--revprop</option> command-line parameter and specify " "the revision whose property you wish to modify. Since revisions are global, " "you don't need to specify a target path to these property-related commands " "so long as you are positioned in a working copy of the repository whose " "revision property you wish to modify. Otherwise, you can simply provide the " "URL of any path in the repository of interest (including the repository's " "root URL). For example, you might want to replace the commit log message of " "an existing revision. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:639 msgid "" "Fixing spelling errors, grammatical gotchas, and <quote>just-plain-" "wrongness</quote> in commit log messages is perhaps the most common use case " "for the <option>--revprop</option> option." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:643 msgid "" "</footnote> If your current working directory is part of a working copy of " "your repository, you can simply run the <command>svn propset</command> " "command with no target path:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:648 #, no-wrap msgid "" "\n" "$ svn propset svn:log '* button.c: Fix a compiler warning.' -r11 --revprop\n" "property 'svn:log' set on repository revision '11'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:654 msgid "" "But even if you haven't checked out a working copy from that repository, you " "can still affect the property change by providing the repository's root URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:658 #, no-wrap msgid "" "\n" "$ svn propset svn:log '* button.c: Fix a compiler warning.' -r11 --revprop \\\n" " http://svn.example.com/repos/project\n" "property 'svn:log' set on repository revision '11'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:665 msgid "" "Note that the ability to modify these unversioned properties must be " "explicitly added by the repository administrator (see <xref linkend=\"svn." "reposadmin.maint.setlog\" />). That's because the properties aren't " "versioned, so you run the risk of losing information if you aren't careful " "with your edits. The repository administrator can set up methods to protect " "against this loss, and by default, modification of unversioned properties is " "disabled." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch03-advanced-topics.xml:675 msgid "" "Users should, where possible, use <command>svn propedit</command> instead of " "<command>svn propset</command>. While the end result of the commands is " "identical, the former will allow them to see the current value of the " "property that they are about to change, which helps them to verify that they " "are, in fact, making the change they think they are making. This is " "especially true when modifying unversioned revision properties. Also, it is " "significantly easier to modify multiline property values in a text editor " "than at the command line." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:691 msgid "Properties and the Subversion Workflow" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:693 msgid "" "Now that you are familiar with all of the property-related <command>svn</" "command> subcommands, let's see how property modifications affect the usual " "Subversion workflow. As we mentioned earlier, file and directory properties " "are versioned, just like your file contents. As a result, Subversion " "provides the same opportunities for merging—cleanly or with " "conflicts—someone else's modifications into your own." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:702 msgid "" "As with file contents, your property changes are local modifications, made " "permanent only when you commit them to the repository with <command>svn " "commit</command>. Your property changes can be easily unmade, too—the " "<command>svn revert</command> command will restore your files and " "directories to their unedited states—contents, properties, and all. " "Also, you can receive interesting information about the state of your file " "and directory properties by using the <command>svn status</command> and " "<command>svn diff</command> commands." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:713 #, no-wrap msgid "" "\n" "$ svn status calc/button.c\n" " M calc/button.c\n" "$ svn diff calc/button.c\n" "Property changes on: calc/button.c\n" "___________________________________________________________________\n" "Name: copyright\n" " + (c) 2006 Red-Bean Software\n" "\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:725 msgid "" "Notice how the <command>status</command> subcommand displays <literal>M</" "literal> in the second column instead of the first. That is because we have " "modified the properties on <filename>calc/button.c</filename>, but not its " "textual contents. Had we changed both, we would have seen <literal>M</" "literal> in the first column, too. (We cover <command>svn status</command> " "in <xref linkend=\"svn.tour.cycle.examine.status\" />)." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:735 msgid "Property Conflicts" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:737 msgid "" "As with file contents, local property modifications can conflict with " "changes committed by someone else. If you update your working copy " "directory and receive property changes on a versioned object that clash with " "your own, Subversion will report that the object is in a conflicted state." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:744 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn update\n" #| "U INSTALL\n" #| "G README\n" #| "Conflict discovered in 'bar.c'.\n" #| "Select: (p) postpone, (df) diff-full, (e) edit,\n" #| " (h) help for more options:\n" msgid "" "\n" "$ svn update calc\n" "M calc/Makefile.in\n" "Conflict for property 'linecount' discovered on 'calc/button.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (s) show all options: p\n" " C calc/button.c\n" "Updated to revision 143.\n" "$ \n" msgstr "" "\n" "$ svn update\n" "U INSTALL\n" "G README\n" "Conflict discovered in 'bar.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options:\n" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:755 msgid "" "Subversion will also create, in the same directory as the conflicted object, " "a file with a <filename>.prej</filename> extension that contains the details " "of the conflict. You should examine the contents of this file so you can " "decide how to resolve the conflict. Until the conflict is resolved, you " "will see a <literal>C</literal> in the second column of <command>svn status</" "command> output for that object, and attempts to commit your local " "modifications will fail." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch03-advanced-topics.xml:765 #, no-wrap msgid "" "\n" "$ svn status calc\n" " C calc/button.c\n" "? calc/button.c.prej\n" "$ cat calc/button.c.prej \n" "Trying to change property 'linecount' from '1267' to '1301',\n" "but property has been locally changed from '1267' to '1256'.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:775 msgid "" "To resolve property conflicts, simply ensure that the conflicting properties " "contain the values that they should, and then use the <command>svn resolved</" "command> command to alert Subversion that you have manually resolved the " "problem." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:783 msgid "" "You might also have noticed the nonstandard way that Subversion currently " "displays property differences. You can still use <command>svn diff</" "command> and redirect its output to create a usable patch file. The " "<command>patch</command> program will ignore property patches—as a " "rule, it ignores any noise it can't understand. This does, unfortunately, " "mean that to fully apply a patch generated by <command>svn diff</command>, " "any property modifications will need to be applied by hand." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:797 msgid "Automatic Property Setting" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:799 msgid "" "Properties are a powerful feature of Subversion, acting as key components of " "many Subversion features discussed elsewhere in this and other " "chapters—textual diff and merge support, keyword substitution, newline " "translation, and so on. But to get the full benefit of properties, they " "must be set on the right files and directories. Unfortunately, that step " "can be easily forgotten in the routine of things, especially since failing " "to set a property doesn't usually result in an obvious error (at least " "compared to, say, failing to add a file to version control). To help your " "properties get applied to the places that need them, Subversion provides a " "couple of simple but useful features." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:812 msgid "" "Whenever you introduce a file to version control using the <command>svn add</" "command> or <command>svn import</command> commands, Subversion tries to " "assist by setting some common file properties automatically. First, on " "operating systems whose filesystems support an execute permission bit, " "Subversion will automatically set the <literal>svn:executable</literal> " "property on newly added or imported files whose execute bit is enabled. " "(See <xref linkend=\"svn.advanced.props.special.executable\" /> later in " "this chapter for more about this property.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:823 msgid "" "Second, Subversion tries to determine the file's MIME type. If you've " "configured a <literal>mime-types-files</literal> runtime configuration " "parameter, Subversion will try to find a MIME type mapping in that file for " "your file's extension. If it finds such a mapping, it will set your file's " "<literal>svn:mime-type</literal> property to the MIME type it found. If no " "mapping file is configured, or no mapping for your file's extension could be " "found, Subversion runs a very basic heuristic to determine whether the file " "contains nontextual content. If so, it automatically sets the <literal>svn:" "mime-type</literal> property on that file to <literal>application/octet-" "stream</literal> (the generic <quote>this is a collection of bytes</quote> " "MIME type). Of course, if Subversion guesses incorrectly, or if you wish to " "set the <literal>svn:mime-type</literal> property to something more " "precise—perhaps <literal>image/png</literal> or <literal>application/x-" "shockwave-flash</literal>—you can always remove or edit that " "property. (For more on Subversion's use of MIME types, see <xref linkend=" "\"svn.advanced.props.special.mime-type\" /> later in this chapter.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:846 msgid "" "Subversion also provides, via its runtime configuration system (see <xref " "linkend=\"svn.advanced.confarea\" />), a more flexible automatic property " "setting feature that allows you to create mappings of filename patterns to " "property names and values. Once again, these mappings affect adds and " "imports, and can not only override the default MIME type decision made by " "Subversion during those operations, but can also set additional Subversion " "or custom properties, too. For example, you might create a mapping that " "says that anytime you add JPEG files—ones whose names match the " "pattern <literal>*.jpg</literal>—Subversion should automatically set " "the <literal>svn:mime-type</literal> property on those files to " "<literal>image/jpeg</literal>. Or perhaps any files that match <literal>*." "cpp</literal> should have <literal>svn:eol-style</literal> set to " "<literal>native</literal>, and <literal>svn:keywords</literal> set to " "<literal>Id</literal>. Automatic property support is perhaps the handiest " "property-related tool in the Subversion toolbox. See <xref linkend=\"svn." "advanced.confarea.opts.config\"/> for more about configuring that support." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:875 msgid "File Portability" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:877 msgid "" "Fortunately for Subversion users who routinely find themselves on different " "computers with different operating systems, Subversion's command-line " "program behaves almost identically on all those systems. If you know how to " "wield <command>svn</command> on one platform, you know how to wield it " "everywhere." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:884 msgid "" "However, the same is not always true of other general classes of software or " "of the actual files you keep in Subversion. For example, on a Windows " "machine, the definition of a <quote>text file</quote> would be similar to " "that used on a Linux box, but with a key difference—the character " "sequences used to mark the ends of the lines of those files. There are " "other differences, too. Unix platforms have (and Subversion supports) " "symbolic links; Windows does not. Unix platforms use filesystem permission " "to determine executability; Windows uses filename extensions." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:895 msgid "" "Because Subversion is in no position to unite the whole world in common " "definitions and implementations of all of these things, the best it can do " "is to try to help make your life simpler when you need to work with your " "versioned files and directories on multiple computers and operating " "systems. This section describes some of the ways Subversion does this." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:904 msgid "File Content Type" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:906 msgid "" "Subversion joins the ranks of the many applications that recognize and make " "use of Multipurpose Internet Mail Extensions (MIME) content types. Besides " "being a general-purpose storage location for a file's content type, the " "value of the <literal>svn:mime-type</literal> file property determines some " "behavioral characteristics of Subversion itself." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:915 msgid "Identifying File Types" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:917 msgid "" "Various programs on most modern operating systems make assumptions about the " "type and format of the contents of a file by the file's name, specifically " "its file extension. For example, files whose names end in <filename>.txt</" "filename> are generally assumed to be human-readable; that is, able to be " "understood by simple perusal rather than requiring complex processing to " "decipher. Files whose names end in <filename>.png</filename>, on the other " "hand, are assumed to be of the Portable Network Graphics type—not " "human-readable at all, and sensible only when interpreted by software that " "understands the PNG format and can render the information in that format as " "a raster image." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para><footnote> #: ../en/book/ch03-advanced-topics.xml:931 msgid "" "Unfortunately, some of those extensions have changed their meanings over " "time. When personal computers first appeared, a file named <filename>README." "DOC</filename> would have almost certainly been a plain-text file, just like " "today's <filename>.txt</filename> files. But by the mid-1990s, you could " "almost bet that a file of that name would not be a plain-text file at all, " "but instead a Microsoft Word document in a proprietary, non-human-readable " "format. But this change didn't occur overnight—there was certainly a " "period of confusion for computer users over what exactly they had in hand " "when they saw a <filename>.DOC</filename> file. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:944 msgid "" "You think that was rough? During that same era, WordPerfect also used " "<filename>.DOC</filename> for their proprietary file format's preferred " "extension!" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:950 msgid "" "The popularity of computer networking cast still more doubt on the mapping " "between a file's name and its content. With information being served across " "networks and generated dynamically by server-side scripts, there was often " "no real file per se, and therefore no filename. Web servers, for example, " "needed some other way to tell browsers what they were downloading so that " "the browser could do something intelligent with that information, whether " "that was to display the data using a program registered to handle that " "datatype or to prompt the user for where on the client machine to store the " "downloaded data." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:962 msgid "" "Eventually, a standard emerged for, among other things, describing the " "contents of a data stream. In 1996, RFC 2045 was published. It was the " "first of five RFCs describing MIME. It describes the concept of media types " "and subtypes and recommends a syntax for the representation of those types. " "Today, MIME media types—or <quote>MIME types</quote>—are used " "almost universally across email applications, web servers, and other " "software as the de facto mechanism for clearing up the file content " "confusion." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:975 msgid "" "For example, one of the benefits that Subversion typically provides is " "contextual, line-based merging of changes received from the server during an " "update into your working file. But for files containing nontextual data, " "there is often no concept of a <quote>line.</quote> So, for versioned files " "whose <literal>svn:mime-type</literal> property is set to a nontextual MIME " "type (generally, something that doesn't begin with <literal>text/</literal>, " "though there are exceptions), Subversion does not attempt to perform " "contextual merges during updates. Instead, any time you have locally " "modified a binary working copy file that is also being updated, your file is " "left untouched and Subversion creates two new files. One file has a " "<filename>.oldrev</filename> extension and contains the BASE revision of the " "file. The other file has a <filename>.newrev</filename> extension and " "contains the contents of the updated revision of the file. This behavior is " "really for the protection of the user against failed attempts at performing " "contextual merges on files that simply cannot be contextually merged." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch03-advanced-topics.xml:996 msgid "" "The <literal>svn:mime-type</literal> property, when set to a value that does " "not indicate textual file contents, can cause some unexpected behaviors with " "respect to other properties. For example, since the idea of line endings " "(and therefore, line-ending conversion) makes no sense when applied to " "nontextual files, Subversion will prevent you from setting the <literal>svn:" "eol-style</literal> property on such files. This is obvious when attempted " "on a single file target—<command>svn propset</command> will error " "out. But it might not be as clear if you perform a recursive property set, " "where Subversion will silently skip over files that it deems unsuitable for " "a given property." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1011 msgid "" "Beginning in Subversion 1.5, users can configure a new <literal>mime-types-" "file</literal> runtime configuration parameter, which identifies the " "location of a MIME types mapping file. Subversion will consult this mapping " "file to determine the MIME type of newly added and imported files." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1018 msgid "" "Also, if the <literal>svn:mime-type</literal> property is set, then the " "Subversion Apache module will use its value to populate the <literal>Content-" "type:</literal> HTTP header when responding to GET requests. This gives " "your web browser a crucial clue about how to display a file when you use it " "to peruse your Subversion repository's contents." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:1029 msgid "File Executability" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1031 msgid "" "On many operating systems, the ability to execute a file as a command is " "governed by the presence of an execute permission bit. This bit usually " "defaults to being disabled, and must be explicitly enabled by the user for " "each file that needs it. But it would be a monumental hassle to have to " "remember exactly which files in a freshly checked-out working copy were " "supposed to have their executable bits toggled on, and then to have to do " "that toggling. So, Subversion provides the <literal>svn:executable</" "literal> property as a way to specify that the executable bit for the file " "on which that property is set should be enabled, and Subversion honors that " "request when populating working copies with such files." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch03-advanced-topics.xml:1044 msgid "" "This property has no effect on filesystems that have no concept of an " "executable permission bit, such as FAT32 and NTFS. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:1048 msgid "" "The Windows filesystems use file extensions (such as <filename>.EXE</" "filename>, <filename>.BAT</filename>, and <filename>.COM</filename>) to " "denote executable files." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1052 msgid "" "</footnote> Also, although it has no defined values, Subversion will force " "its value to <literal>*</literal> when setting this property. Finally, this " "property is valid only on files, not on directories." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:1062 msgid "End-of-Line Character Sequences" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1064 msgid "" "Unless otherwise noted using a versioned file's <literal>svn:mime-type</" "literal> property, Subversion assumes the file contains human-readable " "data. Generally speaking, Subversion uses this knowledge only to determine " "whether contextual difference reports for that file are possible. " "Otherwise, to Subversion, bytes are bytes." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1071 msgid "" "This means that by default, Subversion doesn't pay any attention to the type " "of <firstterm>end-of-line (EOL) markers</firstterm> used in your files. " "Unfortunately, different operating systems have different conventions about " "which character sequences represent the end of a line of text in a file. " "For example, the usual line-ending token used by software on the Windows " "platform is a pair of ASCII control characters—a carriage return " "(<literal>CR</literal>) followed by a line feed (<literal>LF</literal>). " "Unix software, however, just uses the <literal>LF</literal> character to " "denote the end of a line." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1083 msgid "" "Not all of the various tools on these operating systems understand files " "that contain line endings in a format that differs from the " "<firstterm>native line-ending style</firstterm> of the operating system on " "which they are running. So, typically, Unix programs treat the <literal>CR</" "literal> character present in Windows files as a regular character (usually " "rendered as <literal>^M</literal>), and Windows programs combine all of the " "lines of a Unix file into one giant line because no carriage return-linefeed " "(or <literal>CRLF</literal>) character combination was found to denote the " "ends of the lines." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1095 msgid "" "This sensitivity to foreign EOL markers can be frustrating for folks who " "share a file across different operating systems. For example, consider a " "source code file, and developers that edit this file on both Windows and " "Unix systems. If all the developers always use tools that preserve the line-" "ending style of the file, no problems occur." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1103 msgid "" "But in practice, many common tools either fail to properly read a file with " "foreign EOL markers, or convert the file's line endings to the native style " "when the file is saved. If the former is true for a developer, he has to " "use an external conversion utility (such as <command>dos2unix</command> or " "its companion, <command>unix2dos</command>) to prepare the file for " "editing. The latter case requires no extra preparation. But both cases " "result in a file that differs from the original quite literally on every " "line! Prior to committing his changes, the user has two choices. Either he " "can use a conversion utility to restore the modified file to the same line-" "ending style that it was in before his edits were made, or he can simply " "commit the file—new EOL markers and all." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1119 msgid "" "The result of scenarios like these include wasted time and unnecessary " "modifications to committed files. Wasted time is painful enough. But when " "commits change every line in a file, this complicates the job of determining " "which of those lines were changed in a nontrivial way. Where was that bug " "really fixed? On what line was a syntax error introduced?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:1127 msgid "" "The solution to this problem is the <literal>svn:eol-style</literal> " "property. When this property is set to a valid value, Subversion uses it to " "determine what special processing to perform on the file so that the file's " "line-ending style isn't flip-flopping with every commit that comes from a " "different operating system. The valid values are:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1137 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>native</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1139 msgid "" "This causes the file to contain the EOL markers that are native to the " "operating system on which Subversion was run. In other words, if a user on " "a Windows machine checks out a working copy that contains a file with an " "<literal>svn:eol-style</literal> property set to <literal>native</literal>, " "that file will contain <literal>CRLF</literal> EOL markers. A Unix user " "checking out a working copy that contains the same file will see " "<literal>LF</literal> EOL markers in his copy of the file." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1151 msgid "" "Note that Subversion will actually store the file in the repository using " "normalized <literal>LF</literal> EOL markers regardless of the operating " "system. This is basically transparent to the user, though." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1159 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>CRLF</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1161 msgid "" "This causes the file to contain <literal>CRLF</literal> sequences for EOL " "markers, regardless of the operating system in use." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1167 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>LF</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1169 msgid "" "This causes the file to contain <literal>LF</literal> characters for EOL " "markers, regardless of the operating system in use." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1175 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>CR</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1177 msgid "" "This causes the file to contain <literal>CR</literal> characters for EOL " "markers, regardless of the operating system in use. This line-ending style " "is not very common." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:1192 msgid "Ignoring Unversioned Items" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1194 msgid "" "In any given working copy, there is a good chance that alongside all those " "versioned files and directories are other files and directories that are " "neither versioned nor intended to be. Text editors litter directories with " "backup files. Software compilers generate intermediate—or even " "final—files that you typically wouldn't bother to version. And users " "themselves drop various other files and directories wherever they see fit, " "often in version control working copies." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1204 msgid "" "It's ludicrous to expect Subversion working copies to be somehow impervious " "to this kind of clutter and impurity. In fact, Subversion counts it as a " "<emphasis>feature</emphasis> that its working copies are just typical " "directories, just like unversioned trees. But these not-to-be-versioned " "files and directories can cause some annoyance for Subversion users. For " "example, because the <command>svn add</command> and <command>svn import</" "command> commands act recursively by default and don't know which files in a " "given tree you do and don't wish to version, it's easy to accidentally add " "stuff to version control that you didn't mean to. And because <command>svn " "status</command> reports, by default, every item of interest in a working " "copy—including unversioned files and directories—its output can " "get quite noisy where many of these things exist." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1220 msgid "" "So Subversion provides two ways for telling it which files you would prefer " "that it simply disregard. One of the ways involves the use of Subversion's " "runtime configuration system (see <xref linkend=\"svn.advanced.confarea\" /" ">), and therefore applies to all the Subversion operations that make use of " "that runtime configuration—generally those performed on a particular " "computer or by a particular user of a computer. The other way makes use of " "Subversion's directory property support and is more tightly bound to the " "versioned tree itself, and therefore affects everyone who has a working copy " "of that tree. Both of the mechanisms use <firstterm>file patterns</" "firstterm> (strings of literal and special wildcard characters used to match " "against filenames) to decide which files to ignore." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1234 msgid "" "The Subversion runtime configuration system provides an option, " "<literal>global-ignores</literal>, whose value is a whitespace-delimited " "collection of file patterns. The Subversion client checks these patterns " "against the names of the files that are candidates for addition to version " "control, as well as to unversioned files that the <command>svn status</" "command> command notices. If any file's name matches one of the patterns, " "Subversion will basically act as if the file didn't exist at all. This is " "really useful for the kinds of files that you almost never want to version, " "such as editor backup files such as Emacs' <literal>*~</literal> and " "<literal>.*~</literal> files." msgstr "" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:1248 #, fuzzy #| msgid "What's New in Subversion" msgid "File Patterns in Subversion" msgstr "Was gibt es Neues in Subversion" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1250 msgid "" "File patterns (also called <firstterm>globs</firstterm> or <firstterm>shell " "wildcard patterns</firstterm>) are strings of characters that are intended " "to be matched against filenames, typically for the purpose of quickly " "selecting some subset of similar files from a larger grouping without having " "to explicitly name each file. The patterns contain two types of characters: " "regular characters, which are compared explicitly against potential matches, " "and special wildcard characters, which are interpreted differently for " "matching purposes." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1261 msgid "" "There are different types of file pattern syntaxes, but Subversion uses the " "one most commonly found in Unix systems implemented as the " "<function>fnmatch</function> system function. It supports the following " "wildcards, described here simply for your convenience:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1269 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>?</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sidebar><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1271 msgid "Matches any single character" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1275 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>*</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sidebar><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1277 msgid "Matches any string of characters, including the empty string" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1282 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>[</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sidebar><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1284 msgid "" "Begins a character class definition terminated by <literal>]</literal>, used " "for matching a subset of characters" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1291 msgid "" "You can see this same pattern matching behavior at a Unix shell prompt. The " "following are some examples of patterns being used for various things:" msgstr "" # type: Content of: <chapter><sect1><sidebar><screen> #: ../en/book/ch03-advanced-topics.xml:1295 #, no-wrap msgid "" "\n" "$ ls ### the book sources\n" "appa-quickstart.xml ch06-server-configuration.xml\n" "appb-svn-for-cvs-users.xml ch07-customizing-svn.xml\n" "appc-webdav.xml ch08-embedding-svn.xml\n" "book.xml ch09-reference.xml\n" "ch00-preface.xml ch10-world-peace-thru-svn.xml\n" "ch01-fundamental-concepts.xml copyright.xml\n" "ch02-basic-usage.xml foreword.xml\n" "ch03-advanced-topics.xml images/\n" "ch04-branching-and-merging.xml index.xml\n" "ch05-repository-admin.xml styles.css\n" "$ ls ch* ### the book chapters\n" "ch00-preface.xml ch06-server-configuration.xml\n" "ch01-fundamental-concepts.xml ch07-customizing-svn.xml\n" "ch02-basic-usage.xml ch08-embedding-svn.xml\n" "ch03-advanced-topics.xml ch09-reference.xml\n" "ch04-branching-and-merging.xml ch10-world-peace-thru-svn.xml\n" "ch05-repository-admin.xml\n" "$ ls ch?0-* ### the book chapters whose numbers end in zero\n" "ch00-preface.xml ch10-world-peace-thru-svn.xml\n" "$ ls ch0[3578]-* ### the book chapters that Mike is responsible for\n" "ch03-advanced-topics.xml ch07-customizing-svn.xml\n" "ch05-repository-admin.xml ch08-embedding-svn.xml\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1322 msgid "" "File pattern matching is a bit more complex than what we've described here, " "but this basic usage level tends to suit the majority of Subversion users." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1328 msgid "" "When found on a versioned directory, the <literal>svn:ignore</literal> " "property is expected to contain a list of newline-delimited file patterns " "that Subversion should use to determine ignorable objects in that same " "directory. These patterns do not override those found in the " "<literal>global-ignores</literal> runtime configuration option, but are " "instead appended to that list. And it's worth noting again that, unlike the " "<literal>global-ignores</literal> option, the patterns found in the " "<literal>svn:ignore</literal> property apply only to the directory on which " "that property is set, and not to any of its subdirectories. The " "<literal>svn:ignore</literal> property is a good way to tell Subversion to " "ignore files that are likely to be present in every user's working copy of " "that directory, such as compiler output or—to use an example more " "appropriate to this book—the HTML, PDF, or PostScript files generated " "as the result of a conversion of some source DocBook XML files to a more " "legible output format." msgstr "" # type: Content of: <chapter><sect1><note><para> #: ../en/book/ch03-advanced-topics.xml:1348 msgid "" "Subversion's support for ignorable file patterns extends only to the one-" "time process of adding unversioned files and directories to version " "control. Once an object is under Subversion's control, the ignore pattern " "mechanisms no longer apply to it. In other words, don't expect Subversion " "to avoid committing changes you've made to a versioned file simply because " "that file's name matches an ignore pattern—Subversion " "<emphasis>always</emphasis> notices all of its versioned objects." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:1360 msgid "Ignore Patterns for CVS Users" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1362 msgid "" "The Subversion <literal>svn:ignore</literal> property is very similar in " "syntax and function to the CVS <filename>.cvsignore</filename> file. In " "fact, if you are migrating a CVS working copy to Subversion, you can " "directly migrate the ignore patterns by using the <filename>.cvsignore</" "filename> file as input file to the <command>svn propset</command> command:" msgstr "" # type: Content of: <chapter><sect1><sidebar><screen> #: ../en/book/ch03-advanced-topics.xml:1370 #, no-wrap msgid "" "\n" "$ svn propset svn:ignore -F .cvsignore .\n" "property 'svn:ignore' set on '.'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1376 msgid "" "There are, however, some differences in the ways that CVS and Subversion " "handle ignore patterns. The two systems use the ignore patterns at some " "different times, and there are slight discrepancies in what the ignore " "patterns apply to. Also, Subversion does not recognize the use of the " "<literal>!</literal> pattern as a reset back to having no ignore patterns at " "all." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1386 msgid "" "The global list of ignore patterns tends to be more a matter of personal " "taste and ties more closely to a user's particular tool chain than to the " "details of any particular working copy's needs. So, the rest of this " "section will focus on the <literal>svn:ignore</literal> property and its " "uses." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1393 msgid "Say you have the following output from <command>svn status</command>:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1396 #, no-wrap msgid "" "\n" "$ svn status calc\n" " M calc/button.c\n" "? calc/calculator\n" "? calc/data.c\n" "? calc/debug_log\n" "? calc/debug_log.1\n" "? calc/debug_log.2.gz\n" "? calc/debug_log.3.gz\n" msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:1407 msgid "" "In this example, you have made some property modifications to " "<filename>button.c</filename>, but in your working copy, you also have some " "unversioned files: the latest <filename>calculator</filename> program that " "you've compiled from your source code, a source file named <filename>data.c</" "filename>, and a set of debugging output logfiles. Now, you know that your " "build system always results in the <filename>calculator</filename> program " "being generated. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:1416 msgid "Isn't that the whole point of a build system?" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1417 msgid "" "</footnote> And you know that your test suite always leaves those debugging " "logfiles lying around. These facts are true for all working copies of this " "project, not just your own. And you know that you aren't interested in " "seeing those things every time you run <command>svn status</command>, and " "you are pretty sure that nobody else is interested in them either. So you " "use <userinput>svn propedit svn:ignore calc</userinput> to add some ignore " "patterns to the <filename>calc</filename> directory. For example, you might " "add this as the new value of the <literal>svn:ignore</literal> property:" msgstr "" # type: Content of: <chapter><sect1><programlisting> #: ../en/book/ch03-advanced-topics.xml:1429 #, no-wrap msgid "" "\n" "calculator\n" "debug_log*\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1434 msgid "" "After you've added this property, you will now have a local property " "modification on the <filename>calc</filename> directory. But notice what " "else is different about your <command>svn status</command> output:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1439 #, no-wrap msgid "" "\n" "$ svn status\n" " M calc\n" " M calc/button.c\n" "? calc/data.c\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1446 msgid "" "Now, all that cruft is missing from the output! Your <filename>calculator</" "filename> compiled program and all those logfiles are still in your working " "copy; Subversion just isn't constantly reminding you that they are present " "and unversioned. And now with all the uninteresting noise removed from the " "display, you are left with more intriguing items—such as that source " "code file <filename>data.c</filename> that you probably forgot to add to " "version control." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1455 msgid "" "Of course, this less-verbose report of your working copy status isn't the " "only one available. If you actually want to see the ignored files as part " "of the status report, you can pass the <option>--no-ignore</option> option " "to Subversion:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1460 #, no-wrap msgid "" "\n" "$ svn status --no-ignore\n" " M calc\n" " M calc/button.c\n" "I calc/calculator\n" "? calc/data.c\n" "I calc/debug_log\n" "I calc/debug_log.1\n" "I calc/debug_log.2.gz\n" "I calc/debug_log.3.gz\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1472 msgid "" "As mentioned earlier, the list of file patterns to ignore is also used by " "<command>svn add</command> and <command>svn import</command>. Both of these " "operations involve asking Subversion to begin managing some set of files and " "directories. Rather than force the user to pick and choose which files in a " "tree she wishes to start versioning, Subversion uses the ignore " "patterns—both the global and the per-directory lists—to " "determine which files should not be swept into the version control system as " "part of a larger recursive addition or import operation. And here again, " "you can use the <option>--no-ignore</option> option to tell Subversion " "ignore its ignores list and operate on all the files and directories present." msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch03-advanced-topics.xml:1487 msgid "" "Even if <literal>svn:ignore</literal> is set, you may run into problems if " "you use shell wildcards in a command. Shell wildcards are expanded into an " "explicit list of targets before Subversion operates on them, so running " "<userinput>svn <replaceable>SUBCOMMAND</replaceable> *</userinput> is just " "like running <userinput>svn <replaceable>SUBCOMMAND</replaceable> file1 " "file2 file3 …</userinput>. In the case of the <command>svn add</" "command> command, this has an effect similar to passing the <option>--no-" "ignore</option> option. So instead of using a wildcard, use <userinput>svn " "add --force .</userinput> to do a bulk scheduling of unversioned things for " "addition. The explicit target will ensure that the current directory isn't " "overlooked because of being already under version control, and the <option>--" "force</option> option will cause Subversion to crawl through that directory, " "adding unversioned files while still honoring the <literal>svn:ignore</" "literal> property and <literal>global-ignores</literal> runtime " "configuration variable. Be sure to also provide the <option>--depth files</" "option> option to the <command>svn add</command> command if you don't want a " "fully recursive crawl for things to add." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:1518 msgid "Keyword Substitution" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1520 msgid "" "Subversion has the ability to substitute <firstterm>keywords</" "firstterm>—pieces of useful, dynamic information about a versioned " "file—into the contents of the file itself. Keywords generally provide " "information about the last modification made to the file. Because this " "information changes each time the file changes, and more importantly, just " "<emphasis>after</emphasis> the file changes, it is a hassle for any process " "except the version control system to keep the data completely up to date. " "Left to human authors, the information would inevitably grow stale." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1532 msgid "" "For example, say you have a document in which you would like to display the " "last date on which it was modified. You could burden every author of that " "document to, just before committing their changes, also tweak the part of " "the document that describes when it was last changed. But sooner or later, " "someone would forget to do that. Instead, simply ask Subversion to perform " "keyword substitution on the <literal>LastChangedDate</literal> keyword. You " "control where the keyword is inserted into your document by placing a " "<firstterm>keyword anchor</firstterm> at the desired location in the file. " "This anchor is just a string of text formatted as <literal>$</" "literal><replaceable>KeywordName</replaceable><literal>$</literal>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1546 msgid "" "All keywords are case-sensitive where they appear as anchors in files: you " "must use the correct capitalization for the keyword to be expanded. You " "should consider the value of the <literal>svn:keywords</literal> property to " "be case-sensitive, too—certain keyword names will be recognized " "regardless of case, but this behavior is deprecated." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1553 msgid "" "Subversion defines the list of keywords available for substitution. That " "list contains the following five keywords, some of which have aliases that " "you can also use:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1559 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>Date</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1561 msgid "" "This keyword describes the last time the file was known to have been changed " "in the repository, and is of the form <literal>$Date: 2006-07-22 21:42:37 -" "0700 (Sat, 22 Jul 2006) $</literal>. It may also be specified as " "<literal>LastChangedDate</literal>. Unlike the <literal>Id</literal> " "keyword, which uses UTC, the <literal>Date</literal> keyword displays dates " "using the local time zone." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1572 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>Revision</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1574 msgid "" "This keyword describes the last known revision in which this file changed in " "the repository, and looks something like <literal>$Revision: 144 $</" "literal>. It may also be specified as <literal>LastChangedRevision</" "literal> or <literal>Rev</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1583 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>Author</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1585 msgid "" "This keyword describes the last known user to change this file in the " "repository, and looks something like <literal>$Author: harry $</literal>. " "It may also be specified as <literal>LastChangedBy</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1593 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>HeadURL</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1595 msgid "" "This keyword describes the full URL to the latest version of the file in the " "repository, and looks something like <literal>$HeadURL: http://svn.collab." "net/repos/trunk/README $</literal>. It may be abbreviated as <literal>URL</" "literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1604 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>Id</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1606 msgid "" "This keyword is a compressed combination of the other keywords. Its " "substitution looks something like <literal>$Id: calc.c 148 2006-07-28 " "21:30:43Z sally $</literal>, and is interpreted to mean that the file " "<filename>calc.c</filename> was last changed in revision 148 on the evening " "of July 28, 2006 by the user <literal>sally</literal>. The date displayed " "by this keyword is in UTC, unlike that of the <literal>Date</literal> " "keyword (which uses the local time zone)." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1620 msgid "" "Several of the preceding descriptions use the phrase <quote>last known</" "quote> or similar wording. Keep in mind that keyword expansion is a client-" "side operation, and your client <quote>knows</quote> only about changes that " "have occurred in the repository when you update your working copy to include " "those changes. If you never update your working copy, your keywords will " "never expand to different values even if those versioned files are being " "changed regularly in the repository." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:1630 msgid "" "Simply adding keyword anchor text to your file does nothing special. " "Subversion will never attempt to perform textual substitutions on your file " "contents unless explicitly asked to do so. After all, you might be writing " "a document <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:1636 msgid "… or maybe even a section of a book …" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1637 msgid "" "</footnote> about how to use keywords, and you don't want Subversion to " "substitute your beautiful examples of unsubstituted keyword anchors!" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1642 msgid "" "To tell Subversion whether to substitute keywords on a particular file, we " "again turn to the property-related subcommands. The <literal>svn:keywords</" "literal> property, when set on a versioned file, controls which keywords " "will be substituted on that file. The value is a space-delimited list of " "keyword names or aliases." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1649 msgid "" "For example, say you have a versioned file named <filename>weather.txt</" "filename> that looks like this:" msgstr "" # type: Content of: <chapter><sect1><programlisting> #: ../en/book/ch03-advanced-topics.xml:1653 #, no-wrap msgid "" "\n" "Here is the latest report from the front lines.\n" "$LastChangedDate$\n" "$Rev$\n" "Cumulus clouds are appearing more frequently as summer approaches.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1660 msgid "" "With no <literal>svn:keywords</literal> property set on that file, " "Subversion will do nothing special. Now, let's enable substitution of the " "<literal>LastChangedDate</literal> keyword." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1665 #, no-wrap msgid "" "\n" "$ svn propset svn:keywords \"Date Author\" weather.txt\n" "property 'svn:keywords' set on 'weather.txt'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1671 msgid "" "Now you have made a local property modification on the <filename>weather." "txt</filename> file. You will see no changes to the file's contents (unless " "you made some of your own prior to setting the property). Notice that the " "file contained a keyword anchor for the <literal>Rev</literal> keyword, yet " "we did not include that keyword in the property value we set. Subversion " "will happily ignore requests to substitute keywords that are not present in " "the file and will not substitute keywords that are not present in the " "<literal>svn:keywords</literal> property value." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1682 msgid "" "Immediately after you commit this property change, Subversion will update " "your working file with the new substitute text. Instead of seeing your " "keyword anchor <literal>$LastChangedDate$</literal>, you'll see its " "substituted result. That result also contains the name of the keyword and " "continues to be delimited by the dollar sign (<literal>$</literal>) " "characters. And as we predicted, the <literal>Rev</literal> keyword was not " "substituted because we didn't ask for it to be." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1692 msgid "" "Note also that we set the <literal>svn:keywords</literal> property to " "<literal>Date Author</literal>, yet the keyword anchor used the alias " "<literal>$LastChangedDate$</literal> and still expanded correctly:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1697 #, no-wrap msgid "" "\n" "Here is the latest report from the front lines.\n" "$LastChangedDate: 2006-07-22 21:42:37 -0700 (Sat, 22 Jul 2006) $\n" "$Rev$\n" "Cumulus clouds are appearing more frequently as summer approaches.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1704 msgid "" "If someone else now commits a change to <filename>weather.txt</filename>, " "your copy of that file will continue to display the same substituted keyword " "value as before—until you update your working copy. At that time, the " "keywords in your <filename>weather.txt</filename> file will be resubstituted " "with information that reflects the most recent known commit to that file." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:1713 msgid "Where's $GlobalRev$?" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1715 msgid "" "New users are often confused by how the <literal>$Rev$</literal> keyword " "works. Since the repository has a single, globally increasing revision " "number, many people assume that it is this number that is reflected by the " "<literal>$Rev$</literal> keyword's value. But <literal>$Rev$</literal> " "expands to show the last revision in which the file <emphasis>changed</" "emphasis>, not the last revision to which it was updated. Understanding " "this clears the confusion, but frustration often remains—without the " "support of a Subversion keyword to do so, how can you automatically get the " "global revision number into your files?" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:1728 msgid "" "To do this, you need external processing. Subversion ships with a tool " "called <command>svnversion</command>, which was designed for just this " "purpose. It crawls your working copy and generates as output the revision" "(s) it finds. You can use this program, plus some additional tooling, to " "embed that revision information into your files. For more information on " "<command>svnversion</command>, see <xref linkend=\"svn.ref.svnversion\"/>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1739 msgid "" "Subversion 1.2 introduced a new variant of the keyword syntax, which brought " "additional, useful—though perhaps atypical—functionality. You " "can now tell Subversion to maintain a fixed length (in terms of the number " "of bytes consumed) for the substituted keyword. By using a double colon " "(<literal>::</literal>) after the keyword name, followed by a number of " "space characters, you define that fixed width. When Subversion goes to " "substitute your keyword for the keyword and its value, it will essentially " "replace only those space characters, leaving the overall width of the " "keyword field unchanged. If the substituted value is shorter than the " "defined field width, there will be extra padding characters (spaces) at the " "end of the substituted field; if it is too long, it is truncated with a " "special hash (<literal>#</literal>) character just before the final dollar " "sign terminator." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1756 msgid "" "For example, say you have a document in which you have some section of " "tabular data reflecting the document's Subversion keywords. Using the " "original Subversion keyword substitution syntax, your file might look " "something like:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1762 #, no-wrap msgid "" "\n" "$Rev$: Revision of last commit\n" "$Author$: Author of last commit\n" "$Date$: Date of last commit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1768 msgid "" "Now, that looks nice and tabular at the start of things. But when you then " "commit that file (with keyword substitution enabled, of course), you see:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1772 #, no-wrap msgid "" "\n" "$Rev: 12 $: Revision of last commit\n" "$Author: harry $: Author of last commit\n" "$Date: 2006-03-15 02:33:03 -0500 (Wed, 15 Mar 2006) $: Date of last commit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1778 msgid "" "The result is not so beautiful. And you might be tempted to then adjust the " "file after the substitution so that it again looks tabular. But that holds " "only as long as the keyword values are the same width. If the last " "committed revision rolls into a new place value (say, from 99 to 100), or if " "another person with a longer username commits the file, stuff gets all " "crooked again. However, if you are using Subversion 1.2 or later, you can " "use the new fixed-length keyword syntax and define some field widths that " "seem sane, so your file might look like this:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1789 #, no-wrap msgid "" "\n" "$Rev:: $: Revision of last commit\n" "$Author:: $: Author of last commit\n" "$Date:: $: Date of last commit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1795 msgid "" "You commit this change to your file. This time, Subversion notices the new " "fixed-length keyword syntax and maintains the width of the fields as defined " "by the padding you placed between the double colon and the trailing dollar " "sign. After substitution, the width of the fields is completely " "unchanged—the short values for <literal>Rev</literal> and " "<literal>Author</literal> are padded with spaces, and the long " "<literal>Date</literal> field is truncated by a hash character:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1805 #, no-wrap msgid "" "\n" "$Rev:: 13 $: Revision of last commit\n" "$Author:: harry $: Author of last commit\n" "$Date:: 2006-03-15 0#$: Date of last commit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1811 msgid "" "The use of fixed-length keywords is especially handy when performing " "substitutions into complex file formats that themselves use fixed-length " "fields for data, or for which the stored size of a given data field is " "overbearingly difficult to modify from outside the format's native " "application (such as for Microsoft Office documents)." msgstr "" # type: Content of: <chapter><sect1><warning><para> #: ../en/book/ch03-advanced-topics.xml:1819 msgid "" "Be aware that because the width of a keyword field is measured in bytes, the " "potential for corruption of multibyte values exists. For example, a " "username that contains some multibyte UTF-8 characters might suffer " "truncation in the middle of the string of bytes that make up one of those " "characters. The result will be a mere truncation when viewed at the byte " "level, but will likely appear as a string with an incorrect or garbled final " "character when viewed as UTF-8 text. It is conceivable that certain " "applications, when asked to load the file, would notice the broken UTF-8 " "text and deem the entire file corrupt, refusing to operate on the file " "altogether. So, when limiting keywords to a fixed size, choose a size that " "allows for this type of byte-wise expansion." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:1842 msgid "Sparse Directories" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1844 msgid "" "By default, most Subversion operations on directories act in a recursive " "manner. For example, <command>svn checkout</command> creates a working copy " "with every file and directory in the specified area of the repository, " "descending recursively through the repository tree until the entire " "structure is copied to your local disk. Subversion 1.5 introduces a feature " "called <firstterm>sparse directories</firstterm> (or <firstterm>shallow " "checkouts</firstterm>) that allows you to easily check out a working " "copy—or a portion of a working copy—more shallowly than full " "recursion, with the freedom to bring in previously ignored files and " "subdirectories at a later time." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1858 msgid "" "For example, say we have a repository with a tree of files and directories " "with names of the members of a human family with pets. (It's an odd " "example, to be sure, but bear with us.) A regular <command>svn checkout</" "command> operation will give us a working copy of the whole tree:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1864 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos mom\n" "A mom/son\n" "A mom/son/grandson\n" "A mom/daughter\n" "A mom/daughter/granddaughter1\n" "A mom/daughter/granddaughter1/bunny1.txt\n" "A mom/daughter/granddaughter1/bunny2.txt\n" "A mom/daughter/granddaughter2\n" "A mom/daughter/fishie.txt\n" "A mom/kitty1.txt\n" "A mom/doggie1.txt\n" "Checked out revision 1.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1880 msgid "" "Now, let's check out the same tree again, but this time we'll ask Subversion " "to give us only the topmost directory with none of its children at all:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1884 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos mom-empty --depth empty\n" "Checked out revision 1\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1890 msgid "" "Notice that we added to our original <command>svn checkout</command> command " "line a new <option>--depth</option> option. This option is present on many " "of Subversion's subcommands and is similar to the <option>--non-recursive</" "option> (<option>-N</option>) and <option>--recursive</option> (<option>-R</" "option>) options. In fact, it combines, improves upon, supercedes, and " "ultimately obsoletes these two older options. For starters, it expands the " "supported degrees of depth specification available to users, adding some " "previously unsupported (or inconsistently supported) depths. Here are the " "depth values that you can request for a given Subversion operation:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1906 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>--depth empty</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1908 msgid "" "Include only the immediate target of the operation, not any of its file or " "directory children." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1914 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>--depth files</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1916 msgid "" "Include the immediate target of the operation and any of its immediate file " "children." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1922 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>--depth immediates</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1924 msgid "" "Include the immediate target of the operation and any of its immediate file " "or directory children. The directory children will themselves be empty." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch03-advanced-topics.xml:1931 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>--depth infinity</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:1933 msgid "" "Include the immediate target, its file and directory children, its " "children's children, and so on to full recursion." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1941 msgid "" "Of course, merely combining two existing options into one hardly constitutes " "a new feature worthy of a whole section in our book. Fortunately, there is " "more to this story. This idea of depth extends not just to the operations " "you perform with your Subversion client, but also as a description of a " "working copy citizen's <firstterm>ambient depth</firstterm>, which is the " "depth persistently recorded by the working copy for that item. Its key " "strength is this very persistence—the fact that it is " "<firstterm>sticky</firstterm>. The working copy remembers the depth you've " "selected for each item in it until you later change that depth selection; by " "default, Subversion commands operate on the working copy citizens present, " "regardless of their selected depth settings." msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch03-advanced-topics.xml:1956 msgid "" "You can check the recorded ambient depth of a working copy using the " "<command>svn info</command> command. If the ambient depth is anything other " "than infinite recursion, <command>svn info</command> will display a line " "describing that depth value:" msgstr "" # type: Content of: <chapter><sect1><tip><screen> #: ../en/book/ch03-advanced-topics.xml:1962 #, no-wrap msgid "" "\n" "$ svn info mom-immediates | grep '^Depth:'\n" "Depth: immediates\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1969 msgid "" "Our previous examples demonstrated checkouts of infinite depth (the default " "for <command>svn checkout</command>) and empty depth. Let's look now at " "examples of the other depth values:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:1974 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos mom-files --depth files\n" "A mom-files/kitty1.txt\n" "A mom-files/doggie1.txt\n" "Checked out revision 1.\n" "$ svn checkout file:///var/svn/repos mom-immediates --depth immediates\n" "A mom-immediates/son\n" "A mom-immediates/daughter\n" "A mom-immediates/kitty1.txt\n" "A mom-immediates/doggie1.txt\n" "Checked out revision 1.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1988 msgid "" "As described, each of these depths is something more than only the target, " "but something less than full recursion." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:1991 msgid "" "We've used <command>svn checkout</command> as an example here, but you'll " "find the <option>--depth</option> option present on many other Subversion " "commands, too. In those other commands, depth specification is a way to " "limit the scope of an operation to some depth, much like the way the older " "<option>--non-recursive</option> (<option>-N</option>) and <option>--" "recursive</option> (<option>-R</option>) options behave. This means that " "when operating on a working copy of some depth, while requesting an " "operation of a shallower depth, the operation is limited to that shallower " "depth. In fact, we can make an even more general statement: given a working " "copy of any arbitrary—even mixed—ambient depth, and a Subversion " "command with some requested operational depth, the command will maintain the " "ambient depth of the working copy members while still limiting the scope of " "the operation to the requested (or default) operational depth." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2008 msgid "" "In addition to the <option>--depth</option> option, the <command>svn update</" "command> and <command>svn switch</command> subcommands also accept a second " "depth-related option: <option>--set-depth</option>. It is with this option " "that you can change the sticky depth of a working copy item. Watch what " "happens as we take our empty-depth checkout and gradually telescope it " "deeper using <userinput>svn update --set-depth <replaceable>NEW-DEPTH</" "replaceable> <replaceable>TARGET</replaceable></userinput>:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2017 #, no-wrap msgid "" "\n" "$ svn update --set-depth files mom-empty\n" "A mom-empty/kittie1.txt\n" "A mom-empty/doggie1.txt\n" "Updated to revision 1.\n" "$ svn update --set-depth immediates mom-empty\n" "A mom-empty/son\n" "A mom-empty/daughter\n" "Updated to revision 1.\n" "$ svn update --set-depth infinity mom-empty\n" "A mom-empty/son/grandson\n" "A mom-empty/daughter/granddaughter1\n" "A mom-empty/daughter/granddaughter1/bunny1.txt\n" "A mom-empty/daughter/granddaughter1/bunny2.txt\n" "A mom-empty/daughter/granddaughter2\n" "A mom-empty/daughter/fishie1.txt\n" "Updated to revision 1.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2037 msgid "" "As we gradually increased our depth selection, the repository gave us more " "pieces of our tree." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2040 msgid "" "In our example, we operated only on the root of our working copy, changing " "its ambient depth value. But we can independently change the ambient depth " "value of <emphasis>any</emphasis> subdirectory inside the working copy, " "too. Careful use of this ability allows us to flesh out only certain " "portions of the working copy tree, leaving other portions absent altogether " "(hence the <quote>sparse</quote> bit of the feature's name). Here's an " "example of how we might build out a portion of one branch of our family's " "tree, enable full recursion on another branch, and keep still other pieces " "pruned (absent from disk)." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2052 #, no-wrap msgid "" "\n" "$ rm -rf mom-empty\n" "$ svn checkout file:///var/svn/repos mom-empty --depth empty\n" "Checked out revision 1.\n" "$ svn update --set-depth empty mom-empty/son\n" "A mom-empty/son\n" "Updated to revision 1.\n" "$ svn update --set-depth empty mom-empty/daughter\n" "A mom-empty/daughter\n" "Updated to revision 1.\n" "$ svn update --set-depth infinity mom-empty/daughter/granddaughter1\n" "A mom-empty/daughter/granddaughter1\n" "A mom-empty/daughter/granddaughter1/bunny1.txt\n" "A mom-empty/daughter/granddaughter1/bunny2.txt\n" "Updated to revision 1.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2070 msgid "" "Fortunately, having a complex collection of ambient depths in a single " "working copy doesn't complicate the way you interact with that working " "copy. You can still make, revert, display, and commit local modifications " "in your working copy without providing any new options (including <option>--" "depth</option> and <option>--set-depth</option>) to the relevant " "subcommands. Even <command>svn update</command> works as it does elsewhere " "when no specific depth is provided—it updates the working copy targets " "that are present while honoring their sticky depths." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2081 msgid "" "You might at this point be wondering, <quote>So what? When would I use this?" "</quote> One scenario where this feature finds utility is tied to a " "particular repository layout, specifically where you have many related or " "codependent projects or software modules living as siblings in a single " "repository location (<filename>trunk/project1</filename>, <filename>trunk/" "project2</filename>, <filename>trunk/project3</filename>, etc.). In such " "scenarios, it might be the case that you personally care about only a " "handful of those projects—maybe some primary project and a few other " "modules on which it depends. You can check out individual working copies of " "all of these things, but those working copies are disjoint and, as a result, " "it can be cumbersome to perform operations across several or all of them at " "the same time. The alternative is to use the sparse directories feature, " "building out a single working copy that contains only the modules you care " "about. You'd start with an empty-depth checkout of the common parent " "directory of the projects, and then update with infinite depth only the " "items you wish to have, like we demonstrated in the previous example. Think " "of it like an opt-in system for working copy citizens." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2104 msgid "" "Subversion 1.5's implementation of shallow checkouts is good but does not " "support a couple of interesting behaviors. First, you cannot de-telescope a " "working copy item. Running <userinput>svn update --set-depth empty</" "userinput> in an infinite-depth working copy will not have the effect of " "discarding everything but the topmost directory—it will simply error " "out. Second, there is no depth value to indicate that you wish an item to " "be explicitly excluded. You have to do implicit exclusion of an item by " "including everything else." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:2121 msgid "Locking" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2123 msgid "" "Subversion's copy-modify-merge version control model lives and dies on its " "data merging algorithms—specifically on how well those algorithms " "perform when trying to resolve conflicts caused by multiple users modifying " "the same file concurrently. Subversion itself provides only one such " "algorithm: a three-way differencing algorithm that is smart enough to handle " "data at a granularity of a single line of text. Subversion also allows you " "to supplement its content merge processing with external differencing " "utilities (as described in <xref linkend=\"svn.advanced.externaldifftools." "diff3\" />), some of which may do an even better job, perhaps providing " "granularity of a word or a single character of text. But common among those " "algorithms is that they generally work only on text files. The landscape " "starts to look pretty grim when you start talking about content merges of " "nontextual file formats. And when you can't find a tool that can handle " "that type of merging, you begin to run into problems with the copy-modify-" "merge model." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2142 msgid "" "Let's look at a real-life example of where this model runs aground. Harry " "and Sally are both graphic designers working on the same project, a bit of " "marketing collateral for an automobile mechanic. Central to the design of a " "particular poster is an image of a car in need of some bodywork, stored in a " "file using the PNG image format. The poster's layout is almost finished, " "and both Harry and Sally are pleased with the particular photo they chose " "for their damaged car—a baby blue 1967 Ford Mustang with an " "unfortunate bit of crumpling on the left front fender." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2153 msgid "" "Now, as is common in graphic design work, there's a change in plans, which " "causes the car's color to be a concern. So Sally updates her working copy " "to <literal>HEAD</literal>, fires up her photo-editing software, and sets " "about tweaking the image so that the car is now cherry red. Meanwhile, " "Harry, feeling particularly inspired that day, decides that the image would " "have greater impact if the car also appears to have suffered greater " "impact. He, too, updates to <literal>HEAD</literal>, and then draws some " "cracks on the vehicle's windshield. He manages to finish his work before " "Sally finishes hers, and after admiring the fruits of his undeniable talent, " "he commits the modified image. Shortly thereafter, Sally is finished with " "the car's new finish and tries to commit her changes. But, as expected, " "Subversion fails the commit, informing Sally that her version of the image " "is now out of date." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2169 msgid "" "Here's where the difficulty sets in. If Harry and Sally were making changes " "to a text file, Sally would simply update her working copy, receiving " "Harry's changes in the process. In the worst possible case, they would have " "modified the same region of the file, and Sally would have to work out by " "hand the proper resolution to the conflict. But these aren't text " "files—they are binary images. And while it's a simple matter to " "describe what one would expect the results of this content merge to be, " "there is precious little chance that any software exists that is smart " "enough to examine the common baseline image that each of these graphic " "artists worked against, the changes that Harry made, and the changes that " "Sally made, and then spit out an image of a busted-up red Mustang with a " "cracked windshield!" msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:2184 msgid "" "Of course, things would have gone more smoothly if Harry and Sally had " "serialized their modifications to the image—if, say, Harry had waited " "to draw his windshield cracks on Sally's now-red car, or if Sally had " "tweaked the color of a car whose windshield was already cracked. As is " "discussed in <xref linkend=\"svn.basic.vsn-models.copy-merge\" />, most of " "these types of problems go away entirely where perfect communication between " "Harry and Sally exists. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:2193 msgid "" "Communication wouldn't have been such bad medicine for Harry and Sally's " "Hollywood namesakes, either, for that matter." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2196 msgid "" "</footnote> But as one's version control system is, in fact, one form of " "communication, it follows that having that software facilitate the " "serialization of nonparallelizable editing efforts is no bad thing. This is " "where Subversion's implementation of the lock-modify-unlock model steps into " "the spotlight. This is where we talk about Subversion's <firstterm>locking</" "firstterm> feature, which is similar to the <quote>reserved checkouts</" "quote> mechanisms of other version control systems." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2207 msgid "" "Subversion's locking feature exists ultimately to minimize wasted time and " "effort. By allowing a user to programmatically claim the exclusive right to " "change a file in the repository, that user can be reasonably confident that " "any energy he invests on unmergeable changes won't be wasted—his " "commit of those changes will succeed. Also, because Subversion communicates " "to other users that serialization is in effect for a particular versioned " "object, those users can reasonably expect that the object is about to be " "changed by someone else. They, too, can then avoid wasting their time and " "energy on unmergeable changes that won't be committable due to eventual out-" "of-dateness." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:2220 msgid "" "When referring to Subversion's locking feature, one is actually talking " "about a fairly diverse collection of behaviors, which include the ability to " "lock a versioned file <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:2224 msgid "Subversion does not currently allow locks on directories." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2225 msgid "" "</footnote> (claiming the exclusive right to modify the file), to unlock " "that file (yielding that exclusive right to modify), to see reports about " "which files are locked and by whom, to annotate files for which locking " "before editing is strongly advised, and so on. In this section, we'll cover " "all of these facets of the larger locking feature." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar> #: ../en/book/ch03-advanced-topics.xml:2233 #, fuzzy #| msgid "<sidebar id=\"svn.basic.in-action.wc.sb-1\">" msgid "<sidebar id=\"svn.advanced.locking.meanings\">" msgstr "<sidebar id=\"svn.basic.in-action.wc.sb-1\">" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:2234 msgid "The Three Meanings of <quote>Lock</quote>" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2236 msgid "" "In this section, and almost everywhere in this book, the words <quote>lock</" "quote> and <quote>locking</quote> describe a mechanism for mutual exclusion " "between users to avoid clashing commits. Unfortunately, there are two other " "sorts of <quote>lock</quote> with which Subversion, and therefore this book, " "sometimes needs to be concerned." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2243 msgid "" "The second is <firstterm>working copy locks</firstterm>, used internally by " "Subversion to prevent clashes between multiple Subversion clients operating " "on the same working copy. This is the sort of lock indicated by an " "<computeroutput>L</computeroutput> in the third column of <command>svn " "status</command> output, and removed by the <command>svn cleanup</command> " "command, as described in <xref linkend=\"svn.tour.cleanup\"/>." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2252 msgid "" "Third, there are <firstterm>database locks</firstterm>, used internally by " "the Berkeley DB backend to prevent clashes between multiple programs trying " "to access the database. This is the sort of lock whose unwanted persistence " "after an error can cause a repository to be <quote>wedged,</quote> as " "described in <xref linkend=\"svn.reposadmin.maint.recovery\" />." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2260 msgid "" "You can generally forget about these other kinds of locks until something " "goes wrong that requires you to care about them. In this book, <quote>lock</" "quote> means the first sort unless the contrary is either clear from context " "or explicitly stated." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:2270 msgid "Creating Locks" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2272 msgid "" "In the Subversion repository, a <firstterm>lock</firstterm> is a piece of " "metadata that grants exclusive access to one user to change a file. This " "user is said to be the <firstterm>lock owner</firstterm>. Each lock also " "has a unique identifier, typically a long string of characters, known as the " "<firstterm>lock token</firstterm>. The repository manages locks, ultimately " "handling their creation, enforcement, and removal. If any commit " "transaction attempts to modify or delete a locked file (or delete one of the " "parent directories of the file), the repository will demand two pieces of " "information—that the client performing the commit be authenticated as " "the lock owner, and that the lock token has been provided as part of the " "commit process as a form of proof that the client knows which lock it is " "using." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2288 msgid "" "To demonstrate lock creation, let's refer back to our example of multiple " "graphic designers working on the same binary image files. Harry has decided " "to change a JPEG image. To prevent other people from committing changes to " "the file while he is modifying it (as well as alerting them that he is about " "to change it), he locks the file in the repository using the <command>svn " "lock</command> command." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2296 #, no-wrap msgid "" "\n" "$ svn lock banana.jpg -m \"Editing file for tomorrow's release.\"\n" "'banana.jpg' locked by user 'harry'.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2302 msgid "" "The preceding example demonstrates a number of new things. First, notice " "that Harry passed the <option>--message</option> (<option>-m</option>) " "option to <command>svn lock</command>. Similar to <command>svn commit</" "command>, the <command>svn lock</command> command can take comments—" "via either <option>--message</option> (<option>-m</option>) or <option>--" "file</option> (<option>-F</option>)—to describe the reason for locking " "the file. Unlike <command>svn commit</command>, however, <command>svn lock</" "command> will not demand a message by launching your preferred text editor. " "Lock comments are optional, but still recommended to aid communication." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2315 msgid "" "Second, the lock attempt succeeded. This means that the file wasn't already " "locked, and that Harry had the latest version of the file. If Harry's " "working copy of the file had been out of date, the repository would have " "rejected the request, forcing Harry to <command>svn update</command> and " "reattempt the locking command. The locking command would also have failed " "if the file had already been locked by someone else." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2324 msgid "" "As you can see, the <command>svn lock</command> command prints confirmation " "of the successful lock. At this point, the fact that the file is locked " "becomes apparent in the output of the <command>svn status</command> and " "<command>svn info</command> reporting subcommands." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2330 #, no-wrap msgid "" "\n" "$ svn status\n" " K banana.jpg\n" "\n" "$ svn info banana.jpg\n" "Path: banana.jpg\n" "Name: banana.jpg\n" "URL: http://svn.example.com/repos/project/banana.jpg\n" "Repository UUID: edb2f264-5ef2-0310-a47a-87b0ce17a8ec\n" "Revision: 2198\n" "Node Kind: file\n" "Schedule: normal\n" "Last Changed Author: frank\n" "Last Changed Rev: 1950\n" "Last Changed Date: 2006-03-15 12:43:04 -0600 (Wed, 15 Mar 2006)\n" "Text Last Updated: 2006-06-08 19:23:07 -0500 (Thu, 08 Jun 2006)\n" "Properties Last Updated: 2006-06-08 19:23:07 -0500 (Thu, 08 Jun 2006)\n" "Checksum: 3b110d3b10638f5d1f4fe0f436a5a2a5\n" "Lock Token: opaquelocktoken:0c0f600b-88f9-0310-9e48-355b44d4a58e\n" "Lock Owner: harry\n" "Lock Created: 2006-06-14 17:20:31 -0500 (Wed, 14 Jun 2006)\n" "Lock Comment (1 line):\n" "Editing file for tomorrow's release.\n" "\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2357 msgid "" "The fact that the <command>svn info</command> command, which does not " "contact the repository when run against working copy paths, can display the " "lock token reveals an important piece of information about those tokens: " "they are cached in the working copy. The presence of the lock token is " "critical. It gives the working copy authorization to make use of the lock " "later on. Also, the <command>svn status</command> command shows a " "<literal>K</literal> next to the file (short for locKed), indicating that " "the lock token is present." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:2368 msgid "Regarding Lock Tokens" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2370 msgid "" "A lock token isn't an authentication token, so much as an " "<emphasis>authorization</emphasis> token. The token isn't a protected " "secret. In fact, a lock's unique token is discoverable by anyone who runs " "<userinput>svn info <replaceable>URL</replaceable></userinput>. A lock " "token is special only when it lives inside a working copy. It's proof that " "the lock was created in that particular working copy, and not somewhere else " "by some other client. Merely authenticating as the lock owner isn't enough " "to prevent accidents." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2380 msgid "" "For example, suppose you lock a file using a computer at your office, but " "leave work for the day before you finish your changes to that file. It " "should not be possible to accidentally commit changes to that same file from " "your home computer later that evening simply because you've authenticated as " "the lock's owner. In other words, the lock token prevents one piece of " "Subversion-related software from undermining the work of another. (In our " "example, if you really need to change the file from an alternative working " "copy, you would need to <firstterm>break</firstterm> the lock and relock the " "file.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2394 msgid "" "Now that Harry has locked <filename>banana.jpg</filename>, Sally is unable " "to change or delete that file:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2397 #, no-wrap msgid "" "\n" "$ svn delete banana.jpg\n" "D banana.jpg\n" "$ svn commit -m \"Delete useless file.\"\n" "Deleting banana.jpg\n" "svn: Commit failed (details follow):\n" "svn: Server sent unexpected return value (423 Locked) in response to DELETE\\\n" " request for '/repos/project/!svn/wrk/64bad3a9-96f9-0310-818a-df4224ddc35d/\\\n" "banana.jpg'\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2409 msgid "" "But Harry, after touching up the banana's shade of yellow, is able to commit " "his changes to the file. That's because he authenticates as the lock owner " "and also because his working copy holds the correct lock token:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2414 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit -F logmsg\n" #| "Sending sandwich.txt\n" #| "Transmitting file data .\n" #| "Committed revision 4.\n" msgid "" "\n" "$ svn status\n" "M K banana.jpg\n" "$ svn commit -m \"Make banana more yellow\"\n" "Sending banana.jpg\n" "Transmitting file data .\n" "Committed revision 2201.\n" "$ svn status\n" "$\n" msgstr "" "\n" "$ svn commit -F logmsg\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 4.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2425 msgid "" "Notice that after the commit is finished, <command>svn status</command> " "shows that the lock token is no longer present in the working copy. This is " "the standard behavior of <command>svn commit</command>—it searches the " "working copy (or list of targets, if you provide such a list) for local " "modifications and sends all the lock tokens it encounters during this walk " "to the server as part of the commit transaction. After the commit completes " "successfully, all of the repository locks that were mentioned are " "released—<emphasis>even on files that weren't committed</emphasis>. " "This is meant to discourage users from being sloppy about locking or from " "holding locks for too long. If Harry haphazardly locks 30 files in a " "directory named <filename>images</filename> because he's unsure of which " "files he needs to change, yet changes only four of those files, when he runs " "<userinput>svn commit images</userinput>, the process will still release all " "30 locks." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2443 msgid "" "This behavior of automatically releasing locks can be overridden with the " "<option>--no-unlock</option> option to <command>svn commit</command>. This " "is best used for those times when you want to commit changes, but still plan " "to make more changes and thus need to retain existing locks. You can also " "make this your default behavior by setting the <literal>no-unlock</literal> " "runtime configuration option (see <xref linkend=\"svn.advanced.confarea\" /" ">)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2452 msgid "" "Of course, locking a file doesn't oblige one to commit a change to it. The " "lock can be released at any time with a simple <command>svn unlock</command> " "command:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2456 #, no-wrap msgid "" "\n" "$ svn unlock banana.c\n" "'banana.c' unlocked.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:2465 msgid "Discovering Locks" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2467 msgid "" "When a commit fails due to someone else's locks, it's fairly easy to learn " "about them. The easiest way is to run <userinput>svn status --show-updates</" "userinput>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2471 #, no-wrap msgid "" "\n" "$ svn status -u\n" "M 23 bar.c\n" "M O 32 raisin.jpg\n" " * 72 foo.h\n" "Status against revision: 105\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2480 msgid "" "In this example, Sally can see not only that her copy of <filename>foo.h</" "filename> is out of date, but also that one of the two modified files she " "plans to commit is locked in the repository. The <literal>O</literal> " "symbol stands for <quote>Other,</quote> meaning that a lock exists on the " "file and was created by somebody else. If she were to attempt a commit, the " "lock on <filename>raisin.jpg</filename> would prevent it. Sally is left " "wondering who made the lock, when, and why. Once again, <command>svn info</" "command> has the answers:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2491 #, no-wrap msgid "" "\n" "$ svn info http://svn.example.com/repos/project/raisin.jpg\n" "Path: raisin.jpg\n" "Name: raisin.jpg\n" "URL: http://svn.example.com/repos/project/raisin.jpg\n" "Repository UUID: edb2f264-5ef2-0310-a47a-87b0ce17a8ec\n" "Revision: 105\n" "Node Kind: file\n" "Last Changed Author: sally\n" "Last Changed Rev: 32\n" "Last Changed Date: 2006-01-25 12:43:04 -0600 (Sun, 25 Jan 2006)\n" "Lock Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b\n" "Lock Owner: harry\n" "Lock Created: 2006-02-16 13:29:18 -0500 (Thu, 16 Feb 2006)\n" "Lock Comment (1 line):\n" "Need to make a quick tweak to this image.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2510 msgid "" "Just as you can use <command>svn info</command> to examine objects in the " "working copy, you can also use it to examine objects in the repository. If " "the main argument to <command>svn info</command> is a working copy path, " "then all of the working copy's cached information is displayed; any mention " "of a lock means that the working copy is holding a lock token (if a file is " "locked by another user or in another working copy, <command>svn info</" "command> on a working copy path will show no lock information at all). If " "the main argument to <command>svn info</command> is a URL, the information " "reflects the latest version of an object in the repository, and any mention " "of a lock describes the current lock on the object." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2524 msgid "" "So in this particular example, Sally can see that Harry locked the file on " "February 16 to <quote>make a quick tweak.</quote> It being June, she " "suspects that he probably forgot all about the lock. She might phone Harry " "to complain and ask him to release the lock. If he's unavailable, she might " "try to forcibly break the lock herself or ask an administrator to do so." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:2536 msgid "Breaking and Stealing Locks" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2538 msgid "" "A repository lock isn't sacred—in Subversion's default configuration " "state, locks can be released not only by the person who created them, but by " "anyone. When somebody other than the original lock creator destroys a lock, " "we refer to this as <firstterm>breaking the lock</firstterm>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2544 msgid "" "From the administrator's chair, it's simple to break locks. The " "<command>svnlook</command> and <command>svnadmin</command> programs have the " "ability to display and remove locks directly from the repository. (For more " "information about these tools, see <xref linkend=\"svn.reposadmin.maint.tk\"/" ">.)" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2551 #, no-wrap msgid "" "\n" "$ svnadmin lslocks /var/svn/repos\n" "Path: /project2/images/banana.jpg\n" "UUID Token: opaquelocktoken:c32b4d88-e8fb-2310-abb3-153ff1236923\n" "Owner: frank\n" "Created: 2006-06-15 13:29:18 -0500 (Thu, 15 Jun 2006)\n" "Expires: \n" "Comment (1 line):\n" "Still improving the yellow color.\n" "\n" "Path: /project/raisin.jpg\n" "UUID Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b\n" "Owner: harry\n" "Created: 2006-02-16 13:29:18 -0500 (Thu, 16 Feb 2006)\n" "Expires: \n" "Comment (1 line):\n" "Need to make a quick tweak to this image.\n" "\n" "$ svnadmin rmlocks /var/svn/repos /project/raisin.jpg\n" "Removed lock on '/project/raisin.jpg'.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2574 msgid "" "The more interesting option is to allow users to break each other's locks " "over the network. To do this, Sally simply needs to pass the <option>--" "force</option> to the <command>svn unlock</command> command:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2579 #, no-wrap msgid "" "\n" "$ svn status -u\n" "M 23 bar.c\n" "M O 32 raisin.jpg\n" " * 72 foo.h\n" "Status against revision: 105\n" "$ svn unlock raisin.jpg\n" "svn: 'raisin.jpg' is not locked in this working copy\n" "$ svn info raisin.jpg | grep URL\n" "URL: http://svn.example.com/repos/project/raisin.jpg\n" "$ svn unlock http://svn.example.com/repos/project/raisin.jpg\n" "svn: Unlock request failed: 403 Forbidden (http://svn.example.com)\n" "$ svn unlock --force http://svn.example.com/repos/project/raisin.jpg\n" "'raisin.jpg' unlocked.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2596 msgid "" "Now, Sally's initial attempt to unlock failed because she ran <command>svn " "unlock</command> directly on her working copy of the file, and no lock token " "was present. To remove the lock directly from the repository, she needs to " "pass a URL to <command>svn unlock</command>. Her first attempt to unlock " "the URL fails, because she can't authenticate as the lock owner (nor does " "she have the lock token). But when she passes <option>--force</option>, the " "authentication and authorization requirements are ignored, and the remote " "lock is broken." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2607 msgid "" "Simply breaking a lock may not be enough. In the running example, Sally may " "not only want to break Harry's long-forgotten lock, but relock the file for " "her own use. She can accomplish this by using <command>svn unlock</command> " "with <option>--force</option> and then <command>svn lock</command> back-to-" "back, but there's a small chance that somebody else might lock the file " "between the two commands. The simpler thing to do is to <firstterm>steal</" "firstterm> the lock, which involves breaking and relocking the file all in " "one atomic step. To do this, Sally passes the <option>--force</option> " "option to <command>svn lock</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2619 #, no-wrap msgid "" "\n" "$ svn lock raisin.jpg\n" "svn: Lock request failed: 423 Locked (http://svn.example.com)\n" "$ svn lock --force raisin.jpg\n" "'raisin.jpg' locked by user 'sally'.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2627 msgid "" "In any case, whether the lock is broken or stolen, Harry may be in for a " "surprise. Harry's working copy still contains the original lock token, but " "that lock no longer exists. The lock token is said to be " "<firstterm>defunct</firstterm>. The lock represented by the lock token has " "either been broken (no longer in the repository) or stolen (replaced with a " "different lock). Either way, Harry can see this by asking <command>svn " "status</command> to contact the repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2637 #, no-wrap msgid "" "\n" "$ svn status\n" " K raisin.jpg\n" "$ svn status -u\n" " B 32 raisin.jpg\n" "$ svn update\n" " B raisin.jpg\n" "$ svn status\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2648 msgid "" "If the repository lock was broken, then <userinput>svn status --show-" "updates</userinput> displays a <literal>B</literal> (Broken) symbol next to " "the file. If a new lock exists in place of the old one, then a <literal>T</" "literal> (sTolen) symbol is shown. Finally, <command>svn update</command> " "notices any defunct lock tokens and removes them from the working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:2657 #, fuzzy #| msgid "Working Copies" msgid "Locking Policies" msgstr "Arbeitskopien" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2659 msgid "" "Different systems have different notions of how strict a lock should be. " "Some folks argue that locks must be strictly enforced at all costs, " "releasable only by the original creator or administrator. They argue that " "if anyone can break a lock, chaos runs rampant and the whole point of " "locking is defeated. The other side argues that locks are first and " "foremost a communication tool. If users are constantly breaking each " "other's locks, it represents a cultural failure within the team and the " "problem falls outside the scope of software enforcement." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:2670 msgid "" "Subversion defaults to the <quote>softer</quote> approach, but still allows " "administrators to create stricter enforcement policies through the use of " "hook scripts. In particular, the <filename>pre-lock</filename> and " "<filename>pre-unlock</filename> hooks allow administrators to decide when " "lock creation and lock releases are allowed to happen. Depending on whether " "a lock already exists, these two hooks can decide whether to allow a certain " "user to break or steal a lock. The <filename>post-lock</filename> and " "<filename>post-unlock</filename> hooks are also available, and can be used " "to send email after locking actions. To learn more about repository hooks, " "see <xref linkend=\"svn.reposadmin.create.hooks\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:2691 msgid "Lock Communication" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2693 msgid "" "We've seen how <command>svn lock</command> and <command>svn unlock</command> " "can be used to create, release, break, and steal locks. This satisfies the " "goal of serializing commit access to a file. But what about the larger " "problem of preventing wasted time?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2699 msgid "" "For example, suppose Harry locks an image file and then begins editing it. " "Meanwhile, miles away, Sally wants to do the same thing. She doesn't think " "to run <userinput>svn status --show-updates</userinput>, so she has no idea " "that Harry has already locked the file. She spends hours editing the file, " "and when she tries to commit her change, she discovers that either the file " "is locked or that she's out of date. Regardless, her changes aren't " "mergeable with Harry's. One of these two people has to throw away his or " "her work, and a lot of time has been wasted." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2710 msgid "" "Subversion's solution to this problem is to provide a mechanism to remind " "users that a file ought to be locked <emphasis>before</emphasis> the editing " "begins. The mechanism is a special property: <literal>svn:needs-lock</" "literal>. If that property is attached to a file (regardless of its value, " "which is irrelevant), Subversion will try to use filesystem-level " "permissions to make the file read-only—unless, of course, the user has " "explicitly locked the file. When a lock token is present (as a result of " "using <command>svn lock</command>), the file becomes read/write. When the " "lock is released, the file becomes read-only again." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2723 msgid "" "The theory, then, is that if the image file has this property attached, " "Sally would immediately notice something is strange when she opens the file " "for editing: many applications alert users immediately when a read-only file " "is opened for editing, and nearly all would prevent her from saving changes " "to the file. This reminds her to lock the file before editing, whereby she " "discovers the preexisting lock:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:2732 #, no-wrap msgid "" "\n" "$ /usr/local/bin/gimp raisin.jpg\n" "gimp: error: file is read-only!\n" "$ ls -l raisin.jpg\n" "-r--r--r-- 1 sally sally 215589 Jun 8 19:23 raisin.jpg\n" "$ svn lock raisin.jpg\n" "svn: Lock request failed: 423 Locked (http://svn.example.com)\n" "$ svn info http://svn.example.com/repos/project/raisin.jpg | grep Lock\n" "Lock Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b\n" "Lock Owner: harry\n" "Lock Created: 2006-06-08 07:29:18 -0500 (Thu, 08 June 2006)\n" "Lock Comment (1 line):\n" "Making some tweaks. Locking for the next two hours.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch03-advanced-topics.xml:2749 msgid "" "Users and administrators alike are encouraged to attach the <literal>svn:" "needs-lock</literal> property to any file that cannot be contextually " "merged. This is the primary technique for encouraging good locking habits " "and preventing wasted effort." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:2756 msgid "" "Note that this property is a communication tool that works independently " "from the locking system. In other words, any file can be locked, whether or " "not this property is present. And conversely, the presence of this property " "doesn't make the repository require a lock when committing." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch03-advanced-topics.xml:2763 msgid "" "Unfortunately, the system isn't flawless. It's possible that even when a " "file has the property, the read-only reminder won't always work. Sometimes " "applications misbehave and <quote>hijack</quote> the read-only file, " "silently allowing users to edit and save the file anyway. There's not much " "that Subversion can do in this situation—at the end of the day, " "there's simply no substitution for good interpersonal communication. " "<footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:2772 msgid "Except, perhaps, a classic Vulcan mind-meld." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:2784 msgid "Externals Definitions" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2786 msgid "" "Sometimes it is useful to construct a working copy that is made out of a " "number of different checkouts. For example, you may want different " "subdirectories to come from different locations in a repository or perhaps " "from different repositories altogether. You could certainly set up such a " "scenario by hand—using <command>svn checkout</command> to create the " "sort of nested working copy structure you are trying to achieve. But if " "this layout is important for everyone who uses your repository, every other " "user will need to perform the same checkout operations that you did." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2797 msgid "" "Fortunately, Subversion provides support for <firstterm>externals " "definitions</firstterm>. An externals definition is a mapping of a local " "directory to the URL—and ideally a particular revision—of a " "versioned directory. In Subversion, you declare externals definitions in " "groups using the <literal>svn:externals</literal> property. You can create " "or modify this property using <command>svn propset</command> or <command>svn " "propedit</command> (see <xref linkend=\"svn.advanced.props.manip\" />). It " "can be set on any versioned directory, and its value describes both the " "external repository location and the client-side directory to which that " "location should be checked out." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2810 msgid "" "The convenience of the <literal>svn:externals</literal> property is that " "once it is set on a versioned directory, everyone who checks out a working " "copy with that directory also gets the benefit of the externals definition. " "In other words, once one person has made the effort to define the nested " "working copy structure, no one else has to bother—Subversion will, " "after checking out the original working copy, automatically also check out " "the external working copies." msgstr "" # type: Content of: <chapter><sect1><warning><para> #: ../en/book/ch03-advanced-topics.xml:2820 msgid "" "The relative target subdirectories of externals definitions <emphasis>must " "not</emphasis> already exist on your or other users' systems—" "Subversion will create them when it checks out the external working copy." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2826 msgid "" "You also get in the externals definition design all the regular benefits of " "Subversion properties. The definitions are versioned. If you need to " "change an externals definition, you can do so using the regular property " "modification subcommands. When you commit a change to the <literal>svn:" "externals</literal> property, Subversion will synchronize the checked-out " "items against the changed externals definition when you next run " "<userinput>svn update</userinput>. The same thing will happen when others " "update their working copies and receive your changes to the externals " "definition." msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch03-advanced-topics.xml:2838 msgid "" "Because the <literal>svn:externals</literal> property has a multiline value, " "we strongly recommend that you use <command>svn propedit</command> instead " "of <command>svn propset</command>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2844 msgid "" "Subversion releases prior to 1.5 honor an externals definition format that " "is a multiline table of subdirectories (relative to the versioned directory " "on which the property is set), optional revision flags, and fully qualified, " "absolute Subversion repository URLs. An example of this might looks as " "follows:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2851 #, no-wrap msgid "" "\n" "$ svn propget svn:externals calc\n" "third-party/sounds http://svn.example.com/repos/sounds\n" "third-party/skins -r148 http://svn.example.com/skinproj\n" "third-party/skins/toolkit -r21 http://svn.example.com/skin-maker\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2858 msgid "" "When someone checks out a working copy of the <filename>calc</filename> " "directory referred to in the previous example, Subversion also continues to " "check out the items found in its externals definition." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2863 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.example.com/repos/calc\n" "A calc\n" "A calc/Makefile\n" "A calc/integer.c\n" "A calc/button.c\n" "Checked out revision 148.\n" "\n" "Fetching external item into calc/third-party/sounds\n" "A calc/third-party/sounds/ding.ogg\n" "A calc/third-party/sounds/dong.ogg\n" "A calc/third-party/sounds/clang.ogg\n" "…\n" "A calc/third-party/sounds/bang.ogg\n" "A calc/third-party/sounds/twang.ogg\n" "Checked out revision 14.\n" "\n" "Fetching external item into calc/third-party/skins\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2884 msgid "" "As of Subversion 1.5, though, a new format of the <literal>svn:externals</" "literal> property is supported. Externals definitions are still multiline, " "but the order and format of the various pieces of information have changed. " "The new syntax more closely mimics the order of arguments you might pass to " "<command>svn checkout</command>: the optional revision flags come first, " "then the external Subversion repository URL, and finally the relative local " "subdirectory. Notice, though, that this time we didn't say <quote>fully " "qualified, absolute Subversion repository URLs.</quote> That's because the " "new format supports relative URLs and URLs that carry peg revisions. The " "previous example of an externals definition might, in Subversion 1.5, look " "like the following:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2898 #, no-wrap msgid "" "\n" "$ svn propget svn:externals calc\n" " http://svn.example.com/repos/sounds third-party/sounds\n" "-r148 http://svn.example.com/skinproj third-party/skins\n" "-r21 http://svn.example.com/skin-maker third-party/skins/toolkit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2905 msgid "" "Or, making use of the peg revision syntax (which we describe in detail in " "<xref linkend=\"svn.advanced.pegrevs\" />), it might appear as:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2909 #, no-wrap msgid "" "\n" "$ svn propget svn:externals calc\n" "http://svn.example.com/repos/sounds third-party/sounds\n" "http://svn.example.com/skinproj@148 third-party/skins\n" "http://svn.example.com/skin-maker@21 third-party/skins/toolkit\n" msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch03-advanced-topics.xml:2917 msgid "" "You should seriously consider using explicit revision numbers in all of your " "externals definitions. Doing so means that you get to decide when to pull " "down a different snapshot of external information, and exactly which " "snapshot to pull. Besides avoiding the surprise of getting changes to third-" "party repositories that you might not have any control over, using explicit " "revision numbers also means that as you backdate your working copy to a " "previous revision, your externals definitions will also revert to the way " "they looked in that previous revision, which in turn means that the external " "working copies will be updated to match the way <emphasis>they</emphasis> " "looked back when your repository was at that previous revision. For " "software projects, this could be the difference between a successful and a " "failed build of an older snapshot of your complex codebase." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2934 msgid "" "For most repositories, these three ways of formatting the externals " "definitions have the same ultimate effect. They all bring the same " "benefits. Unfortunately, they all bring the same annoyances, too. Since " "the definitions shown use absolute URLs, moving or copying a directory to " "which they are attached will not affect what gets checked out as an external " "(though the relative local target subdirectory will, of course, move with " "the renamed directory). This can be confusing—even frustrating—" "in certain situations. For example, say you have a top-level directory " "named <filename>my-project</filename>, and you've created an externals " "definition on one of its subdirectories (<filename>my-project/some-dir</" "filename>) that tracks the latest revision of another of its subdirectories " "(<filename>my-project/external-dir</filename>)." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2950 #, no-wrap msgid "" "\n" "$ svn checkout http://svn.example.com/projects .\n" "A my-project\n" "A my-project/some-dir\n" "A my-project/external-dir\n" "…\n" "Fetching external item into 'my-project/some-dir/subdir'\n" "Checked out external at revision 11.\n" "\n" "Checked out revision 11.\n" "$ svn propget svn:externals my-project/some-dir\n" "subdir http://svn.example.com/projects/my-project/external-dir\n" "\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2966 msgid "" "Now you use <command>svn move</command> to rename the <filename>my-project</" "filename> directory. At this point, your externals definition will still " "refer to a path under the <filename>my-project</filename> directory, even " "though that directory no longer exists." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:2972 #, no-wrap msgid "" "\n" "$ svn move -q my-project renamed-project\n" "$ svn commit -m \"Rename my-project to renamed-project.\"\n" "Deleting my-project\n" "Adding renamed-project\n" "\n" "Committed revision 12.\n" "$ svn update\n" "\n" "Fetching external item into 'renamed-project/some-dir/subdir'\n" "svn: Target path does not exist\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:2986 msgid "" "Also, absolute URLs can cause problems with repositories that are available " "via multiple URL schemes. For example, if your Subversion server is " "configured to allow everyone to check out the repository over " "<literal>http://</literal> or <literal>https://</literal>, but only allow " "commits to come in via <literal>https://</literal>, you have an interesting " "problem on your hands. If your externals definitions use the " "<literal>http://</literal> form of the repository URLs, you won't be able to " "commit anything from the working copies created by those externals. On the " "other hand, if they use the <literal>https://</literal> form of the URLs, " "anyone who might be checking out via <literal>http://</literal> because his " "client doesn't support <literal>https://</literal> will be unable to fetch " "the external items. Be aware, too, that if you need to reparent your " "working copy (using <command>svn switch</command> with the <option>--" "relocate</option> option), externals definitions will <emphasis>not</" "emphasis> also be reparented." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3004 msgid "" "Subversion 1.5 takes a huge step in relieving these frustrations. As " "mentioned earlier, the URLs used in the new externals definition format can " "be relative, and Subversion provides syntax magic for specifying multiple " "flavors of URL relativity." msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch03-advanced-topics.xml:3012 msgid "../" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3013 msgid "" "Relative to the URL of the directory on which the <literal>svn:externals</" "literal> property is set" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch03-advanced-topics.xml:3018 msgid "^/" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3019 msgid "" "Relative to the root of the repository in which the <literal>svn:externals</" "literal> property is versioned" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch03-advanced-topics.xml:3024 msgid "//" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3025 msgid "" "Relative to the scheme of the URL of the directory on which the <literal>svn:" "externals</literal> property is set" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch03-advanced-topics.xml:3030 msgid "/" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3031 msgid "" "Relative to the root URL of the server on which the <literal>svn:externals</" "literal> property is versioned" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3037 msgid "" "So, looking a fourth time at our previous externals definition example, and " "making use of the new absolute URL syntax in various ways, we might now see:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3041 #, no-wrap msgid "" "\n" "$ svn propget svn:externals calc\n" "^/sounds third-party/sounds\n" "/skinproj@148 third-party/skins\n" "//svn.example.com/skin-maker@21 third-party/skins/toolkit\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3048 msgid "" "The support that exists for externals definitions in Subversion remains less " "than ideal, though. An externals definition can point only to directories, " "not to files. Also, the local subdirectory part of the definition cannot " "contain <literal>..</literal> parent directory indicators (such as " "<filename>../../skins/myskin</filename>). Perhap most disappointingly, the " "working copies created via the externals definition support are still " "disconnected from the primary working copy (on whose versioned directories " "the <literal>svn:externals</literal> property was actually set). And " "Subversion still truly operates only on nondisjoint working copies. So, for " "example, if you want to commit changes that you've made in one or more of " "those external working copies, you must run <command>svn commit</command> " "explicitly on those working copies—committing on the primary working " "copy will not recurse into any external ones." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3065 msgid "" "We've already mentioned some of the additional shortcomings of the old " "<literal>svn:externals</literal> format and how the new Subversion 1.5 " "format improves upon it. But be careful when making use of the new format " "that you don't inadvertently cause problems for other folks accessing your " "repository who are using older Subversion clients. While Subversion 1.5 " "clients will continue to recognize and support the original externals " "definition format, older clients will <emphasis>not</emphasis> be able to " "correctly parse the new format." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3075 msgid "" "Besides the <command>svn checkout</command>, <command>svn update</command>, " "<command>svn switch</command>, and <command>svn export</command> commands " "which actually manage the <firstterm>disjoint</firstterm> (or disconnected) " "subdirectories into which externals are checked out, the <command>svn " "status</command> command also recognizes externals definitions. It displays " "a status code of <literal>X</literal> for the disjoint external " "subdirectories, and then recurses into those subdirectories to display the " "status of the external items themselves. You can pass the <option>--ignore-" "externals</option> option to any of these subcommands to disable externals " "definition processing." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:3094 msgid "Peg and Operative Revisions" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3096 msgid "" "We copy, move, rename, and completely replace files and directories on our " "computers all the time. And your version control system shouldn't get in " "the way of your doing these things with your version-controlled files and " "directories, either. Subversion's file management support is quite " "liberating, affording almost as much flexibility for versioned files as " "you'd expect when manipulating your unversioned ones. But that flexibility " "means that across the lifetime of your repository, a given versioned object " "might have many paths, and a given path might represent several entirely " "different versioned objects. This introduces a certain level of complexity " "to your interactions with those paths and objects." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3110 msgid "" "Subversion is pretty smart about noticing when an object's version history " "includes such <quote>changes of address.</quote> For example, if you ask for " "the revision history log of a particular file that was renamed last week, " "Subversion happily provides all those logs—the revision in which the " "rename itself happened, plus the logs of relevant revisions both before and " "after that rename. So, most of the time, you don't even have to think about " "such things. But occasionally, Subversion needs your help to clear up " "ambiguities." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3120 msgid "" "The simplest example of this occurs when a directory or file is deleted from " "version control, and then a new directory or file is created with the same " "name and added to version control. The thing you deleted and the thing you " "later added aren't the same thing. They merely happen to have had the same " "path—<filename>/trunk/object</filename>, for example. What, then, " "does it mean to ask Subversion about the history of <filename>/trunk/object</" "filename>? Are you asking about the thing currently at that location, or the " "old thing you deleted from that location? Are you asking about the " "operations that have happened to <emphasis>all</emphasis> the objects that " "have ever lived at that path? Subversion needs a hint about what you really " "want." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:3134 msgid "" "And thanks to moves, versioned object history can get far more twisted than " "even that. For example, you might have a directory named <filename>concept</" "filename>, containing some nascent software project you've been toying " "with. Eventually, though, that project matures to the point that the idea " "seems to actually have some wings, so you do the unthinkable and decide to " "give the project a name. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:3142 msgid "" "<quote>You're not supposed to name it. Once you name it, you start getting " "attached to it.</quote>—Mike Wazowski" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3145 msgid "" "</footnote> Let's say you called your software Frabnaggilywort. At this " "point, it makes sense to rename the directory to reflect the project's new " "name, so <filename>concept</filename> is renamed to " "<filename>frabnaggilywort</filename>. Life goes on, Frabnaggilywort " "releases a 1.0 version and is downloaded and used daily by hordes of people " "aiming to improve their lives." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3154 msgid "" "It's a nice story, really, but it doesn't end there. Entrepreneur that you " "are, you've already got another think in the tank. So you make a new " "directory, <filename>concept</filename>, and the cycle begins again. In " "fact, the cycle begins again many times over the years, each time starting " "with that old <filename>concept</filename> directory, then sometimes seeing " "that directory renamed as the idea cures, sometimes seeing it deleted when " "you scrap the idea. Or, to get really sick, maybe you rename " "<filename>concept</filename> to something else for a while, but later rename " "the thing back to <filename>concept</filename> for some reason." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3167 msgid "" "In scenarios like these, attempting to instruct Subversion to work with " "these reused paths can be a little like instructing a motorist in Chicago's " "West Suburbs to drive east down Roosevelt Road and turn left onto Main " "Street. In a mere 20 minutes, you can cross <quote>Main Street</quote> in " "Wheaton, Glen Ellyn, and Lombard. And no, they aren't the same street. Our " "motorist—and our Subversion—need a little more detail to do the " "right thing." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3176 msgid "" "In version 1.1, Subversion introduced a way for you to tell it exactly which " "Main Street you meant. It's called the <firstterm>peg revision</firstterm>, " "and it is provided to Subversion for the sole purpose of identifying a " "unique line of history. Because at most, one versioned object may occupy a " "path at any given time—or, more precisely, in any one revision—" "the combination of a path and a peg revision is all that is needed to refer " "to a specific line of history. Peg revisions are specified to the " "Subversion command-line client using <firstterm>at syntax</firstterm>, so " "called because the syntax involves appending an <quote>at sign</quote> " "(<literal>@</literal>) and the peg revision to the end of the path with " "which the revision is associated." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:3190 msgid "" "But what of the <option>--revision</option> (<option>-r</option>) of which " "we've spoken so much in this book? That revision (or set of revisions) is " "called the <firstterm>operative revision</firstterm> (or " "<firstterm>operative revision range</firstterm>). Once a particular line of " "history has been identified using a path and peg revision, Subversion " "performs the requested operation using the operative revision(s). To map " "this to our Chicagoland streets analogy, if we are told to go to 606 N. Main " "Street in Wheaton, <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:3201 msgid "" "606 N. Main Street, Wheaton, Illinois, is the home of the Wheaton " "<emphasis>History</emphasis> Center. It seemed appropriate…." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3204 msgid "" "</footnote> we can think of <quote>Main Street</quote> as our path and " "<quote>Wheaton</quote> as our peg revision. These two pieces of information " "identify a unique path that can be traveled (north or south on Main Street), " "and they keep us from traveling up and down the wrong Main Street in search " "of our destination. Now we throw in <quote>606 N.</quote> as our operative " "revision of sorts, and we know <emphasis>exactly</emphasis> where to go." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch03-advanced-topics.xml:3215 msgid "The Peg Revision Algorithm" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:3217 msgid "" "The Subversion command-line client performs the peg revision algorithm any " "time it needs to resolve possible ambiguities in the paths and revisions " "provided to it. Here's an example of such an invocation:" msgstr "" # type: Content of: <chapter><sect1><sidebar><screen> #: ../en/book/ch03-advanced-topics.xml:3222 #, no-wrap msgid "" "\n" "$ svn <replaceable>command</replaceable> -r <replaceable>OPERATIVE-REV</replaceable> item@<replaceable>PEG-REV</replaceable>\n" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:3226 msgid "" "If <replaceable>OPERATIVE-REV</replaceable> is older than <replaceable>PEG-" "REV</replaceable>, the algorithm is as follows:" msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3232 msgid "" "Locate <replaceable>item</replaceable> in the revision identified by " "<replaceable>PEG-REV</replaceable>. There can be only one such object." msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3237 msgid "" "Trace the object's history backwards (through any possible renames) to its " "ancestor in the revision <replaceable>OPERATIVE-REV</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3242 msgid "" "Perform the requested action on that ancestor, wherever it is located, or " "whatever its name might be or might have been at that time." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:3248 msgid "" "But what if <replaceable>OPERATIVE-REV</replaceable> is <emphasis>younger</" "emphasis> than <replaceable>PEG-REV</replaceable>? Well, that adds some " "complexity to the theoretical problem of locating the path in " "<replaceable>OPERATIVE-REV</replaceable>, because the path's history could " "have forked multiple times (thanks to copy operations) between " "<replaceable>PEG-REV</replaceable> and <replaceable>OPERATIVE-REV</" "replaceable>. And that's not all—Subversion doesn't store enough " "information to performantly trace an object's history forward, anyway. So " "the algorithm is a little different:" msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3262 msgid "" "Locate <replaceable>item</replaceable> in the revision identified by " "<replaceable>OPERATIVE-REV</replaceable>. There can be only one such object." msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3267 msgid "" "Trace the object's history backward (through any possible renames) to its " "ancestor in the revision <replaceable>PEG-REV</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sidebar><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3272 msgid "" "Verify that the object's location (path-wise) in <replaceable>PEG-REV</" "replaceable> is the same as it is in <replaceable>OPERATIVE-REV</" "replaceable>. If that's the case, at least the two locations are known to " "be directly related, so perform the requested action on the location in " "<replaceable>OPERATIVE-REV</replaceable>. Otherwise, relatedness was not " "established, so error out with a loud complaint that no viable location was " "found. (Someday, we expect that Subversion will be able to handle this " "usage scenario with more flexibility and grace.)" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch03-advanced-topics.xml:3286 msgid "" "Note that even when you don't explicitly supply a peg revision or operative " "revision, they are still present. For your convenience, the default peg " "revision is <literal>BASE</literal> for working copy items and " "<literal>HEAD</literal> for repository URLs. And when no operative revision " "is provided, it defaults to being the same revision as the peg revision." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3296 msgid "" "Say that long ago we created our repository, and in revision 1 we added our " "first <filename>concept</filename> directory, plus an <filename>IDEA</" "filename> file in that directory talking about the concept. After several " "revisions in which real code was added and tweaked, we, in revision 20, " "renamed this directory to <filename>frabnaggilywort</filename>. By revision " "27, we had a new concept, a new <filename>concept</filename> directory to " "hold it, and a new <filename>IDEA</filename> file to describe it. And then " "five years and thousands of revisions flew by, just like they would in any " "good romance story." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3307 msgid "" "Now, years later, we wonder what the <filename>IDEA</filename> file looked " "like back in revision 1. But Subversion needs to know whether we are asking " "about how the <emphasis>current</emphasis> file looked back in revision 1, " "or whether we are asking for the contents of whatever file lived at " "<filename>concepts/IDEA</filename> in revision 1. Certainly those questions " "have different answers, and because of peg revisions, you can ask those " "questions. To find out how the current <filename>IDEA</filename> file " "looked in that old revision, you run:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3318 #, no-wrap msgid "" "\n" "$ svn cat -r 1 concept/IDEA \n" "svn: Unable to find repository location for 'concept/IDEA' in revision 1\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3323 msgid "" "Of course, in this example, the current <filename>IDEA</filename> file " "didn't exist yet in revision 1, so Subversion gives an error. The previous " "command is shorthand for a longer notation which explicitly lists a peg " "revision. The expanded notation is:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3329 #, no-wrap msgid "" "\n" "$ svn cat -r 1 concept/IDEA@BASE\n" "svn: Unable to find repository location for 'concept/IDEA' in revision 1\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3334 msgid "And when executed, it has the expected results." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3336 msgid "" "The perceptive reader is probably wondering at this point whether the peg " "revision syntax causes problems for working copy paths or URLs that actually " "have at signs in them. After all, how does <command>svn</command> know " "whether <literal>news@11</literal> is the name of a directory in my tree or " "just a syntax for <quote>revision 11 of <filename>news</filename></quote>? " "Thankfully, while <command>svn</command> will always assume the latter, " "there is a trivial workaround. You need only append an at sign to the end " "of the path, such as <literal>news@11@</literal>. <command>svn</command> " "cares only about the last at sign in the argument, and it is not considered " "illegal to omit a literal peg revision specifier after that at sign. This " "workaround even applies to paths that end in an at sign—you would use " "<literal>filename@@</literal> to talk about a file named " "<filename>filename@</filename>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3353 msgid "" "Let's ask the other question, then—in revision 1, what were the " "contents of whatever file occupied the address <filename>concepts/IDEA</" "filename> at the time? We'll use an explicit peg revision to help us out." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3358 #, no-wrap msgid "" "\n" "$ svn cat concept/IDEA@1\n" "The idea behind this project is to come up with a piece of software\n" "that can frab a naggily wort. Frabbing naggily worts is tricky\n" "business, and doing it incorrectly can have serious ramifications, so\n" "we need to employ over-the-top input validation and data verification\n" "mechanisms.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3367 msgid "" "Notice that we didn't provide an operative revision this time. That's " "because when no operative revision is specified, Subversion assumes a " "default operative revision that's the same as the peg revision." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3372 msgid "" "As you can see, the output from our operation appears to be correct. The " "text even mentions frabbing naggily worts, so this is almost certainly the " "file that describes the software now called Frabnaggilywort. In fact, we " "can verify this using the combination of an explicit peg revision and " "explicit operative revision. We know that in <literal>HEAD</literal>, the " "Frabnaggilywort project is located in the <filename>frabnaggilywort</" "filename> directory. So we specify that we want to see how the line of " "history identified in <literal>HEAD</literal> as the path " "<filename>frabnaggilywort/IDEA</filename> looked in revision 1." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3385 #, no-wrap msgid "" "\n" "$ svn cat -r 1 frabnaggilywort/IDEA@HEAD\n" "The idea behind this project is to come up with a piece of software\n" "that can frab a naggily wort. Frabbing naggily worts is tricky\n" "business, and doing it incorrectly can have serious ramifications, so\n" "we need to employ over-the-top input validation and data verification\n" "mechanisms.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3394 msgid "" "And the peg and operative revisions need not be so trivial, either. For " "example, say <filename>frabnaggilywort</filename> had been deleted from " "<literal>HEAD</literal>, but we know it existed in revision 20, and we want " "to see the diffs for its <filename>IDEA</filename> file between revisions 4 " "and 10. We can use the peg revision 20 in conjunction with the URL that " "would have held Frabnaggilywort's <filename>IDEA</filename> file in revision " "20, and then use 4 and 10 as our operative revision range." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch03-advanced-topics.xml:3404 #, no-wrap msgid "" "\n" "$ svn diff -r 4:10 http://svn.red-bean.com/projects/frabnaggilywort/IDEA@20\n" "Index: frabnaggilywort/IDEA\n" "===================================================================\n" "--- frabnaggilywort/IDEA\t(revision 4)\n" "+++ frabnaggilywort/IDEA\t(revision 10)\n" "@@ -1,5 +1,5 @@\n" "-The idea behind this project is to come up with a piece of software\n" "-that can frab a naggily wort. Frabbing naggily worts is tricky\n" "-business, and doing it incorrectly can have serious ramifications, so\n" "-we need to employ over-the-top input validation and data verification\n" "-mechanisms.\n" "+The idea behind this project is to come up with a piece of\n" "+client-server software that can remotely frab a naggily wort.\n" "+Frabbing naggily worts is tricky business, and doing it incorrectly\n" "+can have serious ramifications, so we need to employ over-the-top\n" "+input validation and data verification mechanisms.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3423 msgid "" "Fortunately, most folks aren't faced with such complex situations. But when " "you are, remember that peg revisions are that extra hint Subversion needs to " "clear up ambiguity." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:3433 msgid "Changelists" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3435 msgid "" "It is commonplace for a developer to find himself working at any given time " "on multiple different, distinct changes to a particular bit of source code. " "This isn't necessarily due to poor planning or some form of digital " "masochism. A software engineer often spots bugs in his peripheral vision " "while working on some nearby chunk of source code. Or perhaps he's halfway " "through some large change when he realizes the solution he's working on is " "best committed as several smaller logical units. Often, these logical units " "aren't nicely contained in some module, safely separated from other " "changes. The units might overlap, modifying different files in the same " "module, or even modifying different lines in the same file." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3448 msgid "" "developers can employ various work methodologies to keep these logical " "changes organized. Some use separate working copies of the same repository " "to hold each individual change in progress. Others might choose to create " "short-lived feature branches in the repository and use a single working copy " "that is constantly switched to point to one such branch or another. Still " "others use <command>diff</command> and <command>patch</command> tools to " "back up and restore uncommitted changes to and from patch files associated " "with each change. Each of these methods has its pros and cons, and to a " "large degree, the details of the changes being made heavily influence the " "methodology used to distinguish them." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3461 msgid "" "Subversion 1.5 brings a new <firstterm>changelists</firstterm> feature that " "adds yet another method to the mix. Changelists are basically arbitrary " "labels applied to working copy files for the express purpose of associating " "multiple files together. Users of many of Google's software offerings are " "familiar with this concept already. For example, <ulink url=\"http://mail." "google.com/\">Gmail</ulink> doesn't provide the traditional folders-based " "email organization mechanism. In Gmail, you apply arbitrary labels to " "emails, and multiple emails can be said to be part of the same group if they " "happen to share a particular label. Viewing only a group of similarly " "labeled emails then becomes a simple user interface trick. Many other Web " "2.0 sites have similar mechanisms—consider the <quote>tags</quote> " "used by sites such as <ulink url=\"http://www.youtube.com/\">YouTube</ulink> " "and <ulink url=\"http://www.flickr.com/\">Flickr</ulink>, <quote>categories</" "quote> applied to blog posts, and so on. Folks understand today that " "organization of data is critical, but that how that data is organized needs " "to be a flexible concept. The old files-and-folders paradigm is too rigid " "for some applications." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3483 msgid "" "Subversion's changelist support allows you to create changelists by applying " "labels to files you want to be associated with that changelist, remove those " "labels, and limit the scope of the files on which its subcommands operate to " "only those bearing a particular label. In this section, we'll look in " "detail at how to do these things." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:3492 msgid "Creating and Modifying Changelists" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3494 msgid "" "You can create, modify, and delete changelists using the <command>svn " "changelist</command> command. More accurately, you use this command to set " "or unset the changelist association of a particular working copy file. A " "changelist is effectively created the first time you label a file with that " "changelist; it is deleted when you remove that label from the last file that " "had it. Let's examine a usage scenario that demonstrates these concepts." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3503 msgid "" "Harry is fixing some bugs in the calculator application's mathematics " "logic. His work leads him to change a couple of files:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3507 #, no-wrap msgid "" "\n" "$ svn status\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3514 msgid "" "While testing his bug fix, Harry notices that his changes bring to light a " "tangentially related bug in the user interface logic found in " "<filename>button.c</filename>. Harry decides that he'll go ahead and fix " "that bug, too, as a separate commit from his math fixes. Now, in a small " "working copy with only a handful of files and few logical changes, Harry can " "probably keep his two logical change groupings mentally organized without " "any problem. But today he's going to use Subversion's changelists feature " "as a special favor to the authors of this book." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3525 msgid "" "Harry first creates a changelist and associates with it the two files he's " "already changed. He does this by using the <command>svn changelist</" "command> command to assign the same arbitrary changelist name to those files:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3530 #, no-wrap msgid "" "\n" "$ svn changelist math-fixes integer.c mathops.c\n" "Path 'integer.c' is now a member of changelist 'math-fixes'.\n" "Path 'mathops.c' is now a member of changelist 'math-fixes'.\n" "$ svn status\n" "\n" "--- Changelist 'math-fixes':\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3542 msgid "" "As you can see, the output of <command>svn status</command> reflects this " "new grouping." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3545 msgid "" "Harry now sets off to fix the secondary UI problem. Since he knows which " "file he'll be changing, he assigns that path to a changelist, too. " "Unfortunately, Harry carelessly assigns this third file to the same " "changelist as the previous two files:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3550 #, no-wrap msgid "" "\n" "$ svn changelist math-fixes button.c\n" "Path 'button.c' is now a member of changelist 'math-fixes'.\n" "$ svn status\n" "\n" "--- Changelist 'math-fixes':\n" " button.c\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3562 msgid "" "Fortunately, Harry catches his mistake. At this point, he has two options. " "He can remove the changelist association from <filename>button.c</filename>, " "and then assign a different changelist name:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3567 #, no-wrap msgid "" "\n" "$ svn changelist --remove button.c\n" "Path 'button.c' is no longer a member of a changelist.\n" "$ svn changelist ui-fix button.c\n" "Path 'button.c' is now a member of changelist 'ui-fix'.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3575 msgid "" "Or, he can skip the removal and just assign a new changelist name. In this " "case, Subversion will first warn Harry that <filename>button.c</filename> is " "being removed from the first changelist:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3580 #, no-wrap msgid "" "\n" "$ svn changelist ui-fix button.c\n" "svn: warning: Removing 'button.c' from changelist 'math-fixes'.\n" "Path 'button.c' is now a member of changelist 'ui-fix'.\n" "$ svn status\n" "\n" "--- Changelist 'ui-fix':\n" " button.c\n" "\n" "--- Changelist 'math-fixes':\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3595 msgid "" "Harry now has two distinct changelists present in his working copy, and " "<command>svn status</command> will group its output according to these " "changelist determinations. Notice that even though Harry hasn't yet " "modified <filename>button.c</filename>, it still shows up in the output of " "<command>svn status</command> as interesting because it has a changelist " "assignment. Changelists can be added to and removed from files at any time, " "regardless of whether they contain local modifications." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3605 msgid "" "Harry now fixes the user interface problem in <filename>button.c</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3608 #, no-wrap msgid "" "\n" "$ svn status\n" "\n" "--- Changelist 'ui-fix':\n" "M button.c\n" "\n" "--- Changelist 'math-fixes':\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:3624 msgid "Changelists As Operation Filters" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3626 msgid "" "The visual grouping that Harry sees in the output of <command>svn status</" "command> as shown in our previous section is nice, but not entirely useful. " "The <command>status</command> command is but one of many operations that he " "might wish to perform on his working copy. Fortunately, many of " "Subversion's other operations understand how to operate on changelists via " "the use of the <option>--changelist</option> option." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3635 msgid "" "When provided with a <option>--changelist</option> option, Subversion " "commands will limit the scope of their operation to only those files to " "which a particular changelist name is assigned. If Harry now wants to see " "the actual changes he's made to the files in his <literal>math-fixes</" "literal> changelist, he <emphasis>could</emphasis> explicitly list only the " "files that make up that changelist on the <command>svn diff</command> " "command line." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3644 #, no-wrap msgid "" "\n" "$ svn diff integer.c mathops.c\n" "Index: integer.c\n" "===================================================================\n" "--- integer.c\t(revision 1157)\n" "+++ integer.c\t(working copy)\n" "…\n" "Index: mathops.c\n" "===================================================================\n" "--- mathops.c\t(revision 1157)\n" "+++ mathops.c\t(working copy)\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3659 msgid "" "That works okay for a few files, but what if Harry's change touched 20 or 30 " "files? That would be an annoyingly long list of explicitly named files. Now " "that he's using changelists, though, Harry can avoid explicitly listing the " "set of files in his changelist from now on, and instead provide just the " "changelist name:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3666 #, no-wrap msgid "" "\n" "$ svn diff --changelist math-fixes\n" "Index: integer.c\n" "===================================================================\n" "--- integer.c\t(revision 1157)\n" "+++ integer.c\t(working copy)\n" "…\n" "Index: mathops.c\n" "===================================================================\n" "--- mathops.c\t(revision 1157)\n" "+++ mathops.c\t(working copy)\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3681 msgid "" "And when it's time to commit, Harry can again use the <option>--changelist</" "option> option to limit the scope of the commit to files in a certain " "changelist. He might commit his user interface fix by doing the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3686 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" #| "Sending button.c\n" #| "Transmitting file data .\n" #| "Committed revision 57.\n" msgid "" "\n" "$ svn ci -m \"Fix a UI bug found while working on math logic.\" \\\n" " --changelist ui-fix\n" "Sending button.c\n" "Transmitting file data .\n" "Committed revision 1158.\n" "$\n" msgstr "" "\n" "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" "Sending button.c\n" "Transmitting file data .\n" "Committed revision 57.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3695 msgid "" "In fact, the <command>svn commit</command> command provides a second " "changelists-related option: <option>--keep-changelists</option>. Normally, " "changelist assignments are removed from files after they are committed. But " "if <option>--keep-changelists</option> is provided, Subversion will leave " "the changelist assignment on the committed (and now unmodified) files. In " "any case, committing files assigned to one changelist leaves other " "changelists undisturbed." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3705 #, no-wrap msgid "" "\n" "$ svn status\n" "\n" "--- Changelist 'math-fixes':\n" "M integer.c\n" "M mathops.c\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch03-advanced-topics.xml:3715 msgid "" "The <option>--changelist</option> option acts only as a filter for " "Subversion command targets, and will not add targets to an operation. For " "example, on a commit operation specified as <userinput>svn commit /path/to/" "dir</userinput>, the target is the directory <filename>/path/to/dir</" "filename> and its children (to infinite depth). If you then add a " "changelist specifier to that command, only those files in and under " "<filename>/path/to/dir</filename> that are assigned that changelist name " "will be considered as targets of the commit—the commit will not " "include files located elsewhere (such is in <filename>/path/to/another-dir</" "filename>), regardless of their changelist assignment, even if they are part " "of the same working copy as the operation's target(s)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3731 msgid "" "Even the <command>svn changelist</command> command accepts the <option>--" "changelist</option> option. This allows you to quickly and easily rename or " "remove a changelist:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3735 #, no-wrap msgid "" "\n" "$ svn changelist math-bugs --changelist math-fixes --depth infinity .\n" "svn: warning: Removing 'integer.c' from changelist 'math-fixes'.\n" "Path 'integer.c' is now a member of changelist 'math-bugs'.\n" "svn: warning: Removing 'mathops.c' from changelist 'math-fixes'.\n" "Path 'mathops.c' is now a member of changelist 'math-bugs'.\n" "$ svn changelist --remove --changelist math-bugs --depth infinity .\n" "Path 'integer.c' is no longer a member of a changelist.\n" "Path 'mathops.c' is no longer a member of a changelist.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3747 msgid "" "Finally, you can specify multiple instances of the <option>--changelist</" "option> option on a single command line. Doing so limits the operation you " "are performing to files found in any of the specified changesets." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:3756 msgid "Changelist Limitations" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3758 msgid "" "Subversion's changelist feature is a handy tool for grouping working copy " "files, but it does have a few limitations. Changelists are artifacts of a " "particular working copy, which means that changelist assignments cannot be " "propagated to the repository or otherwise shared with other users. " "Changelists can be assigned only to files—Subversion doesn't currently " "support the use of changelists with directories. Finally, you can have at " "most one changelist assignment on a given working copy file. Here is where " "the blog post category and photo service tag analogies break down—if " "you find yourself needing to assign a file to multiple changelists, you're " "out of luck." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch03-advanced-topics.xml:3778 msgid "Network Model" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch03-advanced-topics.xml:3780 msgid "" "At some point, you're going to need to understand how your Subversion client " "communicates with its server. Subversion's networking layer is abstracted, " "meaning that Subversion clients exhibit the same general behaviors no matter " "what sort of server they are operating against. Whether speaking the HTTP " "protocol (<literal>http://</literal>) with the Apache HTTP Server or " "speaking the custom Subversion protocol (<literal>svn://</literal>) with " "<command>svnserve</command>, the basic network model is the same. In this " "section, we'll explain the basics of that network model, including how " "Subversion manages authentication and authorization matters." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:3795 msgid "Requests and Responses" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3797 msgid "" "The Subversion client spends most of its time managing working copies. When " "it needs information from a remote repository, however, it makes a network " "request, and the server responds with an appropriate answer. The details of " "the network protocol are hidden from the user—the client attempts to " "access a URL, and depending on the URL scheme, a particular protocol is used " "to contact the server (see the sidebar <xref linkend=\"svn.basic.in-action." "wc.sb-1\"/>)." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch03-advanced-topics.xml:3806 msgid "" "Run <userinput>svn --version</userinput> to see which URL schemes and " "protocols the client knows how to use." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3811 msgid "" "When the server process receives a client request, it often demands that the " "client identify itself. It issues an authentication challenge to the " "client, and the client responds by providing <firstterm>credentials</" "firstterm> back to the server. Once authentication is complete, the server " "responds with the original information that the client asked for. Notice " "that this system is different from systems such as CVS, where the client " "preemptively offers credentials (<quote>logs in</quote>) to the server " "before ever making a request. In Subversion, the server <quote>pulls</" "quote> credentials by challenging the client at the appropriate moment, " "rather than the client <quote>pushing</quote> them. This makes certain " "operations more elegant. For example, if a server is configured to allow " "anyone in the world to read a repository, the server will never issue an " "authentication challenge when a client attempts to <command>svn checkout</" "command>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3828 msgid "" "If the particular network requests issued by the client result in a new " "revision being created in the repository (e.g., <command>svn commit</" "command>), Subversion uses the authenticated username associated with those " "requests as the author of the revision. That is, the authenticated user's " "name is stored as the value of the <literal>svn:author</literal> property on " "the new revision (see <xref linkend=\"svn.ref.properties\"/>). If the " "client was not authenticated (i.e., if the server never issued an " "authentication challenge), the revision's <literal>svn:author</literal> " "property is empty." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch03-advanced-topics.xml:3845 msgid "Client Credentials Caching" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3847 msgid "" "Many servers are configured to require authentication on every request. " "This would be a big annoyance to users if they were forced to type their " "passwords over and over again. Fortunately, the Subversion client has a " "remedy for this—a built-in system for caching authentication " "credentials on disk. By default, whenever the command-line client " "successfully responds to a server's authentication challenge, it saves the " "credentials in the user's private runtime configuration area (<filename>~/." "subversion/auth/</filename> on Unix-like systems or <filename>%APPDATA%/" "Subversion/auth/</filename> on Windows; see <xref linkend=\"svn.advanced." "confarea\" /> for more details about the runtime configuration system). " "Successful credentials are cached on disk and keyed on a combination of the " "server's hostname, port, and authentication realm." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3863 msgid "" "When the client receives an authentication challenge, it first looks for the " "appropriate credentials in the user's disk cache. If seemingly suitable " "credentials are not present, or if the cached credentials ultimately fail to " "authenticate, the client will, by default, fall back to prompting the user " "for the necessary information." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3870 msgid "" "The security-conscious reader will suspect immediately that there is reason " "for concern here. <quote>Caching passwords on disk? That's terrible! You " "should never do that!</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3875 msgid "" "The Subversion developers recognize the legitimacy of such concerns, and so " "Subversion works with available mechanisms provided by the operating system " "and environment to try to minimize the risk of leaking this information. " "Here's a breakdown of what this means for users on the most common platforms:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3885 msgid "" "On Windows 2000 and later, the Subversion client uses standard Windows " "cryptography services to encrypt the password on disk. Because the " "encryption key is managed by Windows and is tied to the user's own login " "credentials, only the user can decrypt the cached password. (Note that if " "the user's Windows account password is reset by an administrator, all of the " "cached passwords become undecipherable. The Subversion client will behave " "as though they don't exist, prompting for passwords when required.)" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3898 msgid "" "Similarly, on Mac OS X, the Subversion client stores all repository " "passwords in the login keyring (managed by the Keychain service), which is " "protected by the user's account password. User preference settings can " "impose additional policies, such as requiring that the user's account " "password be entered each time the Subversion password is used." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:3908 msgid "" "For other Unix-like operating systems, no standard <quote>keychain</quote> " "services exist. However, the <filename>auth/</filename> caching area is " "still permission-protected so that only the user (owner) can read data from " "it, not the world at large. The operating system's own file permissions " "protect the passwords." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3918 msgid "" "Of course, for the truly paranoid, none of these mechanisms meets the test " "of perfection. So for those folks willing to sacrifice convenience for the " "ultimate in security, Subversion provides various ways of disabling its " "credentials caching system altogether." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3924 msgid "" "To disable caching for a single command, pass the <option>--no-auth-cache</" "option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3927 #, no-wrap msgid "" "\n" "$ svn commit -F log_msg.txt --no-auth-cache\n" "Authentication realm: <svn://host.example.com:3690> example realm\n" "Username: joe\n" "Password for 'joe':\n" "\n" "Adding newfile\n" "Transmitting file data .\n" "Committed revision 2324.\n" "\n" "# password was not cached, so a second commit still prompts us\n" "\n" "$ svn delete newfile\n" "$ svn commit -F new_msg.txt\n" "Authentication realm: <svn://host.example.com:3690> example realm\n" "Username: joe\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3946 msgid "" "Or, if you want to disable credential caching permanently, you can edit the " "<filename>config</filename> file in your runtime configuration area and set " "the <option>store-auth-creds</option> option to <literal>no</literal>. This " "will prevent the storing of credentials used in any Subversion interactions " "you perform on the affected computer. This can be extended to cover all " "users on the computer, too, by modifying the system-wide runtime " "configuration area (described in <xref linkend=\"svn.advanced.confarea.layout" "\" />)." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3957 #, no-wrap msgid "" "\n" "[auth]\n" "store-auth-creds = no\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3962 msgid "" "Sometimes users will want to remove specific credentials from the disk " "cache. To do this, you need to navigate into the <filename>auth/</filename> " "area and manually delete the appropriate cache file. Credentials are cached " "in individual files; if you look inside each file, you will see keys and " "values. The <literal>svn:realmstring</literal> key describes the particular " "server realm that the file is associated with:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch03-advanced-topics.xml:3971 #, no-wrap msgid "" "\n" "$ ls ~/.subversion/auth/svn.simple/\n" "5671adf2865e267db74f09ba6f872c28\n" "3893ed123b39500bca8a0b382839198e\n" "5c3c22968347b390f349ff340196ed39\n" "\n" "$ cat ~/.subversion/auth/svn.simple/5671adf2865e267db74f09ba6f872c28\n" "\n" "K 8\n" "username\n" "V 3\n" "joe\n" "K 8\n" "password\n" "V 4\n" "blah\n" "K 15\n" "svn:realmstring\n" "V 45\n" "<https://svn.domain.com:443> Joe's repository\n" "END\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3994 msgid "Once you have located the proper cache file, just delete it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:3997 msgid "" "One last word about <command>svn</command>'s authentication behavior, " "specifically regarding the <option>--username</option> and <option>--" "password</option> options. Many client subcommands accept these options, " "but it is important to understand that using these options does " "<emphasis>not</emphasis> automatically send credentials to the server. As " "discussed earlier, the server <quote>pulls</quote> credentials from the " "client when it deems necessary; the client cannot <quote>push</quote> them " "at will. If a username and/or password are passed as options, they will be " "presented to the server only if the server requests them. These options are " "typically used to authenticate as a different user than Subversion would " "have chosen by default (such as your system login name) or when trying to " "avoid interactive prompting (such as when calling <command>svn</command> " "from a script)." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch03-advanced-topics.xml:4015 msgid "" "A common mistake is to misconfigure a server so that it never issues an " "authentication challenge. When users pass <option>--username</option> and " "<option>--password</option> options to the client, they're surprised to see " "that they're never used; that is, new revisions still appear to have been " "committed anonymously!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:4024 msgid "" "Here is a final summary that describes how a Subversion client behaves when " "it receives an authentication challenge." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:4030 msgid "" "First, the client checks whether the user specified any credentials as " "command-line options (<option>--username</option> and/or <option>--password</" "option>). If so, the client will try to use those credentials to " "authenticate against the server." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:4038 msgid "" "If no command-line credentials were provided, or the provided ones were " "invalid, the client looks up the server's hostname, port, and realm in the " "runtime configuration's <filename>auth/</filename> area, to see whether " "appropriate credentials are cached there. If so, it attempts to use those " "credentials to authenticate." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch03-advanced-topics.xml:4046 msgid "" "Finally, if the previous mechanisms failed to successfully authenticate the " "user against the server, the client resorts to interactively prompting the " "user for valid credentials (unless instructed not to do so via the <option>--" "non-interactive</option> option or its client-specific equivalents)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch03-advanced-topics.xml:4055 msgid "" "If the client successfully authenticates by any of these methods, it will " "attempt to cache the credentials on disk (unless the user has disabled this " "behavior, as mentioned earlier)." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch03-advanced-topics.xml:4070 msgid "" "After reading this chapter, you should have a firm grasp on some of " "Subversion's features that, while perhaps not used <emphasis>every</" "emphasis> time you interact with your version control system, are certainly " "handy to know about. But don't stop here! Read on to the following chapter, " "where you'll learn about branches, tags, and merging. Then you'll have " "nearly full mastery of the Subversion client. Though our lawyers won't " "allow us to promise you anything, this additional knowledge could make you " "measurably more cool. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch03-advanced-topics.xml:4080 msgid "" "No purchase necessary. Certains terms and conditions apply. No guarantee " "of coolness—implicit or otherwise—exists. Mileage may vary." msgstr "" # type: Content of: <chapter><title> #: ../en/book/ch04-branching-and-merging.xml:2 msgid "Branching and Merging" msgstr "" # type: Content of: <chapter><blockquote><attribution> #: ../en/book/ch04-branching-and-merging.xml:5 msgid "Confucius" msgstr "" # type: Content of: <chapter><blockquote><para> #: ../en/book/ch04-branching-and-merging.xml:6 msgid "<quote>君子务本 (It is upon the Trunk that a gentleman works.)</quote>" msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch04-branching-and-merging.xml:11 msgid "" "Branching, tagging, and merging are concepts common to almost all version " "control systems. If you're not familiar with these ideas, we provide a good " "introduction in this chapter. If you are familiar, hopefully you'll find it " "interesting to see how Subversion implements them." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch04-branching-and-merging.xml:17 msgid "" "Branching is a fundamental part of version control. If you're going to " "allow Subversion to manage your data, this is a feature you'll eventually " "come to depend on. This chapter assumes that you're already familiar with " "Subversion's basic concepts (<xref linkend=\"svn.basic\"/>)." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch04-branching-and-merging.xml:28 #, fuzzy #| msgid "What's in a Name?" msgid "What's a Branch?" msgstr "Was steckt in einem Namen?" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:30 msgid "" "Suppose it's your job to maintain a document for a division in your " "company—a handbook of some sort. One day a different division asks " "you for the same handbook, but with a few parts <quote>tweaked</quote> for " "them, since they do things slightly differently." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:36 msgid "" "What do you do in this situation? You do the obvious: make a second copy of " "your document and begin maintaining the two copies separately. As each " "department asks you to make small changes, you incorporate them into one " "copy or the other." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:41 msgid "" "You often want to make the same change to both copies. For example, if you " "discover a typo in the first copy, it's very likely that the same typo " "exists in the second copy. The two documents are almost the same, after " "all; they differ only in small, specific ways." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:47 msgid "" "This is the basic concept of a <firstterm>branch</firstterm>—namely, a " "line of development that exists independently of another line, yet still " "shares a common history if you look far enough back in time. A branch " "always begins life as a copy of something, and moves on from there, " "generating its own history (see <xref linkend=\"svn.branchmerge.whatis.dia-1" "\"/>)." msgstr "" # type: Content of: <chapter><sect1><figure><title> #: ../en/book/ch04-branching-and-merging.xml:56 msgid "Branches of development" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:60 msgid "" "Subversion has commands to help you maintain parallel branches of your files " "and directories. It allows you to create branches by copying your data, and " "remembers that the copies are related to one another. It also helps you " "duplicate changes from one branch to another. Finally, it can make portions " "of your working copy reflect different branches so that you can <quote>mix " "and match</quote> different lines of development in your daily work." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:75 msgid "Using Branches" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:77 msgid "" "At this point, you should understand how each commit creates an entirely new " "filesystem tree (called a <quote>revision</quote>) in the repository. If " "you don't, go back and read about revisions in <xref linkend=\"svn.basic.in-" "action.revs\"/>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:82 msgid "" "For this chapter, we'll go back to the same example from <xref linkend=\"svn." "basic\"/>. Remember that you and your collaborator, Sally, are sharing a " "repository that contains two projects, <filename>paint</filename> and " "<filename>calc</filename>. Notice that in <xref linkend=\"svn.branchmerge." "using.dia-1\"/>, however, each project directory now contains subdirectories " "named <filename>trunk</filename> and <filename>branches</filename>. The " "reason for this will soon become clear." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:93 #, fuzzy #| msgid "Recommended Repository Layout" msgid "Starting repository layout" msgstr "Empfohlene Repository Aufteilung" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:97 msgid "" "As before, assume that Sally and you both have working copies of the " "<quote>calc</quote> project. Specifically, you each have a working copy of " "<filename>/calc/trunk</filename>. All the files for the project are in this " "subdirectory rather than in <filename>/calc</filename> itself, because your " "team has decided that <filename>/calc/trunk</filename> is where the " "<quote>main line</quote> of development is going to take place." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:106 msgid "" "Let's say that you've been given the task of implementing a large software " "feature. It will take a long time to write, and will affect all the files " "in the project. The immediate problem is that you don't want to interfere " "with Sally, who is in the process of fixing small bugs here and there. " "She's depending on the fact that the latest version of the project (in " "<filename>/calc/trunk</filename>) is always usable. If you start committing " "your changes bit by bit, you'll surely break things for Sally (and other " "team members as well)." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:116 msgid "" "One strategy is to crawl into a hole: you and Sally can stop sharing " "information for a week or two. That is, start gutting and reorganizing all " "the files in your working copy, but don't commit or update until you're " "completely finished with the task. There are a number of problems with " "this, though. First, it's not very safe. Most people like to save their " "work to the repository frequently, should something bad accidentally happen " "to their working copy. Second, it's not very flexible. If you do your work " "on different computers (perhaps you have a working copy of <filename>/calc/" "trunk</filename> on two different machines), you'll need to manually copy " "your changes back and forth or just do all the work on a single computer. " "By that same token, it's difficult to share your changes in progress with " "anyone else. A common software development <quote>best practice</quote> is " "to allow your peers to review your work as you go. If nobody sees your " "intermediate commits, you lose potential feedback and may end up going down " "the wrong path for weeks before another person on your team notices. " "Finally, when you're finished with all your changes, you might find it very " "difficult to remerge your final work with the rest of the company's main " "body of code. Sally (or others) may have made many other changes in the " "repository that are difficult to incorporate into your working copy—" "especially if you run <command>svn update</command> after weeks of isolation." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:142 msgid "" "The better solution is to create your own branch, or line of development, in " "the repository. This allows you to save your half-broken work frequently " "without interfering with others, yet you can still selectively share " "information with your collaborators. You'll see exactly how this works as " "we go." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:151 msgid "Creating a Branch" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:153 msgid "" "Creating a branch is very simple—you make a copy of the project in the " "repository using the <command>svn copy</command> command. Subversion is " "able to copy not only single files, but whole directories as well. In this " "case, you want to make a copy of the <filename>/calc/trunk</filename> " "directory. Where should the new copy live? Wherever you wish—it's a " "matter of project policy. Let's say that your team has a policy of creating " "branches in the <filename>/calc/branches</filename> area of the repository, " "and you want to name your branch <literal>my-calc-branch</literal>. You'll " "want to create a new directory, <filename>/calc/branches/my-calc-branch</" "filename>, which begins its life as a copy of <filename>/calc/trunk</" "filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:169 msgid "" "You may already have seen <command>svn copy</command> used to copy one file " "to another within a working copy. But it can also be used to do a " "<quote>remote</quote> copy entirely within the repository. Just copy one " "URL to another:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:174 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk \\\n" " http://svn.example.com/repos/calc/branches/my-calc-branch \\\n" " -m \"Creating a private branch of /calc/trunk.\"\n" "\n" "Committed revision 341.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:182 msgid "" "This command causes a near-instantaneous commit in the repository, creating " "a new directory in revision 341. The new directory is a copy of <filename>/" "calc/trunk</filename>. This is shown in <xref linkend=\"svn.branchmerge." "using.create.dia-1\"/>. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:188 msgid "" "Subversion does not support copying between different repositories. When " "using URLs with <command>svn copy</command> or <command>svn move</command>, " "you can only copy items within the same repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:192 msgid "" "</footnote> While it's also possible to create a branch by using " "<command>svn copy</command> to duplicate a directory within the working " "copy, this technique isn't recommended. It can be quite slow, in fact! " "Copying a directory on the client side is a linear-time operation, in that " "it actually has to duplicate every file and subdirectory on the local disk. " "Copying a directory on the server, however, is a constant-time operation, " "and it's the way most people create branches." msgstr "" # type: Content of: <chapter><sect1><sect2><figure><title> #: ../en/book/ch04-branching-and-merging.xml:205 msgid "Repository with new copy" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch04-branching-and-merging.xml:210 msgid "Cheap Copies" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:212 msgid "" "Subversion's repository has a special design. When you copy a directory, " "you don't need to worry about the repository growing huge—Subversion " "doesn't actually duplicate any data. Instead, it creates a new directory " "entry that points to an <emphasis>existing</emphasis> tree. If you're an " "experienced Unix user, you'll recognize this as the same concept behind a " "hard link. As further changes are made to files and directories beneath the " "copied directory, Subversion continues to employ this hard link concept " "where it can. It duplicates data only when it is necessary to disambiguate " "different versions of objects." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:224 msgid "" "This is why you'll often hear Subversion users talk about <quote>cheap " "copies.</quote> It doesn't matter how large the directory is—it takes " "a very tiny, constant amount of time and space to make a copy of it. In " "fact, this feature is the basis of how commits work in Subversion: each " "revision is a <quote>cheap copy</quote> of the previous revision, with a few " "items lazily changed within. (To read more about this, visit Subversion's " "web site and read about the <quote>bubble up</quote> method in Subversion's " "design documents.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:235 msgid "" "Of course, these internal mechanics of copying and sharing data are hidden " "from the user, who simply sees copies of trees. The main point here is that " "copies are cheap, both in time and in space. If you create a branch " "entirely within the repository (by running <userinput>svn copy " "<replaceable>URL1</replaceable> <replaceable>URL2</replaceable></" "userinput>), it's a quick, constant-time operation. Make branches as often " "as you want." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:248 msgid "Working with Your Branch" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:250 msgid "" "Now that you've created a branch of the project, you can check out a new " "working copy to start using it:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:253 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.example.com/repos/calc\n" #| "A calc/Makefile\n" #| "A calc/integer.c\n" #| "A calc/button.c\n" #| "Checked out revision 56.\n" #| "\n" #| "$ ls -A calc\n" #| "Makefile button.c integer.c .svn/\n" msgid "" "\n" "$ svn checkout http://svn.example.com/repos/calc/branches/my-calc-branch\n" "A my-calc-branch/Makefile\n" "A my-calc-branch/integer.c\n" "A my-calc-branch/button.c\n" "Checked out revision 341.\n" msgstr "" "\n" "$ svn checkout http://svn.example.com/repos/calc\n" "A calc/Makefile\n" "A calc/integer.c\n" "A calc/button.c\n" "Checked out revision 56.\n" "\n" "$ ls -A calc\n" "Makefile button.c integer.c .svn/\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:261 msgid "" "There's nothing special about this working copy; it simply mirrors a " "different directory in the repository. When you commit changes, however, " "Sally won't see them when she updates, because her working copy is of " "<filename>/calc/trunk</filename>. (Be sure to read <xref linkend=\"svn." "branchmerge.switchwc\"/> later in this chapter: the <command>svn switch</" "command> command is an alternative way of creating a working copy of a " "branch.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:270 msgid "Let's pretend that a week goes by, and the following commits happen:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:275 msgid "" "You make a change to <filename>/calc/branches/my-calc-branch/button.c</" "filename>, which creates revision 342." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:281 msgid "" "You make a change to <filename>/calc/branches/my-calc-branch/integer.c</" "filename>, which creates revision 343." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:287 msgid "" "Sally makes a change to <filename>/calc/trunk/integer.c</filename>, which " "creates revision 344." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:293 msgid "" "Now two independent lines of development (shown in <xref linkend=\"svn." "branchmerge.using.work.dia-1\"/>) are happening on <filename>integer.c</" "filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><figure><title> #: ../en/book/ch04-branching-and-merging.xml:298 msgid "The branching of one file's history" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:302 msgid "" "Things get interesting when you look at the history of changes made to your " "copy of <filename>integer.c</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:306 #, no-wrap msgid "" "\n" "$ pwd\n" "/home/user/my-calc-branch\n" "\n" "$ svn log -v integer.c\n" "------------------------------------------------------------------------\n" "r343 | user | 2002-11-07 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines\n" "Changed paths:\n" " M /calc/branches/my-calc-branch/integer.c\n" "\n" "* integer.c: frozzled the wazjub.\n" "\n" "------------------------------------------------------------------------\n" "r341 | user | 2002-11-03 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines\n" "Changed paths:\n" " A /calc/branches/my-calc-branch (from /calc/trunk:340)\n" "\n" "Creating a private branch of /calc/trunk.\n" "\n" "------------------------------------------------------------------------\n" "r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines\n" "Changed paths:\n" " M /calc/trunk/integer.c\n" "\n" "* integer.c: changed a docstring.\n" "\n" "------------------------------------------------------------------------\n" "r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines\n" "Changed paths:\n" " A /calc/trunk/integer.c\n" "\n" "* integer.c: adding this file to the project.\n" "\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:342 msgid "" "Notice that Subversion is tracing the history of your branch's " "<filename>integer.c</filename> all the way back through time, even " "traversing the point where it was copied. It shows the creation of the " "branch as an event in the history, because <filename>integer.c</filename> " "was implicitly copied when all of <filename>/calc/trunk/</filename> was " "copied. Now look at what happens when Sally runs the same command on her " "copy of the file:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:351 #, no-wrap msgid "" "\n" "$ pwd\n" "/home/sally/calc\n" "\n" "$ svn log -v integer.c\n" "------------------------------------------------------------------------\n" "r344 | sally | 2002-11-07 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines\n" "Changed paths:\n" " M /calc/trunk/integer.c\n" "\n" "* integer.c: fix a bunch of spelling errors.\n" "\n" "------------------------------------------------------------------------\n" "r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines\n" "Changed paths:\n" " M /calc/trunk/integer.c\n" "\n" "* integer.c: changed a docstring.\n" "\n" "------------------------------------------------------------------------\n" "r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines\n" "Changed paths:\n" " A /calc/trunk/integer.c\n" "\n" "* integer.c: adding this file to the project.\n" "\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:380 msgid "" "Sally sees her own revision 344 change, but not the change you made in " "revision 343. As far as Subversion is concerned, these two commits affected " "different files in different repository locations. However, Subversion " "<emphasis>does</emphasis> show that the two files share a common history. " "Before the branch copy was made in revision 341, the files used to be the " "same file. That's why you and Sally both see the changes made in revisions " "303 and 98." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:394 msgid "The Key Concepts Behind Branching" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:396 msgid "" "You should remember two important lessons from this section. First, " "Subversion has no internal concept of a branch—it knows only how to " "make copies. When you copy a directory, the resultant directory is only a " "<quote>branch</quote> because <emphasis>you</emphasis> attach that meaning " "to it. You may think of the directory differently, or treat it differently, " "but to Subversion it's just an ordinary directory that happens to carry some " "extra historical information." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:406 msgid "" "Second, because of this copy mechanism, Subversion's branches exist as " "<emphasis>normal filesystem directories</emphasis> in the repository. This " "is different from other version control systems, where branches are " "typically defined by adding extra-dimensional <quote>labels</quote> to " "collections of files. The location of your branch directory doesn't matter " "to Subversion. Most teams follow a convention of putting all branches into " "a <filename>/branches</filename> directory, but you're free to invent any " "policy you wish." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:426 msgid "Basic Merging" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:428 msgid "" "Now you and Sally are working on parallel branches of the project: you're " "working on a private branch, and Sally is working on the <firstterm>trunk</" "firstterm>, or main line of development." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:433 msgid "" "For projects that have a large number of contributors, it's common for most " "people to have working copies of the trunk. Whenever someone needs to make " "a long-running change that is likely to disrupt the trunk, a standard " "procedure is to create a private branch and commit changes there until all " "the work is complete." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:440 msgid "" "So, the good news is that you and Sally aren't interfering with each other. " "The bad news is that it's very easy to drift <emphasis>too</emphasis> far " "apart. Remember that one of the problems with the <quote>crawl in a hole</" "quote> strategy is that by the time you're finished with your branch, it may " "be near-impossible to merge your changes back into the trunk without a huge " "number of conflicts." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:448 msgid "" "Instead, you and Sally might continue to share changes as you work. It's up " "to you to decide which changes are worth sharing; Subversion gives you the " "ability to selectively <quote>copy</quote> changes between branches. And " "when you're completely finished with your branch, your entire set of branch " "changes can be copied back into the trunk. In Subversion terminology, the " "general act of replicating changes from one branch to another is called " "<firstterm>merging</firstterm>, and it is performed using various " "invocations of the <command>svn merge</command> command." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:459 msgid "" "In the examples that follow, we're assuming that both your Subversion client " "and server are running Subversion 1.5 (or later). If either client or " "server is older than version 1.5, things are more complicated: the system " "won't track changes automatically, and you'll have to use painful manual " "methods to achieve similar results. That is, you'll always need to use the " "detailed merge syntax to specify specific ranges of revisions to replicate " "(see <xref linkend=\"svn.branchmerge.advanced.advancedsyntax\"/> later in " "this chapter), and take special care to keep track of what's already been " "merged and what hasn't. For this reason, we <emphasis>strongly</emphasis> " "recommend that you make sure your client and server are at least at version " "1.5." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:475 msgid "Changesets" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:477 msgid "" "Before we proceed further, we should warn you that there's going to be a lot " "of discussion of <quote>changes</quote> in the pages ahead. A lot of people " "experienced with version control systems use the terms <quote>change</quote> " "and <quote>changeset</quote> interchangeably, and we should clarify what " "Subversion understands as a <firstterm>changeset</firstterm>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:485 msgid "" "Everyone seems to have a slightly different definition of changeset, or at " "least a different expectation of what it means for a version control system " "to have one. For our purposes, let's say that a changeset is just a " "collection of changes with a unique name. The changes might include textual " "edits to file contents, modifications to tree structure, or tweaks to " "metadata. In more common speak, a changeset is just a patch with a name you " "can refer to." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:494 msgid "" "In Subversion, a global revision number N names a tree in the repository: " "it's the way the repository looked after the Nth commit. It's also the name " "of an implicit changeset: if you compare tree N with tree N−1, you can " "derive the exact patch that was committed. For this reason, it's easy to " "think of revision N as not just a tree, but a changeset as well. If you use " "an issue tracker to manage bugs, you can use the revision numbers to refer " "to particular patches that fix bugs—for example, <quote>this issue was " "fixed by r9238.</quote> Somebody can then run <userinput>svn log -r 9238</" "userinput> to read about the exact changeset that fixed the bug, and run " "<userinput>svn diff -c 9238</userinput> to see the patch itself. And (as " "you'll see shortly) Subversion's <command>svn merge</command> command is " "able to use revision numbers. You can merge specific changesets from one " "branch to another by naming them in the merge arguments: passing <userinput>-" "c 9238</userinput> to <command>svn merge</command> would merge changeset " "r9238 into your working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:518 msgid "Keeping a Branch in Sync" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:520 msgid "" "Continuing with our running example, let's suppose that a week has passed " "since you started working on your private branch. Your new feature isn't " "finished yet, but at the same time you know that other people on your team " "have continued to make important changes in the project's <filename>/trunk</" "filename>. It's in your best interest to replicate those changes to your " "own branch, just to make sure they mesh well with your changes. In fact, " "this is a best practice: frequently keeping your branch in sync with the " "main development line helps prevent <quote>surprise</quote> conflicts when " "it comes time for you to fold your changes back into the trunk." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:533 msgid "" "Subversion is aware of the history of your branch and knows when it divided " "away from the trunk. To replicate the latest, greatest trunk changes to " "your branch, first make sure your working copy of the branch is " "<quote>clean</quote>—that it has no local modifications reported by " "<command>svn status</command>. Then simply run:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:541 #, no-wrap msgid "" "\n" "$ pwd\n" "/home/user/my-calc-branch\n" "\n" "$ svn merge http://svn.example.com/repos/calc/trunk\n" "--- Merging r345 through r356 into '.':\n" "U button.c\n" "U integer.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:551 msgid "" "This basic syntax—<userinput>svn merge <replaceable>URL</replaceable></" "userinput>—tells Subversion to merge all recent changes from the URL " "to the current working directory (which is typically the root of your " "working copy). After running the prior example, your branch working copy " "now contains new local modifications, and these edits are duplications of " "all of the changes that have happened on the trunk since you first created " "your branch:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:560 #, no-wrap msgid "" "\n" "$ svn status\n" " M .\n" "M button.c\n" "M integer.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:567 msgid "" "At this point, the wise thing to do is look at the changes carefully with " "<command>svn diff</command>, and then build and test your branch. Notice " "that the current working directory (<quote><filename>.</filename></quote>) " "has also been modified; the <command>svn diff</command> will show that its " "<literal>svn:mergeinfo</literal> property has been either created or " "modified. This is important merge-related metadata that you should " "<emphasis>not</emphasis> touch, since it will be needed by future " "<command>svn merge</command> commands. (We'll learn more about this " "metadata later in the chapter.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:579 msgid "" "After performing the merge, you might also need to resolve some conflicts " "(just as you do with <command>svn update</command>) or possibly make some " "small edits to get things working properly. (Remember, just because there " "are no <emphasis>syntactic</emphasis> conflicts doesn't mean there aren't " "any <emphasis>semantic</emphasis> conflicts!) If you encounter serious " "problems, you can always abort the local changes by running <userinput>svn " "revert . -R</userinput> (which will undo all local modifications) and start " "a long <quote>what's going on?</quote> discussion with your collaborators. " "If things look good, however, you can submit these changes into the " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:592 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" #| "Sending button.c\n" #| "Transmitting file data .\n" #| "Committed revision 57.\n" msgid "" "\n" "$ svn commit -m \"Merged latest trunk changes to my-calc-branch.\"\n" "Sending .\n" "Sending button.c\n" "Sending integer.c\n" "Transmitting file data ..\n" "Committed revision 357.\n" msgstr "" "\n" "$ svn commit button.c -m \"Fixed a typo in button.c.\"\n" "Sending button.c\n" "Transmitting file data .\n" "Committed revision 57.\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:601 msgid "" "At this point, your private branch is now <quote>in sync</quote> with the " "trunk, so you can rest easier knowing that as you continue to work in " "isolation, you're not drifting too far away from what everyone else is doing." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch04-branching-and-merging.xml:608 msgid "Why Not Use Patches Instead?" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:610 msgid "" "A question may be on your mind, especially if you're a Unix user: why bother " "to use <command>svn merge</command> at all? Why not simply use the operating " "system's <command>patch</command> command to accomplish the same job? For " "example:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch04-branching-and-merging.xml:616 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "$ svn diff -r 341:HEAD http://svn.example.com/repos/calc/trunk > patchfile\n" "$ patch -p0 < patchfile\n" "Patching file integer.c using Plan A...\n" "Hunk #1 succeeded at 147.\n" "Hunk #2 succeeded at 164.\n" "Hunk #3 succeeded at 241.\n" "Hunk #4 succeeded at 249.\n" "done\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:628 msgid "" "In this particular example, there really isn't much difference. But " "<command>svn merge</command> has special abilities that surpass the " "<command>patch</command> program. The file format used by <command>patch</" "command> is quite limited; it's able to tweak file contents only. There's " "no way to represent changes to <emphasis>trees</emphasis>, such as the " "addition, removal, or renaming of files and directories. Nor can the " "<command>patch</command> program notice changes to properties. If Sally's " "change had, say, added a new directory, the output of <command>svn diff</" "command> wouldn't have mentioned it at all. <command>svn diff</command> " "outputs only the limited patch format, so there are some ideas it simply " "can't express." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:643 msgid "" "The <command>svn merge</command> command, however, can express changes in " "tree structure and properties by directly applying them to your working " "copy. Even more important, this command records the changes that have been " "duplicated to your branch so that Subversion is aware of exactly which " "changes exist in each location (see <xref linkend=\"svn.branchmerge." "basicmerging.mergeinfo\"/>.) This is a critical feature that makes branch " "management usable; without it, users would have to manually keep notes on " "which sets of changes have or haven't been merged yet." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:657 msgid "" "Suppose that another week has passed. You've committed more changes to your " "branch, and your comrades have continued to improve the trunk as well. Once " "again, you'd like to replicate the latest trunk changes to your branch and " "bring yourself in sync. Just run the same merge command again!" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:664 #, no-wrap msgid "" "\n" "$ svn merge http://svn.example.com/repos/calc/trunk\n" "--- Merging r357 through r380 into '.':\n" "U integer.c\n" "U Makefile\n" "A README\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:672 msgid "" "Subversion knows which trunk changes you've already replicated to your " "branch, so it carefully replicates only those changes you don't yet have. " "Once again, you'll have to build, test, and <command>svn commit</command> " "the local modifications to your branch." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:678 msgid "" "What happens when you finally finish your work, though? Your new feature is " "done, and you're ready to merge your branch changes back to the trunk (so " "your team can enjoy the bounty of your labor). The process is simple. " "First, bring your branch in sync with the trunk again, just as you've been " "doing all along:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:685 #, no-wrap msgid "" "\n" "$ svn merge http://svn.example.com/repos/calc/trunk\n" "--- Merging r381 through r385 into '.':\n" "U button.c\n" "U README\n" "\n" "$ # build, test, ...\n" "\n" "$ svn commit -m \"Final merge of trunk changes to my-calc-branch.\"\n" "Sending .\n" "Sending button.c\n" "Sending README\n" "Transmitting file data ..\n" "Committed revision 390.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:701 msgid "" "Now, you use <command>svn merge</command> to replicate your branch changes " "back into the trunk. You'll need an up-to-date working copy of <filename>/" "trunk</filename>. You can do this by either doing an <command>svn checkout</" "command>, dredging up an old trunk working copy from somewhere on your disk, " "or using <command>svn switch</command> (see <xref linkend=\"svn.branchmerge." "switchwc\"/>.) However you get a trunk working copy, remember that it's a " "best practice to do your merge into a working copy that has <emphasis>no</" "emphasis> local edits and has been recently updated (i.e., is not a mixture " "of local revisions). If your working copy isn't <quote>clean</quote> in " "these ways, you can run into some unnecessary conflict-related headaches and " "<command>svn merge</command> will likely return an error." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:718 msgid "" "Once you have a clean working copy of the trunk, you're ready to merge your " "branch back into it:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:721 #, no-wrap msgid "" "\n" "$ pwd\n" "/home/user/calc-trunk\n" "\n" "$ svn update # (make sure the working copy is up to date)\n" "At revision 390.\n" "\n" "$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/my-calc-branch\n" "--- Merging differences between repository URLs into '.':\n" "U button.c\n" "U integer.c\n" "U Makefile\n" " U .\n" "\n" "$ # build, test, verify, ...\n" "\n" "$ svn commit -m \"Merge my-calc-branch back into trunk!\"\n" "Sending .\n" "Sending button.c\n" "Sending integer.c\n" "Sending Makefile\n" "Transmitting file data ..\n" "Committed revision 391.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:746 msgid "" "Congratulations, your branch has now been remerged back into the main line " "of development. Notice our use of the <option>--reintegrate</option> option " "this time around. The option is critical for reintegrating changes from a " "branch back into its original line of development—don't forget it! " "It's needed because this sort of <quote>merge back</quote> is a different " "sort of work than what you've been doing up until now. Previously, we had " "been asking <command>svn merge</command> to grab the <quote>next set</quote> " "of changes from one line of development (the trunk) and duplicate them to " "another (your branch). This is fairly straightforward, and each time " "Subversion knows how to pick up where it left off. In our prior examples, " "you can see that first it merges the ranges 345:356 from trunk to branch; " "later on, it continues by merging the next contiguously available range, " "356:380. When doing the final sync, it merges the range 380:385." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:764 msgid "" "When merging your branch back to the trunk, however, the underlying " "mathematics is quite different. Your feature branch is now a mishmosh of " "both duplicated trunk changes and private branch changes, so there's no " "simple contiguous range of revisions to copy over. By specifying the " "<option>--reintegrate</option> option, you're asking Subversion to carefully " "replicate <emphasis>only</emphasis> those changes unique to your branch. " "(And in fact, it does this by comparing the latest trunk tree with the " "latest branch tree: the resulting difference is exactly your branch changes!)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:776 msgid "" "Now that your private branch is merged to trunk, you may wish to remove it " "from the repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:779 #, no-wrap msgid "" "\n" "$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \\\n" " -m \"Remove my-calc-branch.\"\n" "Committed revision 392.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:785 msgid "" "But wait! Isn't the history of that branch valuable? What if somebody wants " "to audit the evolution of your feature someday and look at all of your " "branch changes? No need to worry. Remember that even though your branch is " "no longer visible in the <filename>/branches</filename> directory, its " "existence is still an immutable part of the repository's history. A simple " "<command>svn log</command> command on the <filename>/branches</filename> URL " "will show the entire history of your branch. Your branch can even be " "resurrected at some point, should you desire (see <xref linkend=\"svn." "branchmerge.basicmerging.resurrect\"/>)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:797 msgid "" "In Subversion 1.5, once a <option>--reintegrate</option> merge is done from " "branch to trunk, the branch is no longer usable for further work. It's not " "able to correctly absorb new trunk changes, nor can it be properly " "reintegrated to trunk again. For this reason, if you want to keep working " "on your feature branch, we recommend destroying it and then re-creating it " "from the trunk:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:805 #, no-wrap msgid "" "\n" "$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \\\n" " -m \"Remove my-calc-branch.\"\n" "Committed revision 392.\n" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk \\\n" " http://svn.example.com/repos/calc/branches/new-branch\n" " -m \"Create a new branch from trunk.\"\n" "Committed revision 393.\n" "\n" "$ cd my-calc-branch\n" "\n" "$ svn switch http://svn.example.com/repos/calc/branches/new-branch\n" "Updated to revision 393.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:821 msgid "" "The final command in the prior example—<command>svn switch</" "command>—is a way of updating an existing working copy to reflect a " "different repository directory. We'll discuss this more in <xref linkend=" "\"svn.branchmerge.switchwc\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:830 msgid "Mergeinfo and Previews" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:832 msgid "" "The basic mechanism Subversion uses to track changesets—that is, which " "changes have been merged to which branches—is by recording data in " "properties. Specifically, merge data is tracked in the <literal>svn:" "mergeinfo</literal> property attached to files and directories. (If you're " "not familiar with Subversion properties, now is the time to skim <xref " "linkend=\"svn.advanced.props\"/>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:841 msgid "You can examine the property, just like any other:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:844 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "$ svn propget svn:mergeinfo .\n" "/trunk:341-390\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:850 msgid "" "It is <emphasis>not</emphasis> recommended that you change the value of this " "property yourself, unless you really know what you're doing. This property " "is automatically maintained by Subversion whenever you run <command>svn " "merge</command>. Its value indicates which changes (at a given path) have " "been replicated into the directory in question. In this case, the path is " "<filename>/trunk</filename> and the directory which has received the " "specific changes is <filename>/branches/my-calc-branch</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:860 msgid "" "There's also a subcommand, <command>svn mergeinfo</command>, which can be " "helpful in seeing not only which changesets a directory has absorbed, but " "also which changesets it's still eligible to receive. This gives a sort of " "preview of the next set of changes that <command>svn merge</command> will " "replicate to your branch." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:867 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "\n" "# Which changes have already been merged from trunk to branch?\n" "$ svn mergeinfo http://svn.example.com/repos/calc/trunk\n" "r341\n" "r342\n" "r343\n" "…\n" "r388\n" "r389\n" "r390\n" "\n" "# Which changes are still eligible to merge from trunk to branch?\n" "$ svn mergeinfo http://svn.example.com/repos/calc/trunk --show-revs eligible\n" "r391\n" "r392\n" "r393\n" "r394\n" "r395\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:889 msgid "" "The <command>svn mergeinfo</command> command requires a <quote>source</" "quote> URL (where the changes would be coming from), and takes an optional " "<quote>target</quote> URL (where the changes would be merged to). If no " "target URL is given, it assumes that the current working directory is the " "target. In the prior example, because we're querying our branch working " "copy, the command assumes we're interested in receiving changes to " "<filename>/branches/mybranch</filename> from the specified trunk URL." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:899 msgid "" "Another way to get a more precise preview of a merge operation is to use the " "<option>--dry-run</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:903 #, no-wrap msgid "" "\n" "$ svn merge http://svn.example.com/repos/calc/trunk --dry-run\n" "U integer.c\n" "\n" "$ svn status\n" "# nothing printed, working copy is still unchanged.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:911 msgid "" "The <option>--dry-run</option> option doesn't actually apply any local " "changes to the working copy. It shows only status codes that " "<emphasis>would</emphasis> be printed in a real merge. It's useful for " "getting a <quote>high-level</quote> preview of the potential merge, for " "those times when running <command>svn diff</command> gives too much detail." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch04-branching-and-merging.xml:920 msgid "" "After performing a merge operation, but before committing the results of the " "merge, you can use <userinput>svn diff --depth=empty <replaceable>/path/to/" "merge/target</replaceable></userinput> to see only the changes to the " "immediate target of your merge. If your merge target was a directory, only " "property differences will be displayed. This is a handy way to see the " "changes to the <literal>svn:mergeinfo</literal> property recorded by the " "merge operation, which will remind you about what you've just merged." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:931 msgid "" "Of course, the best way to preview a merge operation is to just do it! " "Remember, running <command>svn merge</command> isn't an inherently risky " "thing (unless you've made local modifications to your working copy—but " "we've already stressed that you shouldn't be merging into such an " "environment). If you don't like the results of the merge, simply run " "<userinput>svn revert . -R</userinput> to revert the changes from your " "working copy and retry the command with different options. The merge isn't " "final until you actually <command>svn commit</command> the results." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch04-branching-and-merging.xml:943 msgid "" "While it's perfectly fine to experiment with merges by running <command>svn " "merge</command> and <command>svn revert</command> over and over, you may run " "into some annoying (but easily bypassed) roadblocks. For example, if the " "merge operation adds a new file (i.e., schedules it for addition), " "<command>svn revert</command> won't actually remove the file; it simply " "unschedules the addition. You're left with an unversioned file. If you " "then attempt to run the merge again, you may get conflicts due to the " "unversioned file <quote>being in the way.</quote> Solution? After performing " "a revert, be sure to clean up the working copy and remove unversioned files " "and directories. The output of <command>svn status</command> should be as " "clean as possible, ideally showing no output." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:963 #, fuzzy #| msgid "Undoing Working Changes" msgid "Undoing Changes" msgstr "Zurücknehmen von Änderungen in der Arbeitskopie" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:965 msgid "" "An extremely common use for <command>svn merge</command> is to roll back a " "change that has already been committed. Suppose you're working away happily " "on a working copy of <filename>/calc/trunk</filename>, and you discover that " "the change made way back in revision 303, which changed <filename>integer.c</" "filename>, is completely wrong. It never should have been committed. You " "can use <command>svn merge</command> to <quote>undo</quote> the change in " "your working copy, and then commit the local modification to the " "repository. All you need to do is to specify a <emphasis>reverse</emphasis> " "difference. (You can do this by specifying <option>--revision 303:302</" "option>, or by an equivalent <option>--change -303</option>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:980 #, no-wrap msgid "" "\n" "$ svn merge -c -303 http://svn.example.com/repos/calc/trunk\n" "--- Reverse-merging r303 into 'integer.c':\n" "U integer.c\n" "\n" "$ svn status\n" " M .\n" "M integer.c\n" "\n" "$ svn diff\n" "…\n" "# verify that the change is removed\n" "…\n" "\n" "$ svn commit -m \"Undoing change committed in r303.\"\n" "Sending integer.c\n" "Transmitting file data .\n" "Committed revision 350.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1000 msgid "" "As we mentioned earlier, one way to think about a repository revision is as " "a specific changeset. By using the <option>-r</option> option, you can ask " "<command>svn merge</command> to apply a changeset, or a whole range of " "changesets, to your working copy. In our case of undoing a change, we're " "asking <command>svn merge</command> to apply changeset #303 to our working " "copy <emphasis>backward</emphasis>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1009 msgid "" "Keep in mind that rolling back a change like this is just like any other " "<command>svn merge</command> operation, so you should use <command>svn " "status</command> and <command>svn diff</command> to confirm that your work " "is in the state you want it to be in, and then use <command>svn commit</" "command> to send the final version to the repository. After committing, " "this particular changeset is no longer reflected in the <literal>HEAD</" "literal> revision." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1018 msgid "" "Again, you may be thinking: well, that really didn't undo the commit, did " "it? The change still exists in revision 303. If somebody checks out a " "version of the <filename>calc</filename> project between revisions 303 and " "349, she'll still see the bad change, right?" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:1024 msgid "" "Yes, that's true. When we talk about <quote>removing</quote> a change, " "we're really talking about removing it from the <literal>HEAD</literal> " "revision. The original change still exists in the repository's history. " "For most situations, this is good enough. Most people are only interested " "in tracking the <literal>HEAD</literal> of a project anyway. There are " "special cases, however, where you really might want to destroy all evidence " "of the commit. (Perhaps somebody accidentally committed a confidential " "document.) This isn't so easy, it turns out, because Subversion was " "deliberately designed to never lose information. Revisions are immutable " "trees that build upon one another. Removing a revision from history would " "cause a domino effect, creating chaos in all subsequent revisions and " "possibly invalidating all working copies. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:1040 msgid "" "The Subversion project has plans, however, to someday implement a command " "that would accomplish the task of permanently deleting information. In the " "meantime, see <xref linkend=\"svn.reposadmin.maint.tk.svndumpfilter\"/> for " "a possible workaround." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1052 msgid "Resurrecting Deleted Items" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1054 msgid "" "The great thing about version control systems is that information is never " "lost. Even when you delete a file or directory, it may be gone from the " "<literal>HEAD</literal> revision, but the object still exists in earlier " "revisions. One of the most common questions new users ask is, <quote>How do " "I get my old file or directory back?</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1061 msgid "" "The first step is to define exactly <emphasis>which</emphasis> item you're " "trying to resurrect. Here's a useful metaphor: you can think of every " "object in the repository as existing in a sort of two-dimensional coordinate " "system. The first coordinate is a particular revision tree, and the second " "coordinate is a path within that tree. So every version of your file or " "directory can be defined by a specific coordinate pair. (Remember the " "<quote>peg revision</quote> syntax—foo.c@224—mentioned back in " "<xref linkend=\"svn.advanced.pegrevs\"/>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1073 msgid "" "First, you might need to use <command>svn log</command> to discover the " "exact coordinate pair you wish to resurrect. A good strategy is to run " "<userinput>svn log --verbose</userinput> in a directory that used to contain " "your deleted item. The <option>--verbose</option> (<option>-v</option>) " "option shows a list of all changed items in each revision; all you need to " "do is find the revision in which you deleted the file or directory. You can " "do this visually, or by using another tool to examine the log output (via " "<command>grep</command>, or perhaps via an incremental search in an editor)." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1084 #, no-wrap msgid "" "\n" "$ cd parent-dir\n" "$ svn log -v\n" "…\n" "------------------------------------------------------------------------\n" "r808 | joe | 2003-12-26 14:29:40 -0600 (Fri, 26 Dec 2003) | 3 lines\n" "Changed paths:\n" " D /calc/trunk/real.c\n" " M /calc/trunk/integer.c\n" "\n" "Added fast fourier transform functions to integer.c.\n" "Removed real.c because code now in double.c.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1099 msgid "" "In the example, we're assuming that you're looking for a deleted file " "<filename>real.c</filename>. By looking through the logs of a parent " "directory, you've spotted that this file was deleted in revision 808. " "Therefore, the last version of the file to exist was in the revision right " "before that. Conclusion: you want to resurrect the path <filename>/calc/" "trunk/real.c</filename> from revision 807." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1108 msgid "" "That was the hard part—the research. Now that you know what you want " "to restore, you have two different choices." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1112 msgid "" "One option is to use <command>svn merge</command> to apply revision 808 " "<quote>in reverse.</quote> (We already discussed how to undo changes in " "<xref linkend=\"svn.branchmerge.basicmerging.undo\"/>.) This would have the " "effect of re-adding <filename>real.c</filename> as a local modification. " "The file would be scheduled for addition, and after a commit, the file would " "again exist in <literal>HEAD</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1121 msgid "" "In this particular example, however, this is probably not the best " "strategy. Reverse-applying revision 808 would not only schedule " "<filename>real.c</filename> for addition, but the log message indicates that " "it would also undo certain changes to <filename>integer.c</filename>, which " "you don't want. Certainly, you could reverse-merge revision 808 and then " "<command>svn revert</command> the local modifications to <filename>integer." "c</filename>, but this technique doesn't scale well. What if 90 files were " "changed in revision 808?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1132 msgid "" "A second, more targeted strategy is not to use <command>svn merge</command> " "at all, but rather to use the <command>svn copy</command> command. Simply " "copy the exact revision and path <quote>coordinate pair</quote> from the " "repository to your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1138 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk/real.c@807 ./real.c\n" "\n" "$ svn status\n" "A + real.c\n" "\n" "$ svn commit -m \"Resurrected real.c from revision 807, /calc/trunk/real.c.\"\n" "Adding real.c\n" "Transmitting file data .\n" "Committed revision 1390.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1150 msgid "" "The plus sign in the status output indicates that the item isn't merely " "scheduled for addition, but scheduled for addition <quote>with history.</" "quote> Subversion remembers where it was copied from. In the future, " "running <command>svn log</command> on this file will traverse back through " "the file's resurrection and through all the history it had prior to revision " "807. In other words, this new <filename>real.c</filename> isn't really new; " "it's a direct descendant of the original, deleted file. This is usually " "considered a good and useful thing. If, however, you wanted to resurrect " "the file <emphasis>without</emphasis> maintaining a historical link to the " "old file, this technique works just as well:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1164 #, no-wrap msgid "" "\n" "$ svn cat http://svn.example.com/repos/calc/trunk/real.c@807 > ./real.c\n" "\n" "$ svn add real.c\n" "A real.c\n" "\n" "$ svn commit -m \"Re-created real.c from revision 807.\"\n" "Adding real.c\n" "Transmitting file data .\n" "Committed revision 1390.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1176 msgid "" "Although our example shows us resurrecting a file, note that these same " "techniques work just as well for resurrecting deleted directories. Also " "note that a resurrection doesn't have to happen in your working copy—" "it can happen entirely in the repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1182 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk/real.c@807 \\\n" " http://svn.example.com/repos/calc/trunk/ \\\n" " -m \"Resurrect real.c from revision 807.\"\n" "Committed revision 1390.\n" "\n" "$ svn update\n" "A real.c\n" "Updated to revision 1390.\n" msgstr "" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:1201 #, fuzzy #| msgid "Advanced users" msgid "Advanced Merging" msgstr "Fortgeschrittene" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:1203 msgid "" "Here ends the automated magic. Sooner or later, once you get the hang of " "branching and merging, you're going to have to ask Subversion to merge " "<emphasis>specific</emphasis> changes from one place to another. To do " "this, you're going to have to start passing more complicated arguments to " "<command>svn merge</command>. The next section describes the fully expanded " "syntax of the command and discusses a number of common scenarios that " "require it." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1215 msgid "Cherrypicking" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1217 msgid "" "Just as the term <quote>changeset</quote> is often used in version control " "systems, so is the term <firstterm>cherrypicking</firstterm>. This word " "refers to the act of choosing <emphasis>one</emphasis> specific changeset " "from a branch and replicating it to another. Cherrypicking may also refer " "to the act of duplicating a particular set of (not necessarily contiguous!) " "changesets from one branch to another. This is in contrast to more typical " "merging scenarios, where the <quote>next</quote> contiguous range of " "revisions is duplicated automatically." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1229 msgid "" "Why would people want to replicate just a single change? It comes up more " "often than you'd think. For example, let's go back in time and imagine that " "you haven't yet merged your private feature branch back to the trunk. At " "the water cooler, you get word that Sally made an interesting change to " "<filename>integer.c</filename> on the trunk. Looking over the history of " "commits to the trunk, you see that in revision 355 she fixed a critical bug " "that directly impacts the feature you're working on. You might not be ready " "to merge all the trunk changes to your branch just yet, but you certainly " "need that particular bug fix in order to continue your work." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1242 #, no-wrap msgid "" "\n" "$ svn diff -c 355 http://svn.example.com/repos/calc/trunk\n" "\n" "Index: integer.c\n" "===================================================================\n" "--- integer.c\t(revision 354)\n" "+++ integer.c\t(revision 355)\n" "@@ -147,7 +147,7 @@\n" " case 6: sprintf(info->operating_system, \"HPFS (OS/2 or NT)\"); break;\n" " case 7: sprintf(info->operating_system, \"Macintosh\"); break;\n" " case 8: sprintf(info->operating_system, \"Z-System\"); break;\n" "- case 9: sprintf(info->operating_system, \"CP/MM\");\n" "+ case 9: sprintf(info->operating_system, \"CP/M\"); break;\n" " case 10: sprintf(info->operating_system, \"TOPS-20\"); break;\n" " case 11: sprintf(info->operating_system, \"NTFS (Windows NT)\"); break;\n" " case 12: sprintf(info->operating_system, \"QDOS\"); break;\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1260 msgid "" "Just as you used <command>svn diff</command> in the prior example to examine " "revision 355, you can pass the same option to <command>svn merge</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1264 #, no-wrap msgid "" "\n" "$ svn merge -c 355 http://svn.example.com/repos/calc/trunk\n" "U integer.c\n" "\n" "$ svn status\n" "M integer.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1272 msgid "" "You can now go through the usual testing procedures before committing this " "change to your branch. After the commit, Subversion marks r355 as having " "been merged to the branch so that future <quote>magic</quote> merges that " "synchronize your branch with the trunk know to skip over r355. (Merging the " "same change to the same branch almost always results in a conflict!)" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1280 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "\n" "$ svn propget svn:mergeinfo .\n" "/trunk:341-349,355\n" "\n" "# Notice that r355 isn't listed as \"eligible\" to merge, because\n" "# it's already been merged.\n" "$ svn mergeinfo http://svn.example.com/repos/calc/trunk --show-revs eligible\n" "r350\n" "r351\n" "r352\n" "r353\n" "r354\n" "r356\n" "r357\n" "r358\n" "r359\n" "r360\n" "\n" "$ svn merge http://svn.example.com/repos/calc/trunk\n" "--- Merging r350 through r354 into '.':\n" " U .\n" "U integer.c\n" "U Makefile\n" "--- Merging r356 through r360 into '.':\n" " U .\n" "U integer.c\n" "U button.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1311 msgid "" "This use case of replicating (or <firstterm>backporting</firstterm>) bug " "fixes from one branch to another is perhaps the most popular reason for " "cherrypicking changes; it comes up all the time, for example, when a team is " "maintaining a <quote>release branch</quote> of software. (We discuss this " "pattern in <xref linkend=\"svn.branchmerge.commonpatterns.release\"/>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:1320 msgid "" "Did you notice how, in the last example, the merge invocation caused two " "distinct ranges of merges to be applied? The <command>svn merge</command> " "command applied two independent patches to your working copy to skip over " "changeset 355, which your branch already contained. There's nothing " "inherently wrong with this, except that it has the potential to make " "conflict resolution trickier. If the first range of changes creates " "conflicts, you <emphasis>must</emphasis> resolve them interactively for the " "merge process to continue and apply the second range of changes. If you " "postpone a conflict from the first wave of changes, the whole merge command " "will bail out with an error message. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:1334 msgid "" "At least, this is true in Subversion 1.5 at the time of this writing. This " "behavior may improve in future versions of Subversion." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1341 msgid "" "A word of warning: while <command>svn diff</command> and <command>svn merge</" "command> are very similar in concept, they do have different syntax in many " "cases. Be sure to read about them in <xref linkend=\"svn.ref\"/> for " "details, or ask <command>svn help</command>. For example, <command>svn " "merge</command> requires a working copy path as a target, that is, a place " "where it should apply the generated patch. If the target isn't specified, " "it assumes you are trying to perform one of the following common operations:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1353 msgid "" "You want to merge directory changes into your current working directory." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1357 msgid "" "You want to merge the changes in a specific file into a file by the same " "name that exists in your current working directory." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1363 msgid "" "If you are merging a directory and haven't specified a target path, " "<command>svn merge</command> assumes the first case and tries to apply the " "changes into your current directory. If you are merging a file, and that " "file (or a file by the same name) exists in your current working directory, " "<command>svn merge</command> assumes the second case and tries to apply the " "changes to a local file with the same name." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1376 msgid "Merge Syntax: Full Disclosure" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1378 msgid "" "You've now seen some examples of the <command>svn merge</command> command, " "and you're about to see several more. If you're feeling confused about " "exactly how merging works, you're not alone. Many users (especially those " "new to version control) are initially perplexed about the proper syntax of " "the command and about how and when the feature should be used. But fear " "not, this command is actually much simpler than you think! There's a very " "easy technique for understanding exactly how <command>svn merge</command> " "behaves." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1389 msgid "" "The main source of confusion is the <emphasis>name</emphasis> of the " "command. The term <quote>merge</quote> somehow denotes that branches are " "combined together, or that some sort of mysterious blending of data is going " "on. That's not the case. A better name for the command might have been " "<command>svn diff-and-apply</command>, because that's all that happens: two " "repository trees are compared, and the differences are applied to a working " "copy." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1399 msgid "" "If you're using <command>svn merge</command> to do basic copying of changes " "between branches, it will generally do the right thing automatically. For " "example, a command such as the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1404 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.example.com:9834/repos\n" #| "…\n" msgid "" "\n" "$ svn merge http://svn.example.com/repos/calc/some-branch\n" msgstr "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1408 msgid "" "will attempt to duplicate any changes made on <filename>some-branch</" "filename> into your current working directory, which is presumably a working " "copy that shares some historical connection to the branch. The command is " "smart enough to only duplicate changes that your working copy doesn't yet " "have. If you repeat this command once a week, it will only duplicate the " "<quote>newest</quote> branch changes that happened since you last merged." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1417 msgid "" "If you choose to use the <command>svn merge</command> command in all its " "full glory by giving it specific revision ranges to duplicate, the command " "takes three main arguments:" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1424 msgid "" "An initial repository tree (often called the <firstterm>left side</" "firstterm> of the comparison)" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1428 msgid "" "A final repository tree (often called the <firstterm>right side</firstterm> " "of the comparison)" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1432 msgid "" "A working copy to accept the differences as local changes (often called the " "<firstterm>target</firstterm> of the merge)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1438 msgid "" "Once these three arguments are specified, the two trees are compared, and " "the differences are applied to the target working copy as local " "modifications. When the command is done, the results are no different than " "if you had hand-edited the files or run various <command>svn add</command> " "or <command>svn delete</command> commands yourself. If you like the " "results, you can commit them. If you don't like the results, you can simply " "<command>svn revert</command> all of the changes." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1448 msgid "" "The syntax of <command>svn merge</command> allows you to specify the three " "necessary arguments rather flexibly. Here are some examples:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1452 #, no-wrap msgid "" "\n" "$ svn merge http://svn.example.com/repos/branch1@150 \\\n" " http://svn.example.com/repos/branch2@212 \\\n" " my-working-copy\n" "\n" "$ svn merge -r 100:200 http://svn.example.com/repos/trunk my-working-copy\n" "\n" "$ svn merge -r 100:200 http://svn.example.com/repos/trunk\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1462 msgid "" "The first syntax lays out all three arguments explicitly, naming each tree " "in the form <emphasis>URL@REV</emphasis> and naming the working copy " "target. The second syntax can be used as a shorthand for situations when " "you're comparing two different revisions of the same URL. The last syntax " "shows how the working copy argument is optional; if omitted, it defaults to " "the current directory." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1470 msgid "" "While the first example shows the <quote>full</quote> syntax of <command>svn " "merge</command>, it needs to be used very carefully; it can result in merges " "which do not record any <literal>svn:mergeinfo</literal> metadata at all. " "The next section talks a bit more about this." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1480 msgid "Merges Without Mergeinfo" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1482 msgid "" "Subversion tries to generate merge metadata whenever it can, to make future " "invocations of <command>svn merge</command> smarter. There are still " "situations, however, where <literal>svn:mergeinfo</literal> data is not " "created or changed. Remember to be a bit wary of these scenarios:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:1490 msgid "Merging unrelated sources" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1492 msgid "" "If you ask <command>svn merge</command> to compare two URLs that aren't " "related to each other, a patch will still be generated and applied to your " "working copy, but no merging metadata will be created. There's no common " "history between the two sources, and future <quote>smart</quote> merges " "depend on that common history." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:1503 msgid "Merging from foreign repositories" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1505 msgid "" "While it's possible to run a command such as <userinput>svn merge -r 100:200 " "<replaceable>http://svn.foreignproject.com/repos/trunk</replaceable></" "userinput>, the resultant patch will also lack any historical merge " "metadata. At time of this writing, Subversion has no way of representing " "different repository URLs within the <literal>svn:mergeinfo</literal> " "property." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:1516 msgid "Using <option>--ignore-ancestry</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:1518 msgid "" "If this option is passed to <command>svn merge</command>, it causes the " "merging logic to mindlessly generate differences the same way that " "<command>svn diff</command> does, ignoring any historical relationships. We " "discuss this later in the chapter in <xref linkend=\"svn.branchmerge." "advanced.ancestry\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:1528 msgid "Apply reverse merges to a target's natural history" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:1530 msgid "" "Earlier in this chapter (<xref linkend=\"svn.branchmerge.basicmerging.undo\"/" ">) we discussed how to use <command>svn merge</command> to apply a " "<quote>reverse patch</quote> as a way of rolling back changes. If this " "technique is used to undo a change to an object's personal history (e.g., " "commit r5 to the trunk, then immediately roll back r5 using <userinput>svn " "merge . -c -5</userinput>), this sort of merge doesn't affect the recorded " "mergeinfo. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:1540 msgid "" "Interestingly, after rolling back a revision like this, we wouldn't be able " "to reapply the revision using <userinput>svn merge . -c 5</userinput>, since " "the mergeinfo would already list r5 as being applied. We would have to use " "the <option>--ignore-ancestry</option> option to make the merge command " "ignore the existing mergeinfo!" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1558 msgid "More on Merge Conflicts" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1560 msgid "" "Just like the <command>svn update</command> command, <command>svn merge</" "command> applies changes to your working copy. And therefore it's also " "capable of creating conflicts. The conflicts produced by <command>svn " "merge</command>, however, are sometimes different, and this section explains " "those differences." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1567 msgid "" "To begin with, assume that your working copy has no local edits. When you " "<command>svn update</command> to a particular revision, the changes sent by " "the server will always apply <quote>cleanly</quote> to your working copy. " "The server produces the delta by comparing two trees: a virtual snapshot of " "your working copy, and the revision tree you're interested in. Because the " "left hand side of the comparison is exactly equal to what you already have, " "the delta is guaranteed to correctly convert your working copy into the " "right hand tree." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1578 msgid "" "But <command>svn merge</command> has no such guarantees and can be much more " "chaotic: the advanced user can ask the server to compare <emphasis>any</" "emphasis> two trees at all, even ones that are unrelated to the working " "copy! This means there's large potential for human error. Users will " "sometimes compare the wrong two trees, creating a delta that doesn't apply " "cleanly. <command>svn merge</command> will do its best to apply as much of " "the delta as possible, but some parts may be impossible. Just as the Unix " "<command>patch</command> command sometimes complains about <quote>failed " "hunks,</quote> <command>svn merge</command> will similarly complain about " "<quote>skipped targets</quote>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1592 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn update\n" #| "U INSTALL\n" #| "G README\n" #| "Conflict discovered in 'bar.c'.\n" #| "Select: (p) postpone, (df) diff-full, (e) edit,\n" #| " (h) help for more options:\n" msgid "" "\n" "$ svn merge -r 1288:1351 http://svn.example.com/repos/branch\n" "U foo.c\n" "U bar.c\n" "Skipped missing target: 'baz.c'\n" "U glub.c\n" "U sputter.h\n" "\n" "Conflict discovered in 'glorb.h'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options:\n" msgstr "" "\n" "$ svn update\n" "U INSTALL\n" "G README\n" "Conflict discovered in 'bar.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options:\n" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1605 msgid "" "In the previous example, it might be the case that <filename>baz.c</" "filename> exists in both snapshots of the branch being compared, and the " "resultant delta wants to change the file's contents, but the file doesn't " "exist in the working copy. Whatever the case, the <quote>skipped</quote> " "message means that the user is most likely comparing the wrong two trees; " "it's the classic sign of user error. When this happens, it's easy to " "recursively revert all the changes created by the merge (<userinput>svn " "revert . --recursive</userinput>), delete any unversioned files or " "directories left behind after the revert, and rerun <command>svn merge</" "command> with different arguments." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1619 msgid "" "Also notice that the preceeding example shows a conflict happening on " "<filename>glorb.h</filename>. We already stated that the working copy has " "no local edits: how can a conflict possibly happen? Again, because the user " "can use <command>svn merge</command> to define and apply any old delta to " "the working copy, that delta may contain textual changes that don't cleanly " "apply to a working file, even if the file has no local modifications." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1628 msgid "" "Another small difference between <command>svn update</command> and " "<command>svn merge</command> is the names of the full-text files created " "when a conflict happens. In <xref linkend=\"svn.tour.cycle.resolve\"/>, we " "saw that an update produces files named <filename>filename.mine</filename>, " "<filename>filename.rOLDREV</filename>, and <filename>filename.rNEWREV</" "filename>. When <command>svn merge</command> produces a conflict, though, " "it creates three files named <filename>filename.working</filename>, " "<filename>filename.left</filename>, and <filename>filename.right</" "filename>. In this case, the terms <quote>left</quote> and <quote>right</" "quote> are describing which side of the double-tree comparison the file came " "from. In any case, these differing names will help you distinguish between " "conflicts that happened as a result of an update and ones that happened as a " "result of a merge." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1651 #, fuzzy #| msgid "Undoing Working Changes" msgid "Blocking Changes" msgstr "Zurücknehmen von Änderungen in der Arbeitskopie" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1653 msgid "" "Sometimes there's a particular changeset that you don't want to be " "automatically merged. For example, perhaps your team's policy is to do new " "development work on <filename>/trunk</filename>, but to be more conservative " "about backporting changes to a stable branch you use for releasing to the " "public. On one extreme, you can manually cherrypick single changesets from " "the trunk to the branch—just the changes that are stable enough to " "pass muster. Maybe things aren't quite that strict, though; perhaps most of " "the time you'd like to just let <command>svn merge</command> automatically " "merge most changes from trunk to branch. In this case, you'd like a way to " "mask a few specific changes out, that is, prevent them from ever being " "automatically merged." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1668 msgid "" "In Subversion 1.5, the only way to block a changeset is to make the system " "believe that the change has <emphasis>already</emphasis> been merged. To do " "this, one can invoke a merge command with the <option>--record-only</option> " "option:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1674 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "\n" "$ svn propget svn:mergeinfo .\n" "/trunk:1680-3305\n" "\n" "# Let's make the metadata list r3328 as already merged.\n" "$ svn merge -c 3328 --record-only http://svn.example.com/repos/calc/trunk\n" "\n" "$ svn status\n" "M .\n" "\n" "$ svn propget svn:mergeinfo .\n" "/trunk:1680-3305,3328\n" "\n" "$ svn commit -m \"Block r3328 from being merged to the branch.\"\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1693 msgid "" "This technique works, but it's also a little bit dangerous. The main " "problem is that we're not clearly differentiating between the ideas of " "<quote>I don't want this change</quote> and <quote>I don't have this change." "</quote> We're effectively lying to the system, making it think that the " "change was previously merged. This puts the responsibility on you—the " "user—to remember that the change wasn't actually merged, it just " "wasn't wanted. There's no way to ask Subversion for a list of " "<quote>blocked changelists.</quote> If you want to track them (so that you " "can unblock them someday). you'll need to record them in a text file " "somewhere, or perhaps in an invented property. In Subversion 1.5, " "unfortunately, this is the only way to manage blocked revisions; the plans " "are to make a better interface for this in future versions." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1713 msgid "Merge-Sensitive Logs and Annotations" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1715 msgid "" "One of the main features of any version control system is to keep track of " "who changed what, and when they did it. The <command>svn log</command> and " "<command>svn blame</command> commands are just the tools for this: when " "invoked on individual files, they show not only the history of changesets " "that affected the file, but also exactly which user wrote which line of " "code, and when she did it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1723 msgid "" "When changes start getting replicated between branches, however, things " "start to get complicated. For example, if you were to ask <command>svn log</" "command> about the history of your feature branch, it would show exactly " "every revision that ever affected the branch:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1729 #, no-wrap msgid "" "\n" "$ cd my-calc-branch\n" "$ svn log -q\n" "------------------------------------------------------------------------\n" "r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line\n" "------------------------------------------------------------------------\n" "r388 | user | 2002-11-21 05:20:00 -0600 (Thu, 21 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r381 | user | 2002-11-20 15:07:06 -0600 (Wed, 20 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r359 | user | 2002-11-19 19:19:20 -0600 (Tue, 19 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r357 | user | 2002-11-15 14:29:52 -0600 (Fri, 15 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r343 | user | 2002-11-07 13:50:10 -0600 (Thu, 07 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r341 | user | 2002-11-03 07:17:16 -0600 (Sun, 03 Nov 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines\n" "------------------------------------------------------------------------\n" "r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1753 msgid "" "But is this really an accurate picture of all the changes that happened on " "the branch? What's being left out here is the fact that revisions 390, 381, " "and 357 were actually the results of merging changes from the trunk. If you " "look at one of these logs in detail, the multiple trunk changesets that " "comprised the branch change are nowhere to be seen:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1760 #, no-wrap msgid "" "\n" "$ svn log -v -r 390\n" "------------------------------------------------------------------------\n" "r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line\n" "Changed paths:\n" " M /branches/my-calc-branch/button.c\n" " M /branches/my-calc-branch/README\n" "\n" "Final merge of trunk changes to my-calc-branch.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1771 msgid "" "We happen to know that this merge to the branch was nothing but a merge of " "trunk changes. How can we see those trunk changes as well? The answer is to " "use the <option>--use-merge-history</option> (<option>-g</option>) option. " "This option expands those <quote>child</quote> changes that were part of the " "merge." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1778 #, no-wrap msgid "" "\n" "$ svn log -v -r 390 -g\n" "------------------------------------------------------------------------\n" "r390 | user | 2002-11-22 11:01:57 -0600 (Fri, 22 Nov 2002) | 1 line\n" "Changed paths:\n" " M /branches/my-calc-branch/button.c\n" " M /branches/my-calc-branch/README\n" "\n" "Final merge of trunk changes to my-calc-branch.\n" "------------------------------------------------------------------------\n" "r383 | sally | 2002-11-21 03:19:00 -0600 (Thu, 21 Nov 2002) | 2 lines\n" "Changed paths:\n" " M /branches/my-calc-branch/button.c\n" "Merged via: r390\n" "\n" "Fix inverse graphic error on button.\n" "------------------------------------------------------------------------\n" "r382 | sally | 2002-11-20 16:57:06 -0600 (Wed, 20 Nov 2002) | 2 lines\n" "Changed paths:\n" " M /branches/my-calc-branch/README\n" "Merged via: r390\n" "\n" "Document my last fix in README.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1803 msgid "" "By making the log operation use merge history, we see not just the revision " "we queried (r390), but also the two revisions that came along on the ride " "with it—a couple of changes made by Sally to the trunk. This is a " "much more complete picture of history!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1809 msgid "" "The <command>svn blame</command> command also takes the <option>--use-merge-" "history</option> (<option>-g</option>) option. If this option is " "neglected, somebody looking at a line-by-line annotation of <filename>button." "c</filename> may get the mistaken impression that you were responsible for " "the lines that fixed a certain error:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1816 #, no-wrap msgid "" "\n" "$ svn blame button.c\n" "…\n" " 390 user retval = inverse_func(button, path);\n" " 390 user return retval;\n" " 390 user }\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1825 msgid "" "And while it's true that you did actually commit those three lines in " "revision 390, two of them were actually written by Sally back in revision " "383:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1829 #, no-wrap msgid "" "\n" "$ svn blame button.c -g\n" "…\n" "G 383 sally retval = inverse_func(button, path);\n" "G 383 sally return retval;\n" " 390 user }\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1838 msgid "" "Now we know who to <emphasis>really</emphasis> blame for those two lines of " "code!" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1845 msgid "Noticing or Ignoring Ancestry" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1847 msgid "" "When conversing with a Subversion developer, you might very likely hear " "reference to the term <firstterm>ancestry</firstterm>. This word is used to " "describe the relationship between two objects in a repository: if they're " "related to each other, one object is said to be an ancestor of the other." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1854 msgid "" "For example, suppose you commit revision 100, which includes a change to a " "file <filename>foo.c</filename>. Then <filename>foo.c@99</filename> is an " "<quote>ancestor</quote> of <filename>foo.c@100</filename>. On the other " "hand, suppose you commit the deletion of <filename>foo.c</filename> in " "revision 101, and then add a new file by the same name in revision 102. In " "this case, <filename>foo.c@99</filename> and <filename>foo.c@102</filename> " "may appear to be related (they have the same path), but in fact are " "completely different objects in the repository. They share no history or " "<quote>ancestry.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1867 msgid "" "The reason for bringing this up is to point out an important difference " "between <command>svn diff</command> and <command>svn merge</command>. The " "former command ignores ancestry, while the latter command is quite sensitive " "to it. For example, if you asked <command>svn diff</command> to compare " "revisions 99 and 102 of <filename>foo.c</filename>, you would see line-based " "diffs; the <command>diff</command> command is blindly comparing two paths. " "But if you asked <command>svn merge</command> to compare the same two " "objects, it would notice that they're unrelated and first attempt to delete " "the old file, then add the new file; the output would indicate a deletion " "followed by an add:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1880 #, no-wrap msgid "" "\n" "D foo.c\n" "A foo.c\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1885 msgid "" "Most merges involve comparing trees that are ancestrally related to one " "another; therefore, <command>svn merge</command> defaults to this behavior. " "Occasionally, however, you may want the <command>merge</command> command to " "compare two unrelated trees. For example, you may have imported two source-" "code trees representing different vendor releases of a software project (see " "<xref linkend=\"svn.advanced.vendorbr\"/>). If you ask <command>svn merge</" "command> to compare the two trees, you'd see the entire first tree being " "deleted, followed by an add of the entire second tree! In these situations, " "you'll want <command>svn merge</command> to do a path-based comparison only, " "ignoring any relations between files and directories. Add the <option>--" "ignore-ancestry</option> option to your <command>merge</command> command, " "and it will behave just like <command>svn diff</command>. (And conversely, " "the <option>--notice-ancestry</option> option will cause <command>svn diff</" "command> to behave like the <command>svn merge</command> command.)" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1909 msgid "Merges and Moves" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1911 msgid "" "A common desire is to refactor source code, especially in Java-based " "software projects. Files and directories are shuffled around and renamed, " "often causing great disruption to everyone working on the project. Sounds " "like a perfect case to use a branch, doesn't it? Just create a branch, " "shuffle things around, and then merge the branch back to the trunk, right?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1919 msgid "" "Alas, this scenario doesn't work so well right now and is considered one of " "Subversion's current weak spots. The problem is that Subversion's " "<command>svn update</command> command isn't as robust as it should be, " "particularly when dealing with copy and move operations." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1925 msgid "" "When you use <command>svn copy</command> to duplicate a file, the repository " "remembers where the new file came from, but it fails to transmit that " "information to the client which is running <command>svn update</command> or " "<command>svn merge</command>. Instead of telling the client, <quote>Copy " "that file you already have to this new location,</quote> it sends down an " "entirely new file. This can lead to problems, especially because the same " "thing happens with renamed files. A lesser-known fact about Subversion is " "that it lacks <quote>true renames</quote>—the <command>svn move</" "command> command is nothing more than an aggregation of <command>svn copy</" "command> and <command>svn delete</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1939 msgid "" "For example, suppose that while working on your private branch, you rename " "<filename>integer.c</filename> to <filename>whole.c</filename>. Effectively " "you've created a new file in your branch that is a copy of the original " "file, and deleted the original file. Meanwhile, back on <filename>trunk</" "filename>, Sally has committed some improvements to <filename>integer.c</" "filename>. Now you decide to merge your branch to the trunk:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:1948 #, no-wrap msgid "" "\n" "$ cd calc/trunk\n" "\n" "$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/my-calc-branch\n" "--- Merging differences between repository URLs into '.':\n" "D integer.c\n" "A whole.c\n" "U .\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1958 msgid "" "This doesn't look so bad at first glance, but it's also probably not what " "you or Sally expected. The merge operation has deleted the latest version " "of the <filename>integer.c</filename> file (the one containing Sally's " "latest changes), and blindly added your new <filename>whole.c</filename> " "file—which is a duplicate of the <emphasis>older</emphasis> version of " "<filename>integer.c</filename>. The net effect is that merging your " "<quote>rename</quote> to the branch has removed Sally's recent changes from " "the latest revision!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1969 msgid "" "This isn't true data loss; Sally's changes are still in the repository's " "history, but it may not be immediately obvious that this has happened. The " "moral of this story is that until Subversion improves, be very careful about " "merging copies and renames from one branch to another." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:1980 msgid "Blocking Merge-Unaware Clients" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1982 msgid "" "If you've just upgraded your server to Subversion 1.5 or later, there's a " "significant risk that pre-1.5 Subversion clients can mess up your automated " "merge tracking. Why is this? When a pre-1.5 Subversion client performs " "<command>svn merge</command>, it doesn't modify the value of the " "<literal>svn:mergeinfo</literal> property at all. So the subsequent commit, " "despite being the result of a merge, doesn't tell the repository about the " "duplicated changes—that information is lost. Later on, when " "<quote>merge-aware</quote> clients attempt automatic merging, they're likely " "to run into all sorts of conflicts resulting from repeated merges." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:1995 msgid "" "If you and your team are relying on the merge-tracking features of " "Subversion, you may want to configure your repository to prevent older " "clients from committing changes. The easy way to do this is by inspecting " "the <quote>capabilities</quote> parameter in the <literal>start-commit</" "literal> hook script. If the client reports itself as having " "<literal>mergeinfo</literal> capabilities, the hook script can allow the " "commit to start. If the client doesn't report that capability, have the " "hook deny the commit. We'll learn more about hook scripts in the next " "chapter; see <xref linkend=\"svn.reposadmin.create.hooks\"/> and <xref " "linkend=\"svn.ref.reposhooks.start-commit\"/> for details." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2014 msgid "The Final Word on Merge Tracking" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2016 msgid "" "The bottom line is that Subversion's merge-tracking feature has an extremely " "complex internal implementation, and the <literal>svn:mergeinfo</literal> " "property is the only window the user has into the machinery. Because the " "feature is relatively new, a numbers of edge cases and possible unexpected " "behaviors may pop up." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2023 msgid "" "For example, sometimes mergeinfo will be generated when running a simple " "<command>svn copy</command> or <command>svn move</command> command. " "Sometimes mergeinfo will appear on files that you didn't expect to be " "touched by an operation. Sometimes mergeinfo won't be generated at all, " "when you expect it to. Furthermore, the management of mergeinfo metadata " "has a whole set of taxonomies and behaviors around it, such as " "<quote>explicit</quote> versus <quote>implicit</quote> mergeinfo, " "<quote>operative</quote> versus <quote>inoperative</quote> revisions, " "specific mechanisms of mergeinfo <quote>elision,</quote> and even " "<quote>inheritance</quote> from parent to child directories." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2037 msgid "" "We've chosen not to cover these detailed topics in this book for a couple of " "reasons. First, the level of detail is absolutely overwhelming for a " "typical user. Second, as Subversion continues to improve, we feel that a " "typical user <emphasis>shouldn't</emphasis> have to understand these " "concepts; they'll eventually fade into the background as pesky " "implementation details. All that said, if you enjoy this sort of thing, you " "can get a fantastic overview in a paper posted at CollabNet's website: " "<ulink url=\"http://www.collab.net/community/subversion/articles/merge-info." "html\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2049 msgid "" "For now, if you want to steer clear of bugs and odd behaviors in automatic " "merging, the CollabNet article recommends that you stick to these simple " "best practices:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2055 msgid "" "For short-term feature branches, follow the simple procedure described " "throughout <xref linkend=\"svn.branchmerge.basicmerging\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2060 msgid "" "For long-lived release branches (as described in <xref linkend=\"svn." "branchmerge.commonpatterns\"/>), perform merges only on the root of the " "branch, not on subdirectories." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2066 msgid "" "Never merge into working copies with a mixture of working revision numbers, " "or with <quote>switched</quote> subdirectories (as described next in <xref " "linkend=\"svn.branchmerge.switchwc\"/>). A merge target should be a working " "copy which represents a <emphasis>single</emphasis> location in the " "repository at a single point in time." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2075 msgid "" "Don't ever edit the <literal>svn:mergeinfo</literal> property directly; use " "<command>svn merge</command> with the <option>--record-only</option> option " "to effect a desired change to the metadata (as demonstrated in <xref linkend=" "\"svn.branchmerge.advanced.blockchanges\"/>)." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2082 msgid "" "Always make sure you have complete read access to all of your merge sources, " "and that your target working copy has no sparse directories." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:2096 msgid "Traversing Branches" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2098 msgid "" "The <command>svn switch</command> command transforms an existing working " "copy to reflect a different branch. While this command isn't strictly " "necessary for working with branches, it provides a nice shortcut. In our " "earlier example, after creating your private branch, you checked out a fresh " "working copy of the new repository directory. Instead, you can simply ask " "Subversion to change your working copy of <filename>/calc/trunk</filename> " "to mirror the new branch location:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch04-branching-and-merging.xml:2108 #, no-wrap msgid "" "\n" "$ cd calc\n" "\n" "$ svn info | grep URL\n" "URL: http://svn.example.com/repos/calc/trunk\n" "\n" "$ svn switch http://svn.example.com/repos/calc/branches/my-calc-branch\n" "U integer.c\n" "U button.c\n" "U Makefile\n" "Updated to revision 341.\n" "\n" "$ svn info | grep URL\n" "URL: http://svn.example.com/repos/calc/branches/my-calc-branch\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2124 msgid "" "After <quote>switching</quote> to the branch, your working copy is no " "different from what you would get from doing a fresh checkout of the " "directory. And it's usually more efficient to use this command, because " "often branches differ by only a small degree. The server sends only the " "minimal set of changes necessary to make your working copy reflect the " "branch directory." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch04-branching-and-merging.xml:2132 #, fuzzy #| msgid "" #| "<command>svn status</command> also has a <option>--verbose</option> " #| "(<option>-v</option>) option, which will show you the status of " #| "<emphasis>every</emphasis> item in your working copy, even if it has not " #| "been changed:" msgid "" "The <command>svn switch</command> command also takes a <option>--revision</" "option> (<option>-r</option>) option, so you need not always move your " "working copy to the <literal>HEAD</literal> of the branch." msgstr "" "<command>svn status</command> hat auch eine <option>--verbose</option>-" "Option (<option>-v</option>), die Ihnen den Zustand <emphasis>jedes</" "emphasis> Objektes in der Arbeitskopie anzeigt, selbst wenn es sich nicht " "geändert hat:" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2137 msgid "" "Of course, most projects are more complicated than our <filename>calc</" "filename> example, and contain multiple subdirectories. Subversion users " "often follow a specific algorithm when using branches:" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2144 msgid "" "Copy the project's entire <quote>trunk</quote> to a new branch directory." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2148 msgid "" "Switch only <emphasis>part</emphasis> of the trunk working copy to mirror " "the branch." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2153 msgid "" "In other words, if a user knows that the branch work needs to happen on only " "a specific subdirectory, she uses <command>svn switch</command> to move only " "that subdirectory to the branch. (Or sometimes users will switch just a " "single working file to the branch!) That way, the user can continue to " "receive normal <quote>trunk</quote> updates to most of her working copy, but " "the switched portions will remain immune (unless someone commits a change to " "her branch). This feature adds a whole new dimension to the concept of a " "<quote>mixed working copy</quote>—not only can working copies contain " "a mixture of working revisions, but they can also contain a mixture of " "repository locations as well." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2166 msgid "" "If your working copy contains a number of switched subtrees from different " "repository locations, it continues to function as normal. When you update, " "you'll receive patches to each subtree as appropriate. When you commit, " "your local changes will still be applied as a single, atomic change to the " "repository." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:2172 msgid "" "Note that while it's okay for your working copy to reflect a mixture of " "repository locations, these locations must all be within the <emphasis>same</" "emphasis> repository. Subversion repositories aren't yet able to " "communicate with one another; that feature is planned for the future. " "<footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:2178 msgid "" "You <emphasis>can</emphasis>, however, use <command>svn switch</command> " "with the <option>--relocate</option> option if the URL of your server " "changes and you don't want to abandon an existing working copy. See <xref " "linkend=\"svn.ref.svn.c.switch\"/> for more information and an example." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch04-branching-and-merging.xml:2188 msgid "Switches and Updates" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:2190 msgid "" "Have you noticed that the output of <command>svn switch</command> and " "<command>svn update</command> looks the same? The switch command is actually " "a superset of the update command." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:2195 msgid "" "When you run <command>svn update</command>, you're asking the repository to " "compare two trees. The repository does so, and then sends a description of " "the differences back to the client. The only difference between " "<command>svn switch</command> and <command>svn update</command> is that the " "latter command always compares two identical repository paths." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:2203 msgid "" "That is, if your working copy is a mirror of <filename>/calc/trunk</" "filename>, <command>svn update</command> will automatically compare your " "working copy of <filename>/calc/trunk</filename> to <filename>/calc/trunk</" "filename> in the <literal>HEAD</literal> revision. If you're switching your " "working copy to a branch, <command>svn switch</command> will compare your " "working copy of <filename>/calc/trunk</filename> to some <emphasis>other</" "emphasis> branch directory in the <literal>HEAD</literal> revision." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch04-branching-and-merging.xml:2215 msgid "" "In other words, an update moves your working copy through time. A switch " "moves your working copy through time <emphasis>and</emphasis> space." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2220 msgid "" "Because <command>svn switch</command> is essentially a variant of " "<command>svn update</command>, it shares the same behaviors; any local " "modifications in your working copy are preserved when new data arrives from " "the repository." msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch04-branching-and-merging.xml:2227 msgid "" "Have you ever found yourself making some complex edits (in your <filename>/" "trunk</filename> working copy) and suddenly realized, <quote>Hey, these " "changes ought to be in their own branch?</quote> A great technique to do " "this can be summarized in two steps:" msgstr "" # type: Content of: <chapter><sect1><tip><screen> #: ../en/book/ch04-branching-and-merging.xml:2233 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk \\\n" " http://svn.example.com/repos/calc/branches/newbranch \\\n" " -m \"Create branch 'newbranch'.\"\n" "Committed revision 353.\n" "$ svn switch http://svn.example.com/repos/calc/branches/newbranch\n" "At revision 353.\n" msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch04-branching-and-merging.xml:2242 msgid "" "The <command>svn switch</command> command, like <command>svn update</" "command>, preserves your local edits. At this point, your working copy is " "now a reflection of the newly created branch, and your next <command>svn " "commit</command> invocation will send your changes there." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:2256 msgid "Tags" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2258 msgid "" "Another common version control concept is a <firstterm>tag</firstterm>. A " "tag is just a <quote>snapshot</quote> of a project in time. In Subversion, " "this idea already seems to be everywhere. Each repository revision is " "exactly that—a snapshot of the filesystem after each commit." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2265 msgid "" "However, people often want to give more human-friendly names to tags, such " "as <literal>release-1.0</literal>. And they want to make snapshots of " "smaller subdirectories of the filesystem. After all, it's not so easy to " "remember that release 1.0 of a piece of software is a particular " "subdirectory of revision 4822." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2274 msgid "Creating a Simple Tag" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2276 msgid "" "Once again, <command>svn copy</command> comes to the rescue. If you want to " "create a snapshot of <filename>/calc/trunk</filename> exactly as it looks in " "the <literal>HEAD</literal> revision, make a copy of it:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2281 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk \\\n" " http://svn.example.com/repos/calc/tags/release-1.0 \\\n" " -m \"Tagging the 1.0 release of the 'calc' project.\"\n" "\n" "Committed revision 902.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2289 msgid "" "This example assumes that a <filename>/calc/tags</filename> directory " "already exists. (If it doesn't, you can create it using <command>svn mkdir</" "command>.) After the copy completes, the new <filename>release-1.0</" "filename> directory is forever a snapshot of how the <filename>/trunk</" "filename> directory looked in the <literal>HEAD</literal> revision at the " "time you made the copy. Of course, you might want to be more precise about " "exactly which revision you copy, in case somebody else may have committed " "changes to the project when you weren't looking. So if you know that " "revision 901 of <filename>/calc/trunk</filename> is exactly the snapshot you " "want, you can specify it by passing <option>-r 901</option> to the " "<command>svn copy</command> command." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2304 msgid "" "But wait a moment: isn't this tag creation procedure the same procedure we " "used to create a branch? Yes, in fact, it is. In Subversion, there's no " "difference between a tag and a branch. Both are just ordinary directories " "that are created by copying. Just as with branches, the only reason a " "copied directory is a <quote>tag</quote> is because <emphasis>humans</" "emphasis> have decided to treat it that way: as long as nobody ever commits " "to the directory, it forever remains a snapshot. If people start committing " "to it, it becomes a branch." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2315 msgid "" "If you are administering a repository, there are two approaches you can take " "to managing tags. The first approach is <quote>hands off</quote>: as a " "matter of project policy, decide where your tags will live, and make sure " "all users know how to treat the directories they copy. (That is, make sure " "they know not to commit to them.) The second approach is more paranoid: you " "can use one of the access control scripts provided with Subversion to " "prevent anyone from doing anything but creating new copies in the tags area " "(see <xref linkend=\"svn.serverconfig\"/>). The paranoid approach, however, " "isn't usually necessary. If a user accidentally commits a change to a tag " "directory, you can simply undo the change as discussed in the previous " "section. This is version control, after all!" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2334 msgid "Creating a Complex Tag" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2336 msgid "" "Sometimes you may want your <quote>snapshot</quote> to be more complicated " "than a single directory at a single revision." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2340 msgid "" "For example, pretend your project is much larger than our <filename>calc</" "filename> example: suppose it contains a number of subdirectories and many " "more files. In the course of your work, you may decide that you need to " "create a working copy that is designed to have specific features and bug " "fixes. You can accomplish this by selectively backdating files or " "directories to particular revisions (using <command>svn update</command> " "with the <option>-r</option> option liberally), by switching files and " "directories to particular branches (making use of <command>svn switch</" "command>), or even just by making a bunch of local changes. When you're " "done, your working copy is a hodgepodge of repository locations from " "different revisions. But after testing, you know it's the precise " "combination of data you need to tag." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2355 msgid "" "Time to make a snapshot. Copying one URL to another won't work here. In " "this case, you want to make a snapshot of your exact working copy " "arrangement and store it in the repository. Luckily, <command>svn copy</" "command> actually has four different uses (which you can read about in <xref " "linkend=\"svn.ref\"/>), including the ability to copy a working copy tree to " "the repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2363 #, no-wrap msgid "" "\n" "$ ls\n" "my-working-copy/\n" "\n" "$ svn copy my-working-copy \\\n" " http://svn.example.com/repos/calc/tags/mytag \\\n" " -m \"Tag my existing working copy state.\"\n" "\n" "Committed revision 940.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2374 msgid "" "Now there is a new directory in the repository, <filename>/calc/tags/mytag</" "filename>, which is an exact snapshot of your working copy—mixed " "revisions, URLs, local changes, and all." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2379 msgid "" "Other users have found interesting uses for this feature. Sometimes there " "are situations where you have a bunch of local changes made to your working " "copy, and you'd like a collaborator to see them. Instead of running " "<command>svn diff</command> and sending a patch file (which won't capture " "directory, symlink, or property changes), you can use <command>svn copy</" "command> to <quote>upload</quote> your working copy to a private area of the " "repository. Your collaborator can then either check out a verbatim copy of " "your working copy or use <command>svn merge</command> to receive your exact " "changes." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2391 msgid "" "While this is a nice method for uploading a quick snapshot of your working " "copy, note that this is <emphasis>not</emphasis> a good way to initially " "create a branch. Branch creation should be an event unto itself, and this " "method conflates the creation of a branch with extra changes to files, all " "within a single revision. This makes it very difficult (later on) to " "identify a single revision number as a branch point." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:2407 msgid "Branch Maintenance" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2409 msgid "" "You may have noticed by now that Subversion is extremely flexible. Because " "it implements branches and tags with the same underlying mechanism " "(directory copies), and because branches and tags appear in normal " "filesystem space, many people find Subversion intimidating. It's almost " "<emphasis>too</emphasis> flexible. In this section, we'll offer some " "suggestions for arranging and managing your data over time." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch04-branching-and-merging.xml:2419 #, fuzzy #| msgid "Repository URLs" msgid "Repository Layout" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2421 #, fuzzy #| msgid "" #| "While Subversion's flexibility allows you to lay out your repository in " #| "any way that you choose, we recommend that you create a <filename>trunk</" #| "filename> directory to hold the <quote>main line</quote> of development, " #| "a <filename>branches</filename> directory to contain branch copies, and a " #| "<filename>tags</filename> directory to contain tag copies. For example:" msgid "" "There are some standard, recommended ways to organize a repository. Most " "people create a <filename>trunk</filename> directory to hold the <quote>main " "line</quote> of development, a <filename>branches</filename> directory to " "contain branch copies, and a <filename>tags</filename> directory to contain " "tag copies. If a repository holds only one project, often people create " "these top-level directories:" msgstr "" "Obwohl die Flexibilität von Subversion es Ihnen erlaubt, Ihr Repository nach " "Belieben aufzuteilen, empfehlen wir, ein Verzeichnis <filename>trunk</" "filename> für die <quote>Hauptlinie</quote> der Entwicklung, ein Verzeichnis " "<filename>branches</filename> für Branch-Kopien und ein Verzeichnis " "<filename>tags</filename> für Tag-Kopien. Zum Beispiel:" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2429 #, no-wrap msgid "" "\n" "/trunk\n" "/branches\n" "/tags\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2435 msgid "" "If a repository contains multiple projects, admins typically index their " "layout by project (see <xref linkend=\"svn.reposadmin.projects.chooselayout" "\"/> to read more about <quote>project roots</quote>):" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2440 #, no-wrap msgid "" "\n" "/paint/trunk\n" "/paint/branches\n" "/paint/tags\n" "/calc/trunk\n" "/calc/branches\n" "/calc/tags\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2449 msgid "" "Of course, you're free to ignore these common layouts. You can create any " "sort of variation, whatever works best for you or your team. Remember that " "whatever you choose, it's not a permanent commitment. You can reorganize " "your repository at any time. Because branches and tags are ordinary " "directories, the <command>svn move</command> command can move or rename them " "however you wish. Switching from one layout to another is just a matter of " "issuing a series of server-side moves; if you don't like the way things are " "organized in the repository, just juggle the directories around." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2460 msgid "" "Remember, though, that while moving directories may be easy to do, you need " "to be considerate of your users as well. Your juggling can be disorienting " "to users with existing working copies. If a user has a working copy of a " "particular repository directory, your <command>svn move</command> operation " "might remove the path from the latest revision. When the user next runs " "<command>svn update</command>, she will be told that her working copy " "represents a path that no longer exists, and the user will be forced to " "<command>svn switch</command> to the new location." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2476 msgid "Data Lifetimes" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2478 msgid "" "Another nice feature of Subversion's model is that branches and tags can " "have finite lifetimes, just like any other versioned item. For example, " "suppose you eventually finish all your work on your personal branch of the " "<filename>calc</filename> project. After merging all of your changes back " "into <filename>/calc/trunk</filename>, there's no need for your private " "branch directory to stick around anymore:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2487 #, no-wrap msgid "" "\n" "$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \\\n" " -m \"Removing obsolete branch of calc project.\"\n" "\n" "Committed revision 375.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2494 msgid "" "And now your branch is gone. Of course, it's not really gone: the directory " "is simply missing from the <literal>HEAD</literal> revision, no longer " "distracting anyone. If you use <command>svn checkout</command>, " "<command>svn switch</command>, or <command>svn list</command> to examine an " "earlier revision, you'll still be able to see your old branch." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2502 msgid "" "If browsing your deleted directory isn't enough, you can always bring it " "back. Resurrecting data is very easy in Subversion. If there's a deleted " "directory (or file) that you'd like to bring back into <literal>HEAD</" "literal>, simply use <command>svn copy</command> to copy it from the old " "revision:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2509 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/branches/my-calc-branch@374 \\\n" " http://svn.example.com/repos/calc/branches/my-calc-branch \\\n" " -m \"Restore my-calc-branch.\"\n" "\n" "Committed revision 376.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2517 msgid "" "In our example, your personal branch had a relatively short lifetime: you " "may have created it to fix a bug or implement a new feature. When your task " "is done, so is the branch. In software development, though, it's also " "common to have two <quote>main</quote> branches running side by side for " "very long periods. For example, suppose it's time to release a stable " "version of the <filename>calc</filename> project to the public, and you know " "it's going to take a couple of months to shake bugs out of the software. " "You don't want people to add new features to the project, but you don't want " "to tell all developers to stop programming either. So instead, you create a " "<quote>stable</quote> branch of the software that won't change much:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2531 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/calc/trunk \\\n" " http://svn.example.com/repos/calc/branches/stable-1.0 \\\n" " -m \"Creating stable branch of calc project.\"\n" "\n" "Committed revision 377.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2539 msgid "" "And now developers are free to continue adding cutting-edge (or " "experimental) features to <filename>/calc/trunk</filename>, and you can " "declare a project policy that only bug fixes are to be committed to " "<filename>/calc/branches/stable-1.0</filename>. That is, as people continue " "to work on the trunk, a human selectively ports bug fixes over to the stable " "branch. Even after the stable branch has shipped, you'll probably continue " "to maintain the branch for a long time—that is, as long as you " "continue to support that release for customers. We'll discuss this more in " "the next section." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:2559 msgid "Common Branching Patterns" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2561 msgid "" "There are many different uses for branching and <command>svn merge</" "command>, and this section describes the most common." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2565 msgid "" "Version control is most often used for software development, so here's a " "quick peek at two of the most common branching/merging patterns used by " "teams of programmers. If you're not using Subversion for software " "development, feel free to skip this section. If you're a software developer " "using version control for the first time, pay close attention, as these " "patterns are often considered best practices by experienced folk. These " "processes aren't specific to Subversion; they're applicable to any version " "control system. Still, it may help to see them described in Subversion " "terms." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2579 msgid "Release Branches" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2581 msgid "" "Most software has a typical life cycle: code, test, release, repeat. There " "are two problems with this process. First, developers need to keep writing " "new features while quality assurance teams take time to test supposedly " "stable versions of the software. New work cannot halt while the software is " "tested. Second, the team almost always needs to support older, released " "versions of software; if a bug is discovered in the latest code, it most " "likely exists in released versions as well, and customers will want to get " "that bug fix without having to wait for a major new release." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2593 msgid "" "Here's where version control can help. The typical procedure looks like " "this:" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2599 msgid "" "<emphasis>Developers commit all new work to the trunk.</emphasis> Day-to-day " "changes are committed to <filename>/trunk</filename>: new features, bug " "fixes, and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2608 msgid "" "<emphasis>The trunk is copied to a <quote>release</quote> branch.</emphasis> " "When the team thinks the software is ready for release (say, a 1.0 release), " "<filename>/trunk</filename> might be copied to <filename>/branches/1.0</" "filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2618 msgid "" "<emphasis>Teams continue to work in parallel.</emphasis> One team begins " "rigorous testing of the release branch, while another team continues new " "work (say, for version 2.0) on <filename>/trunk</filename>. If bugs are " "discovered in either location, fixes are ported back and forth as " "necessary. At some point, however, even that process stops. The branch is " "<quote>frozen</quote> for final testing right before a release." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2630 msgid "" "<emphasis>The branch is tagged and released.</emphasis> When testing is " "complete, <filename>/branches/1.0</filename> is copied to <filename>/" "tags/1.0.0</filename> as a reference snapshot. The tag is packaged and " "released to customers." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:2640 msgid "" "<emphasis>The branch is maintained over time.</emphasis> While work " "continues on <filename>/trunk</filename> for version 2.0, bug fixes continue " "to be ported from <filename>/trunk</filename> to <filename>/branches/1.0</" "filename>. When enough bug fixes have accumulated, management may decide to " "do a 1.0.1 release: <filename>/branches/1.0</filename> is copied to " "<filename>/tags/1.0.1</filename>, and the tag is packaged and released." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2654 msgid "" "This entire process repeats as the software matures: when the 2.0 work is " "complete, a new 2.0 release branch is created, tested, tagged, and " "eventually released. After some years, the repository ends up with a number " "of release branches in <quote>maintenance</quote> mode, and a number of tags " "representing final shipped versions." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2665 msgid "Feature Branches" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2667 msgid "" "A <firstterm>feature branch</firstterm> is the sort of branch that's been " "the dominant example in this chapter (the one you've been working on while " "Sally continues to work on <filename>/trunk</filename>). It's a temporary " "branch created to work on a complex change without interfering with the " "stability of <filename>/trunk</filename>. Unlike release branches (which " "may need to be supported forever), feature branches are born, used for a " "while, merged back to the trunk, and then ultimately deleted. They have a " "finite span of usefulness." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2678 msgid "" "Again, project policies vary widely concerning exactly when it's appropriate " "to create a feature branch. Some projects never use feature branches at " "all: commits to <filename>/trunk</filename> are a free-for-all. The " "advantage to this system is that it's simple—nobody needs to learn " "about branching or merging. The disadvantage is that the trunk code is " "often unstable or unusable. Other projects use branches to an extreme: no " "change is <emphasis>ever</emphasis> committed to the trunk directly. Even " "the most trivial changes are created on a short-lived branch, carefully " "reviewed, and merged to the trunk. Then the branch is deleted. This system " "guarantees an exceptionally stable and usable trunk at all times, but at the " "cost of tremendous process overhead." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2693 msgid "" "Most projects take a middle-of-the-road approach. They commonly insist that " "<filename>/trunk</filename> compile and pass regression tests at all times. " "A feature branch is required only when a change requires a large number of " "destabilizing commits. A good rule of thumb is to ask this question: if the " "developer worked for days in isolation and then committed the large change " "all at once (so that <filename>/trunk</filename> were never destabilized), " "would it be too large a change to review? If the answer to that question is " "<quote>yes,</quote> the change should be developed on a feature branch. As " "the developer commits incremental changes to the branch, they can be easily " "reviewed by peers." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2707 msgid "" "Finally, there's the issue of how to best keep a feature branch in " "<quote>sync</quote> with the trunk as work progresses. As we mentioned " "earlier, there's a great risk to working on a branch for weeks or months; " "trunk changes may continue to pour in, to the point where the two lines of " "development differ so greatly that it may become a nightmare trying to merge " "the branch back to the trunk." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2715 msgid "" "This situation is best avoided by regularly merging trunk changes to the " "branch. Make up a policy: once a week, merge the last week's worth of trunk " "changes to the branch." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2719 msgid "" "At some point, you'll be ready to merge the <quote>synchronized</quote> " "feature branch back to the trunk. To do this, begin by doing a final merge " "of the latest trunk changes to the branch. When that's done, the latest " "versions of branch and trunk will be absolutely identical except for your " "branch changes. You would then merge back with the <option>--reintegrate</" "option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2727 #, no-wrap msgid "" "\n" "$ cd trunk-working-copy\n" "\n" "$ svn update\n" "At revision 1910.\n" "\n" "$ svn merge --reintegrate http://svn.example.com/repos/calc/branches/mybranch\n" "--- Merging differences between repository URLs into '.':\n" "U real.c\n" "U integer.c\n" "A newdirectory\n" "A newdirectory/newfile\n" " U .\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2743 msgid "" "Another way of thinking about this pattern is that your weekly sync of trunk " "to branch is analogous to running <command>svn update</command> in a working " "copy, while the final merge step is analogous to running <command>svn " "commit</command> from a working copy. After all, what else <emphasis>is</" "emphasis> a working copy but a very shallow private branch? It's a branch " "that's capable of storing only one change at a time." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch04-branching-and-merging.xml:2760 msgid "Vendor Branches" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2762 msgid "" "As is especially the case when developing software, the data that you " "maintain under version control is often closely related to, or perhaps " "dependent upon, someone else's data. Generally, the needs of your project " "will dictate that you stay as up to date as possible with the data provided " "by that external entity without sacrificing the stability of your own " "project. This scenario plays itself out all the time—anywhere that " "the information generated by one group of people has a direct effect on that " "which is generated by another group." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2772 msgid "" "For example, software developers might be working on an application that " "makes use of a third-party library. Subversion has just such a relationship " "with the Apache Portable Runtime (APR) library (see <xref linkend=\"svn." "developer.usingapi.apr\" />). The Subversion source code depends on the APR " "library for all its portability needs. In earlier stages of Subversion's " "development, the project closely tracked APR's changing API, always sticking " "to the <quote>bleeding edge</quote> of the library's code churn. Now that " "both APR and Subversion have matured, Subversion attempts to synchronize " "with APR's library API only at well-tested, stable release points." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2784 msgid "" "Now, if your project depends on someone else's information, you could " "attempt to synchronize that information with your own in several ways. Most " "painfully, you could issue oral or written instructions to all the " "contributors of your project, telling them to make sure they have the " "specific versions of that third-party information that your project needs. " "If the third-party information is maintained in a Subversion repository, you " "could also use Subversion's externals definitions to effectively <quote>pin " "down</quote> specific versions of that information to some location in your " "own working copy directory (see <xref linkend=\"svn.advanced.externals\" />)." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2797 msgid "" "But sometimes you want to maintain custom modifications to third-party code " "in your own version control system. Returning to the software development " "example, programmers might need to make modifications to that third-party " "library for their own purposes. These modifications might include new " "functionality or bug fixes, maintained internally only until they become " "part of an official release of the third-party library. Or the changes " "might never be relayed back to the library maintainers, existing solely as " "custom tweaks to make the library further suit the needs of the software " "developers." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2808 msgid "" "Now you face an interesting situation. Your project could house its custom " "modifications to the third-party data in some disjointed fashion, such as " "using patch files or full-fledged alternative versions of files and " "directories. But these quickly become maintenance headaches, requiring some " "mechanism by which to apply your custom changes to the third-party code and " "necessitating regeneration of those changes with each successive version of " "the third-party code that you track." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2817 msgid "" "The solution to this problem is to use <firstterm>vendor branches</" "firstterm>. A vendor branch is a directory tree in your own version control " "system that contains information provided by a third-party entity, or " "vendor. Each version of the vendor's data that you decide to absorb into " "your project is called a <firstterm>vendor drop</firstterm>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:2824 msgid "" "Vendor branches provide two benefits. First, by storing the currently " "supported vendor drop in your own version control system, you ensure that " "the members of your project never need to question whether they have the " "right version of the vendor's data. They simply receive that correct " "version as part of their regular working copy updates. Second, because the " "data lives in your own Subversion repository, you can store your custom " "changes to it in-place—you have no more need of an automated (or " "worse, manual) method for swapping in your customizations." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2836 msgid "General Vendor Branch Management Procedure" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2838 msgid "" "Managing vendor branches generally works like this: first, you create a top-" "level directory (such as <filename>/vendor</filename>) to hold the vendor " "branches. Then you import the third-party code into a subdirectory of that " "top-level directory. You then copy that subdirectory into your main " "development branch (e.g., <filename>/trunk</filename>) at the appropriate " "location. You always make your local changes in the main development " "branch. With each new release of the code you are tracking, you bring it " "into the vendor branch and merge the changes into <filename>/trunk</" "filename>, resolving whatever conflicts occur between your local changes and " "the upstream changes." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2852 msgid "" "An example will help to clarify this algorithm. We'll use a scenario where " "your development team is creating a calculator program that links against a " "third-party complex number arithmetic library, libcomplex. We'll begin with " "the initial creation of the vendor branch and the import of the first vendor " "drop. We'll call our vendor branch directory <filename>libcomplex</" "filename>, and our code drops will go into a subdirectory of our vendor " "branch called <filename>current</filename>. And since <command>svn import</" "command> creates all the intermediate parent directories it needs, we can " "actually accomplish both of these steps with a single command:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2865 #, no-wrap msgid "" "\n" "$ svn import /path/to/libcomplex-1.0 \\\n" " http://svn.example.com/repos/vendor/libcomplex/current \\\n" " -m 'importing initial 1.0 vendor drop'\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2872 msgid "" "We now have the current version of the libcomplex source code in <filename>/" "vendor/libcomplex/current</filename>. Now, we tag that version (see <xref " "linkend=\"svn.branchmerge.tags\" />) and then copy it into the main " "development branch. Our copy will create a new directory called " "<filename>libcomplex</filename> in our existing <filename>calc</filename> " "project directory. It is in this copied version of the vendor data that we " "will make our customizations:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2882 #, no-wrap msgid "" "\n" "$ svn copy http://svn.example.com/repos/vendor/libcomplex/current \\\n" " http://svn.example.com/repos/vendor/libcomplex/1.0 \\\n" " -m 'tagging libcomplex-1.0'\n" "…\n" "$ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0 \\\n" " http://svn.example.com/repos/calc/libcomplex \\\n" " -m 'bringing libcomplex-1.0 into the main branch'\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch04-branching-and-merging.xml:2893 msgid "" "We check out our project's main branch—which now includes a copy of " "the first vendor drop—and we get to work customizing the libcomplex " "code. Before we know it, our modified version of libcomplex is now " "completely integrated into our calculator program. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch04-branching-and-merging.xml:2899 msgid "And is entirely bug-free, of course!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2903 msgid "" "A few weeks later, the developers of libcomplex release a new version of " "their library—version 1.1—which contains some features and " "functionality that we really want. We'd like to upgrade to this new " "version, but without losing the customizations we made to the existing " "version. What we essentially would like to do is to replace our current " "baseline version of libcomplex 1.0 with a copy of libcomplex 1.1, and then " "re-apply the custom modifications we previously made to that library to the " "new version. But we actually approach the problem from the other direction, " "applying the changes made to libcomplex between versions 1.0 and 1.1 to our " "modified copy of it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2916 msgid "" "To perform this upgrade, we check out a copy of our vendor branch and " "replace the code in the <filename>current</filename> directory with the new " "libcomplex 1.1 source code. We quite literally copy new files on top of " "existing files, perhaps exploding the libcomplex 1.1 release tarball atop " "our existing files and directories. The goal here is to make our " "<filename>current</filename> directory contain only the libcomplex 1.1 code " "and to ensure that all that code is under version control. Oh, and we want " "to do this with as little version control history disturbance as possible." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2928 msgid "" "After replacing the 1.0 code with 1.1 code, <command>svn status</command> " "will show files with local modifications as well as, perhaps, some " "unversioned files. If we did what we were supposed to do, the unversioned " "files are only those new files introduced in the 1.1 release of " "libcomplex—we run <command>svn add</command> on those to get them " "under version control. If the 1.1 code no longer has certain files that " "were in the 1.0 tree, it may be hard to notice them; you'd have to compare " "the two trees with some external tool and then <command>svn delete</command> " "any files present in 1.0 but not in 1.1. (Although it might also be just " "fine to let these same files live on in unused obscurity!) Finally, once " "our <filename>current</filename> working copy contains only the libcomplex " "1.1 code, we commit the changes we made to get it looking that way." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2944 msgid "" "Our <filename>current</filename> branch now contains the new vendor drop. " "We tag the new version as 1.1 (in the same way we previously tagged the " "version 1.0 vendor drop), and then merge the differences between the tag of " "the previous version and the new current version into our main development " "branch:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:2951 #, no-wrap msgid "" "\n" "$ cd working-copies/calc\n" "$ svn merge http://svn.example.com/repos/vendor/libcomplex/1.0 \\\n" " http://svn.example.com/repos/vendor/libcomplex/current \\\n" " libcomplex\n" "… # resolve all the conflicts between their changes and our changes\n" "$ svn commit -m 'merging libcomplex-1.1 into the main branch'\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2961 msgid "" "In the trivial use case, the new version of our third-party tool would look, " "from a files-and-directories point of view, just like the previous version. " "None of the libcomplex source files would have been deleted, renamed, or " "moved to different locations—the new version would contain only " "textual modifications against the previous one. In a perfect world, our " "modifications would apply cleanly to the new version of the library, with " "absolutely no complications or conflicts." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2971 msgid "" "But things aren't always that simple, and in fact it is quite common for " "source files to get moved around between releases of software. This " "complicates the process of ensuring that our modifications are still valid " "for the new version of code, and things can quickly degrade into a situation " "where we have to manually re-create our customizations in the new version. " "Once Subversion knows about the history of a given source file—" "including all its previous locations—the process of merging in the new " "version of the library is pretty simple. But we are responsible for telling " "Subversion how the source file layout changed from vendor drop to vendor " "drop." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch04-branching-and-merging.xml:2993 msgid "svn_load_dirs.pl" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:2995 msgid "" "Vendor drops that contain more than a few deletes, additions, and moves " "complicate the process of upgrading to each successive version of the third-" "party data. So Subversion supplies the <command>svn_load_dirs.pl</command> " "script to assist with this process. This script automates the importing " "steps we mentioned in the general vendor branch management procedure to make " "sure mistakes are minimized. You will still be responsible for using the " "merge commands to merge the new versions of the third-party data into your " "main development branch, but <command>svn_load_dirs.pl</command> can help " "you more quickly and easily arrive at that stage." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3008 msgid "" "In short, <command>svn_load_dirs.pl</command> is an enhancement to " "<command>svn import</command> that has several important characteristics:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:3014 msgid "" "It can be run at any point in time to bring an existing directory in the " "repository to exactly match an external directory, performing all the " "necessary adds and deletes, and optionally performing moves, too." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:3020 msgid "" "It takes care of complicated series of operations between which Subversion " "requires an intermediate commit—such as before renaming a file or " "directory twice." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:3025 msgid "It will optionally tag the newly imported directory." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:3028 msgid "" "It will optionally add arbitrary properties to files and directories that " "match a regular expression." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3033 msgid "" "<command>svn_load_dirs.pl</command> takes three mandatory arguments. The " "first argument is the URL to the base Subversion directory to work in. This " "argument is followed by the URL—relative to the first argument—" "into which the current vendor drop will be imported. Finally, the third " "argument is the local directory to import. Using our previous example, a " "typical run of <command>svn_load_dirs.pl</command> might look like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:3042 #, no-wrap msgid "" "\n" "$ svn_load_dirs.pl http://svn.example.com/repos/vendor/libcomplex \\\n" " current \\\n" " /path/to/libcomplex-1.1\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3049 msgid "" "You can indicate that you'd like <command>svn_load_dirs.pl</command> to tag " "the new vendor drop by passing the <option>-t</option> command-line option " "and specifying a tag name. This tag is another URL relative to the first " "program argument." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:3055 #, no-wrap msgid "" "\n" "$ svn_load_dirs.pl -t libcomplex-1.1 \\\n" " http://svn.example.com/repos/vendor/libcomplex \\\n" " current \\\n" " /path/to/libcomplex-1.1\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3063 msgid "" "When you run <command>svn_load_dirs.pl</command>, it examines the contents " "of your existing <quote>current</quote> vendor drop and compares them with " "the proposed new vendor drop. In the trivial case, no files will be in one " "version and not the other, and the script will perform the new import " "without incident. If, however, there are discrepancies in the file layouts " "between versions, <command>svn_load_dirs.pl</command> will ask you how to " "resolve those differences. For example, you will have the opportunity to " "tell the script that you know that the file <filename>math.c</filename> in " "version 1.0 of libcomplex was renamed to <filename>arithmetic.c</filename> " "in libcomplex 1.1. Any discrepancies not explained by moves are treated as " "regular additions and deletions." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3078 msgid "" "The script also accepts a separate configuration file for setting properties " "on files and directories matching a regular expression that are " "<emphasis>added</emphasis> to the repository. This configuration file is " "specified to <command>svn_load_dirs.pl</command> using the <option>-p</" "option> command-line option. Each line of the configuration file is a " "whitespace-delimited set of two or four values: a Perl-style regular " "expression against which to match the added path, a control keyword (either " "<literal>break</literal> or <literal>cont</literal>), and then optionally a " "property name and value." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch04-branching-and-merging.xml:3090 #, no-wrap msgid "" "\n" "\\.png$ break svn:mime-type image/png\n" "\\.jpe?g$ break svn:mime-type image/jpeg\n" "\\.m3u$ cont svn:mime-type audio/x-mpegurl\n" "\\.m3u$ break svn:eol-style LF\n" ".* break svn:eol-style native\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3098 msgid "" "For each added path, the configured property changes whose regular " "expression matches the path are applied in order, unless the control " "specification is <literal>break</literal> (which means that no more property " "changes should be applied to that path). If the control specification is " "<literal>cont</literal>—an abbreviation for <literal>continue</" "literal>—matching will continue with the next line of the " "configuration file." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch04-branching-and-merging.xml:3107 msgid "" "Any whitespace in the regular expression, property name, or property value " "must be surrounded by either single or double quotes. You can escape quotes " "that are not used for wrapping whitespace by preceding them with a backslash " "(<literal>\\</literal>) character. The backslash escapes only quotes when " "parsing the configuration file, so do not protect any other characters " "beyond what is necessary for the regular expression." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:3125 msgid "" "We covered a lot of ground in this chapter. We discussed the concepts of " "tags and branches and demonstrated how Subversion implements these concepts " "by copying directories with the <command>svn copy</command> command. We " "showed how to use <command>svn merge</command> to copy changes from one " "branch to another or roll back bad changes. We went over the use of " "<command>svn switch</command> to create mixed-location working copies. And " "we talked about how one might manage the organization and lifetimes of " "branches in a repository." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:3136 msgid "" "Remember the Subversion mantra: branches and tags are cheap. So don't be " "afraid to use them when needed!" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch04-branching-and-merging.xml:3139 msgid "" "As a helpful reminder of all the operations we discussed, here is handy " "reference table you can consult as you begin to make use of branches." msgstr "" # type: Content of: <chapter><sect1><table><title> #: ../en/book/ch04-branching-and-merging.xml:3144 msgid "Branching and merging commands" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><thead><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3148 msgid "Action" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><thead><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3149 msgid "Command" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3154 msgid "Create a branch or tag" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3155 msgid "" "<userinput>svn copy <replaceable>URL1</replaceable> <replaceable>URL2</" "replaceable></userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3159 msgid "Switch a working copy to a branch or tag" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3160 #, fuzzy #| msgid "<userinput>svn mkdir blort</userinput>" msgid "<userinput>svn switch <replaceable>URL</replaceable></userinput>" msgstr "<userinput>svn mkdir blort</userinput>" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3164 msgid "Synchronize a branch with trunk" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3165 msgid "" "<userinput>svn merge <replaceable>trunkURL</replaceable>; svn commit</" "userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3169 msgid "See merge history or eligible changesets" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3170 msgid "" "<userinput>svn mergeinfo target --from-source=<replaceable>URL</" "replaceable></userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3174 msgid "Merge a branch back into trunk" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3175 msgid "" "<userinput>svn merge --reintegrate <replaceable>branchURL</replaceable>; svn " "commit</userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3179 msgid "Merge one specific change" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3180 msgid "" "<userinput>svn merge -c <replaceable>REV</replaceable> <replaceable>URL</" "replaceable>; svn commit</userinput>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch04-branching-and-merging.xml:3184 #, fuzzy #| msgid "See an overview of your changes" msgid "Merge a range of changes" msgstr "Verschaffen Sie sich einen Überblick über Ihre Änderungen" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3185 msgid "" "<userinput>svn merge -r <replaceable>REV1</replaceable>:<replaceable>REV2</" "replaceable> <replaceable>URL</replaceable>; svn commit</userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3189 msgid "Block a change from automatic merging" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3190 msgid "" "<userinput>svn merge -c <replaceable>REV</replaceable> --record-only " "<replaceable>URL</replaceable>; svn commit</userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3194 msgid "Preview a merge" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3195 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "" "<userinput>svn merge <replaceable>URL</replaceable> --dry-run</userinput>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3199 msgid "Abandon merge results" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3200 #, fuzzy #| msgid "<userinput>svn delete foo</userinput>" msgid "<userinput>svn revert -R .</userinput>" msgstr "<userinput>svn delete foo</userinput>" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3204 msgid "Resurrect something from history" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3205 msgid "" "<userinput>svn copy <replaceable>URL</replaceable>@<replaceable>REV</" "replaceable> <replaceable>localPATH</replaceable></userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3209 msgid "Undo a committed change" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3210 msgid "" "<userinput>svn merge -c -<replaceable>REV</replaceable> <replaceable>URL</" "replaceable>; svn commit</userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3214 msgid "Examine merge-sensitive history" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3215 #, fuzzy #| msgid "<userinput>svn copy foo bar</userinput>" msgid "<userinput>svn log -g; svn blame -g</userinput>" msgstr "<userinput>svn copy foo bar</userinput>" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch04-branching-and-merging.xml:3219 #, fuzzy #| msgid "Update your working copy." msgid "Create a tag from a working copy" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3220 #, fuzzy #| msgid "<userinput>svn copy foo bar</userinput>" msgid "<userinput>svn copy . <replaceable>tagURL</replaceable></userinput>" msgstr "<userinput>svn copy foo bar</userinput>" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3224 msgid "Rearrange a branch or tag" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3225 msgid "" "<userinput>svn mv <replaceable>URL1</replaceable> <replaceable>URL2</" "replaceable></userinput>" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch04-branching-and-merging.xml:3229 msgid "Remove a branch or tag" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch04-branching-and-merging.xml:3230 #, fuzzy #| msgid "<userinput>svn mkdir blort</userinput>" msgid "<userinput>svn rm <replaceable>URL</replaceable></userinput>" msgstr "<userinput>svn mkdir blort</userinput>" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:2 #, fuzzy #| msgid "Repository URLs" msgid "Repository Administration" msgstr "Repository URLs" # type: Content of: <chapter><para> #: ../en/book/ch05-repository-admin.xml:4 msgid "" "The Subversion repository is the central storehouse of all your versioned " "data. As such, it becomes an obvious candidate for all the love and " "attention an administrator can offer. While the repository is generally a " "low-maintenance item, it is important to understand how to properly " "configure and care for it so that potential problems are avoided, and so " "actual problems are safely resolved." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch05-repository-admin.xml:12 msgid "" "In this chapter, we'll discuss how to create and configure a Subversion " "repository. We'll also talk about repository maintenance, providing " "examples of how and when to use the <command>svnlook</command> and " "<command>svnadmin</command> tools provided with Subversion. We'll address " "some common questions and mistakes and give some suggestions on how to " "arrange the data in the repository." msgstr "" # type: Content of: <chapter><para><footnote> #: ../en/book/ch05-repository-admin.xml:20 msgid "" "If you plan to access a Subversion repository only in the role of a user " "whose data is under version control (i.e., via a Subversion client), you can " "skip this chapter altogether. However, if you are, or wish to become, a " "Subversion repository administrator, <footnote>" msgstr "" # type: Content of: <chapter><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:26 msgid "" "This may sound really prestigious and lofty, but we're just talking about " "anyone who is interested in that mysterious realm beyond the working copy " "where everyone's data hangs out." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch05-repository-admin.xml:30 msgid "</footnote> this chapter is for you." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:38 #, fuzzy #| msgid "Subversion Repository URLs" msgid "The Subversion Repository, Defined" msgstr "Subversion-Repository-URLs" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:40 msgid "" "Before jumping into the broader topic of repository administration, let's " "further define what a repository is. How does it look? How does it feel? " "Does it take its tea hot or iced, sweetened, and with lemon? As an " "administrator, you'll be expected to understand the composition of a " "repository both from a literal, OS-level perspective—how a repository " "looks and acts with respect to non-Subversion tools—and from a logical " "perspective—dealing with how data is represented <emphasis>inside</" "emphasis> the repository." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:50 msgid "" "Seen through the eyes of a typical file browser application (such as Windows " "Explorer) or command-line based filesystem navigation tools, the Subversion " "repository is just another directory full of stuff. There are some " "subdirectories with human-readable configuration files in them, some " "subdirectories with some not-so-human-readable data files, and so on. As in " "other areas of the Subversion design, modularity is given high regard, and " "hierarchical organization is preferred to cluttered chaos. So a shallow " "glance into a typical repository from a nuts-and-bolts perspective is " "sufficient to reveal the basic components of the repository:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch05-repository-admin.xml:62 #, no-wrap msgid "" "\n" "$ ls repos\n" "conf/ dav/ db/ format hooks/ locks/ README.txt\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:67 msgid "" "Here's a quick fly-by overview of what exactly you're seeing in this " "directory listing. (Don't get bogged down in the terminology—detailed " "coverage of these components exists elsewhere in this and other chapters.)" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:74 msgid "conf" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:76 msgid "A directory containing configuration files" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:80 msgid "dav" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:82 msgid "" "A directory provided to <filename>mod_dav_svn</filename> for its private " "housekeeping data" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:88 msgid "db" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:90 msgid "The data store for all of your versioned data" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:94 msgid "format" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:96 msgid "" "A file that contains a single integer that indicates the version number of " "the repository layout" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:101 msgid "hooks" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:103 msgid "" "A directory full of hook script templates (and hook scripts themselves, once " "you've installed some)" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:108 msgid "locks" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:110 msgid "" "A directory for Subversion's repository lock files, used for tracking " "accessors to the repository" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:115 msgid "README.txt" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:117 msgid "" "A file whose contents merely inform its readers that they are looking at a " "Subversion repository" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:123 msgid "" "Of course, when accessed via the Subversion libraries, this otherwise " "unremarkable collection of files and directories suddenly becomes an " "implementation of a virtual, versioned filesystem, complete with " "customizable event triggers. This filesystem has its own notions of " "directories and files, very similar to the notions of such things held by " "real filesystems (such as NTFS, FAT32, ext3, etc.). But this is a special " "filesystem—it hangs these directories and files from revisions, " "keeping all the changes you've ever made to them safely stored and forever " "accessible. This is where the entirety of your versioned data lives." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch05-repository-admin.xml:141 msgid "Strategies for Repository Deployment" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:143 msgid "" "Due largely to the simplicity of the overall design of the Subversion " "repository and the technologies on which it relies, creating and configuring " "a repository are fairly straightforward tasks. There are a few preliminary " "decisions you'll want to make, but the actual work involved in any given " "setup of a Subversion repository is pretty basic, tending toward mindless " "repetition if you find yourself setting up multiples of these things." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:152 msgid "Some things you'll want to consider beforehand, though, are:" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:156 msgid "" "What data do you expect to live in your repository (or repositories), and " "how will that data be organized?" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:160 msgid "Where will your repository live, and how will it be accessed?" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:164 msgid "" "What types of access control and repository event reporting do you need?" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:168 msgid "Which of the available types of data store do you want to use?" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:173 msgid "In this section, we'll try to help you answer those questions." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:178 msgid "Planning Your Repository Organization" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:180 msgid "" "While Subversion allows you to move around versioned files and directories " "without any loss of information, and even provides ways of moving whole sets " "of versioned history from one repository to another, doing so can greatly " "disrupt the workflow of those who access the repository often and come to " "expect things to be at certain locations. So before creating a new " "repository, try to peer into the future a bit; plan ahead before placing " "your data under version control. By conscientiously <quote>laying out</" "quote> your repository or repositories and their versioned contents ahead of " "time, you can prevent many future headaches." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:192 msgid "" "Let's assume that as repository administrator, you will be responsible for " "supporting the version control system for several projects. Your first " "decision is whether to use a single repository for multiple projects, or to " "give each project its own repository, or some compromise of these two." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:199 msgid "" "There are benefits to using a single repository for multiple projects, most " "obviously the lack of duplicated maintenance. A single repository means " "that there is one set of hook programs, one thing to routinely back up, one " "thing to dump and load if Subversion releases an incompatible new version, " "and so on. Also, you can move data between projects easily, without losing " "any historical versioning information." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:208 msgid "" "The downside of using a single repository is that different projects may " "have different requirements in terms of the repository event triggers, such " "as needing to send commit notification emails to different mailing lists, or " "having different definitions about what does and does not constitute a " "legitimate commit. These aren't insurmountable problems, of course—it " "just means that all of your hook scripts have to be sensitive to the layout " "of your repository rather than assuming that the whole repository is " "associated with a single group of people. Also, remember that Subversion " "uses repository-global revision numbers. While those numbers don't have any " "particular magical powers, some folks still don't like the fact that even " "though no changes have been made to their project lately, the youngest " "revision number for the repository keeps climbing because other projects are " "actively adding new revisions. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:225 msgid "" "Whether founded in ignorance or in poorly considered concepts about how to " "derive legitimate software development metrics, global revision numbers are " "a silly thing to fear, and <emphasis>not</emphasis> the kind of thing you " "should weigh when deciding how to arrange your projects and repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:234 msgid "" "A middle-ground approach can be taken, too. For example, projects can be " "grouped by how well they relate to each other. You might have a few " "repositories with a handful of projects in each repository. That way, " "projects that are likely to want to share data can do so easily, and as new " "revisions are added to the repository, at least the developers know that " "those new revisions are at least remotely related to everyone who uses that " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:243 msgid "" "After deciding how to organize your projects with respect to repositories, " "you'll probably want to think about directory hierarchies within the " "repositories themselves. Because Subversion uses regular directory copies " "for branching and tagging (see <xref linkend=\"svn.branchmerge\"/>), the " "Subversion community recommends that you choose a repository location for " "each <firstterm>project root</firstterm>—the <quote>topmost</quote> " "directory that contains data related to that project—and then create " "three subdirectories beneath that root: <filename>trunk</filename>, meaning " "the directory under which the main project development occurs; " "<filename>branches</filename>, which is a directory in which to create " "various named branches of the main development line; and <filename>tags</" "filename>, which is a collection of tree snapshots that are created, and " "perhaps destroyed, but never changed. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:261 msgid "" "The <filename>trunk</filename>, <filename>tags</filename>, and " "<filename>branches</filename> trio is sometimes referred to as <quote>the " "TTB directories.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:267 msgid "For example, your repository might look like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:269 #, no-wrap msgid "" "\n" "/\n" " calc/\n" " trunk/\n" " tags/\n" " branches/\n" " calendar/\n" " trunk/\n" " tags/\n" " branches/\n" " spreadsheet/\n" " trunk/\n" " tags/\n" " branches/\n" " …\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:286 msgid "" "Note that it doesn't matter where in your repository each project root is. " "If you have only one project per repository, the logical place to put each " "project root is at the root of that project's respective repository. If you " "have multiple projects, you might want to arrange them in groups inside the " "repository, perhaps putting projects with similar goals or shared code in " "the same subdirectory, or maybe just grouping them alphabetically. Such an " "arrangement might look like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:296 #, no-wrap msgid "" "\n" "/\n" " utils/\n" " calc/\n" " trunk/\n" " tags/\n" " branches/\n" " calendar/\n" " trunk/\n" " tags/\n" " branches/\n" " …\n" " office/\n" " spreadsheet/\n" " trunk/\n" " tags/\n" " branches/\n" " …\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:316 msgid "" "Lay out your repository in whatever way you see fit. Subversion does not " "expect or enforce a particular layout—in its eyes, a directory is a " "directory is a directory. Ultimately, you should choose the repository " "arrangement that meets the needs of the people who work on the projects that " "live there." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:323 msgid "" "In the name of full disclosure, though, we'll mention another very common " "layout. In this layout, the <filename>trunk</filename>, <filename>tags</" "filename>, and <filename>branches</filename> directories live in the root " "directory of your repository, and your projects are in subdirectories " "beneath those, like so:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:330 #, no-wrap msgid "" "\n" "/\n" " trunk/\n" " calc/\n" " calendar/\n" " spreadsheet/\n" " …\n" " tags/\n" " calc/\n" " calendar/\n" " spreadsheet/\n" " …\n" " branches/\n" " calc/\n" " calendar/\n" " spreadsheet/\n" " …\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:349 msgid "" "There's nothing particularly incorrect about such a layout, but it may or " "may not seem as intuitive for your users. Especially in large, multiproject " "situations with many users, those users may tend to be familiar with only " "one or two of the projects in the repository. But the projects-as-branch-" "siblings approach tends to deemphasize project individuality and focus on " "the entire set of projects as a single entity. That's a social issue, " "though. We like our originally suggested arrangement for purely practical " "reasons—it's easier to ask about (or modify, or migrate elsewhere) the " "entire history of a single project when there's a single repository path " "that holds the entire history—past, present, tagged, and " "branched—for that project and that project alone." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch05-repository-admin.xml:368 #, fuzzy #| msgid "Getting Data into Your Repository" msgid "Deciding Where and How to Host Your Repository" msgstr "Wie Sie Daten in Ihr Repository bekommen" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:370 msgid "" "Before creating your Subversion repository, an obvious question you'll need " "to answer is where the thing is going to live. This is strongly connected " "to myriad other questions involving how the repository will be accessed (via " "a Subversion server or directly), by whom (users behind your corporate " "firewall or the whole world out on the open Internet), what other services " "you'll be providing around Subversion (repository browsing interfaces, email-" "based commit notification, etc.), your data backup strategy, and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:381 msgid "" "We cover server choice and configuration in <xref linkend=\"svn.serverconfig" "\" />, but the point we'd like to briefly make here is simply that the " "answers to some of these other questions might have implications that force " "your hand when deciding where your repository will live. For example, " "certain deployment scenarios might require accessing the repository via a " "remote filesystem from multiple computers, in which case (as you'll read in " "the next section) your choice of a repository backend data store turns out " "not to be a choice at all because only one of the available backends will " "work in this scenario." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:393 msgid "" "Addressing each possible way to deploy Subversion is both impossible and " "outside the scope of this book. We simply encourage you to evaluate your " "options using these pages and other sources as your reference material and " "to plan ahead." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:403 msgid "Choosing a Data Store" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:405 msgid "" "As of version 1.1, Subversion provides two options for the type of " "underlying data store—often referred to as <quote>the backend</quote> " "or, somewhat confusingly, <quote>the (versioned) filesystem</quote>—" "that each repository uses. One type of data store keeps everything in a " "Berkeley DB (or BDB) database environment; repositories that use this type " "are often referred to as being <quote>BDB-backed.</quote> The other type " "stores data in ordinary flat files, using a custom format. Subversion " "developers have adopted the habit of referring to this latter data storage " "mechanism as <firstterm>FSFS</firstterm> <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:417 msgid "" "Often pronounced <quote>fuzz-fuzz,</quote> if Jack Repenning has anything to " "say about it. (This book, however, assumes that the reader is thinking " "<quote>eff-ess-eff-ess.</quote>)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:421 msgid "" "</footnote> —a versioned filesystem implementation that uses the " "native OS filesystem directly—rather than via a database library or " "some other abstraction layer—to store data." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:426 msgid "" "<xref linkend=\"svn.reposadmin.basics.backends.tbl-1\" /> gives a " "comparative overview of Berkeley DB and FSFS repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><table><title> #: ../en/book/ch05-repository-admin.xml:431 msgid "Repository data store comparison" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><thead><row><entry> #: ../en/book/ch05-repository-admin.xml:435 msgid "Category" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><thead><row><entry> #: ../en/book/ch05-repository-admin.xml:436 #: ../en/book/ch06-server-configuration.xml:80 msgid "Feature" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:437 #: ../en/book/ch05-repository-admin.xml:542 msgid "Berkeley DB" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:438 #: ../en/book/ch05-repository-admin.xml:675 msgid "FSFS" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:443 msgid "Reliability" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:444 msgid "Data integrity" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:445 msgid "" "When properly deployed, extremely reliable; Berkeley DB 4.4 brings auto-" "recovery" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:447 msgid "Older versions had some rarely demonstrated, but data-destroying bugs" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:451 msgid "Sensitivity to interruptions" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:452 msgid "" "Very; crashes and permission problems can leave the database <quote>wedged,</" "quote> requiring journaled recovery procedures" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:455 msgid "Quite insensitive" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:458 msgid "Accessibility" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:459 msgid "Usable from a read-only mount" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch05-repository-admin.xml:460 #: ../en/book/ch05-repository-admin.xml:465 ../en/book/ch09-reference.xml:754 #: ../en/book/ch09-reference.xml:1078 ../en/book/ch09-reference.xml:1329 #: ../en/book/ch09-reference.xml:2293 ../en/book/ch09-reference.xml:4165 #: ../en/book/ch09-reference.xml:4251 ../en/book/ch09-reference.xml:4340 msgid "No" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch05-repository-admin.xml:461 #: ../en/book/ch05-repository-admin.xml:466 #: ../en/book/ch05-repository-admin.xml:471 ../en/book/ch09-reference.xml:860 #: ../en/book/ch09-reference.xml:995 ../en/book/ch09-reference.xml:1175 #: ../en/book/ch09-reference.xml:1419 ../en/book/ch09-reference.xml:2347 #: ../en/book/ch09-reference.xml:2666 ../en/book/ch09-reference.xml:2781 #: ../en/book/ch09-reference.xml:2895 ../en/book/ch09-reference.xml:3335 #: ../en/book/ch09-reference.xml:4933 ../en/book/ch09-reference.xml:5092 #: ../en/book/ch09-reference.xml:5253 msgid "Yes" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:464 msgid "Platform-independent storage" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:469 msgid "Usable over network filesystems" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:470 msgid "Generally, no" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:474 msgid "Group permissions handling" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:475 msgid "Sensitive to user umask problems; best if accessed by only one user" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:477 msgid "Works around umask problems" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:480 msgid "Scalability" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:481 #, fuzzy #| msgid "Repository URLs" msgid "Repository disk usage" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:482 msgid "Larger (especially if logfiles aren't purged)" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:483 msgid "Smaller" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:486 msgid "Number of revision trees" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:487 msgid "Database; no problems" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:488 msgid "" "Some older native filesystems don't scale well with thousands of entries in " "a single directory" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:492 msgid "Directories with many files" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:493 msgid "Slower" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:494 msgid "Faster" msgstr "" # type: Content of: <preface><title> #: ../en/book/ch05-repository-admin.xml:497 #, fuzzy #| msgid "Preface" msgid "Performance" msgstr "Vorwort" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:498 msgid "Checking out latest revision" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:499 #: ../en/book/ch05-repository-admin.xml:500 msgid "No meaningful difference" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:503 msgid "Large commits" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:504 msgid "Slower overall, but cost is amortized across the lifetime of the commit" msgstr "" # type: Content of: <chapter><sect1><sect2><table><tgroup><tbody><row><entry> #: ../en/book/ch05-repository-admin.xml:506 msgid "Faster overall, but finalization delay may cause client timeouts" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:513 msgid "" "There are advantages and disadvantages to each of these two backend types. " "Neither of them is more <quote>official</quote> than the other, though the " "newer FSFS is the default data store as of Subversion 1.2. Both are " "reliable enough to trust with your versioned data. But as you can see in " "<xref linkend=\"svn.reposadmin.basics.backends.tbl-1\" />, the FSFS backend " "provides quite a bit more flexibility in terms of its supported deployment " "scenarios. More flexibility means you have to work a little harder to find " "ways to deploy it incorrectly. Those reasons—plus the fact that not " "using Berkeley DB means there's one fewer component in the system—" "largely explain why today almost everyone uses the FSFS backend when " "creating new repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:528 msgid "" "Fortunately, most programs that access Subversion repositories are " "blissfully ignorant of which backend data store is in use. And you aren't " "even necessarily stuck with your first choice of a data store—in the " "event that you change your mind later, Subversion provides ways of migrating " "your repository's data into another repository that uses a different backend " "data store. We talk more about that later in this chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:537 msgid "" "The following subsections provide a more detailed look at the available " "backend data store types." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:544 msgid "" "When the initial design phase of Subversion was in progress, the developers " "decided to use Berkeley DB for a variety of reasons, including its open " "source license, transaction support, reliability, performance, API " "simplicity, thread safety, support for cursors, and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:551 msgid "" "Berkeley DB provides real transaction support—perhaps its most " "powerful feature. Multiple processes accessing your Subversion repositories " "don't have to worry about accidentally clobbering each other's data. The " "isolation provided by the transaction system is such that for any given " "operation, the Subversion repository code sees a static view of the " "database—not a database that is constantly changing at the hand of " "some other process—and can make decisions based on that view. If the " "decision made happens to conflict with what another process is doing, the " "entire operation is rolled back as though it never happened, and Subversion " "gracefully retries the operation against a new, updated (and yet still " "static) view of the database." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:566 msgid "" "Another great feature of Berkeley DB is <firstterm>hot backups</" "firstterm>—the ability to back up the database environment without " "taking it <quote>offline.</quote> We'll discuss how to back up your " "repository later in this chapter (in <xref linkend=\"svn.reposadmin.maint." "backup\"/>), but the benefits of being able to make fully functional copies " "of your repositories without any downtime should be obvious." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:575 msgid "" "Berkeley DB is also a very reliable database system when properly used. " "Subversion uses Berkeley DB's logging facilities, which means that the " "database first writes to on-disk logfiles a description of any modifications " "it is about to make, and then makes the modification itself. This is to " "ensure that if anything goes wrong, the database system can back up to a " "previous <firstterm>checkpoint</firstterm>—a location in the logfiles " "known not to be corrupt—and replay transactions until the data is " "restored to a usable state. See <xref linkend=\"svn.reposadmin.maint." "diskspace\"/> later in this chapter for more about Berkeley DB logfiles." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:588 msgid "" "But every rose has its thorn, and so we must note some known limitations of " "Berkeley DB. First, Berkeley DB environments are not portable. You cannot " "simply copy a Subversion repository that was created on a Unix system onto a " "Windows system and expect it to work. While much of the Berkeley DB " "database format is architecture-independent, other aspects of the " "environment are not. Second, Subversion uses Berkeley DB in a way that will " "not operate on Windows 95/98 systems—if you need to house a BDB-backed " "repository on a Windows machine, stick with Windows 2000 or later." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch05-repository-admin.xml:600 msgid "" "While Berkeley DB promises to behave correctly on network shares that meet a " "particular set of specifications, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:603 msgid "" "Berkeley DB requires that the underlying filesystem implement strict POSIX " "locking semantics, and more importantly, the ability to map files directly " "into process memory." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:607 msgid "" "</footnote> most networked filesystem types and appliances do <emphasis>not</" "emphasis> actually meet those requirements. And in no case can you allow a " "BDB-backed repository that resides on a network share to be accessed by " "multiple clients of that share at once (which quite often is the whole point " "of having the repository live on a network share in the first place)." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><warning><para> #: ../en/book/ch05-repository-admin.xml:617 msgid "" "If you attempt to use Berkeley DB on a noncompliant remote filesystem, the " "results are unpredictable—you may see mysterious errors right away, or " "it may be months before you discover that your repository database is subtly " "corrupted. You should strongly consider using the FSFS data store for " "repositories that need to live on a network share." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:626 msgid "" "Finally, because Berkeley DB is a library linked directly into Subversion, " "it's more sensitive to interruptions than a typical relational database " "system. Most SQL systems, for example, have a dedicated server process that " "mediates all access to tables. If a program accessing the database crashes " "for some reason, the database daemon notices the lost connection and cleans " "up any mess left behind. And because the database daemon is the only " "process accessing the tables, applications don't need to worry about " "permission conflicts. These things are not the case with Berkeley DB, " "however. Subversion (and programs using Subversion libraries) access the " "database tables directly, which means that a program crash can leave the " "database in a temporarily inconsistent, inaccessible state. When this " "happens, an administrator needs to ask Berkeley DB to restore to a " "checkpoint, which is a bit of an annoyance. Other things can cause a " "repository to <quote>wedge</quote> besides crashed processes, such as " "programs conflicting over ownership and permissions on the database files." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><note><para> #: ../en/book/ch05-repository-admin.xml:647 msgid "" "Berkeley DB 4.4 brings (to Subversion 1.4 and later) the ability for " "Subversion to automatically and transparently recover Berkeley DB " "environments in need of such recovery. When a Subversion process attaches " "to a repository's Berkeley DB environment, it uses some process accounting " "mechanisms to detect any unclean disconnections by previous processes, " "performs any necessary recovery, and then continues on as though nothing " "happened. This doesn't completely eliminate instances of repository " "wedging, but it does drastically reduce the amount of human interaction " "required to recover from them." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:660 msgid "" "So while a Berkeley DB repository is quite fast and scalable, it's best used " "by a single server process running as one user—such as Apache's " "<command>httpd</command> or <command>svnserve</command> (see <xref linkend=" "\"svn.serverconfig\"/>)—rather than accessing it as many different " "users via <literal>file://</literal> or <literal>svn+ssh://</literal> URLs. " "If you're accessing a Berkeley DB repository directly as multiple users, be " "sure to read <xref linkend=\"svn.serverconfig.multimethod\"/> later in this " "chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:677 msgid "" "In mid-2004, a second type of repository storage system—one that " "doesn't use a database at all—came into being. An FSFS repository " "stores the changes associated with a revision in a single file, and so all " "of a repository's revisions can be found in a single subdirectory full of " "numbered files. Transactions are created in separate subdirectories as " "individual files. When complete, the transaction file is renamed and moved " "into the revisions directory, thus guaranteeing that commits are atomic. " "And because a revision file is permanent and unchanging, the repository also " "can be backed up while <quote>hot,</quote> just like a BDB-backed repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:691 msgid "" "The FSFS revision files describe a revision's directory structure, file " "contents, and deltas against files in other revision trees. Unlike a " "Berkeley DB database, this storage format is portable across different " "operating systems and isn't sensitive to CPU architecture. Because no " "journaling or shared-memory files are being used, the repository can be " "safely accessed over a network filesystem and examined in a read-only " "environment. The lack of database overhead also means the overall " "repository size is a bit smaller." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:702 msgid "" "FSFS has different performance characteristics, too. When committing a " "directory with a huge number of files, FSFS is able to more quickly append " "directory entries. On the other hand, FSFS writes the latest version of a " "file as a delta against an earlier version, which means that checking out " "the latest tree is a bit slower than fetching the full-texts stored in a " "Berkeley DB HEAD revision. FSFS also has a longer delay when finalizing a " "commit, which could in extreme cases cause clients to time out while waiting " "for a response." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:713 msgid "" "The most important distinction, however, is FSFS's imperviousness to wedging " "when something goes wrong. If a process using a Berkeley DB database runs " "into a permissions problem or suddenly crashes, the database can be left in " "an unusable state until an administrator recovers it. If the same scenarios " "happen to a process using an FSFS repository, the repository isn't affected " "at all. At worst, some transaction data is left behind." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch05-repository-admin.xml:722 msgid "" "The only real argument against FSFS is its relative immaturity compared to " "Berkeley DB. Unlike Berkeley DB, which has years of history, its own " "dedicated development team, and, now, Oracle's mighty name attached to it, " "<footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:727 msgid "" "Oracle bought Sleepycat and its flagship software, Berkeley DB, on " "Valentine's Day in 2006." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:729 msgid "" "</footnote> FSFS is a newer bit of engineering. Prior to Subversion 1.4, it " "was still shaking out some pretty serious data integrity bugs, which, while " "triggered in only very rare cases, nonetheless did occur. That said, FSFS " "has quickly become the backend of choice for some of the largest public and " "private Subversion repositories, and it promises a lower barrier to entry " "for Subversion across the board." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch05-repository-admin.xml:747 #, fuzzy #| msgid "Getting Data into Your Repository" msgid "Creating and Configuring Your Repository" msgstr "Wie Sie Daten in Ihr Repository bekommen" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:749 msgid "" "Earlier in this chapter (in <xref linkend=\"svn.reposadmin.planning\" />), " "we looked at some of the important decisions that should be made before " "creating and configuring your Subversion repository. Now, we finally get to " "get our hands dirty! In this section, we'll see how to actually create a " "Subversion repository and configure it to perform custom actions when " "special repository events occur." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch05-repository-admin.xml:759 #, fuzzy #| msgid "The Repository" msgid "Creating the Repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:761 msgid "" "Subversion repository creation is an incredibly simple task. The " "<command>svnadmin</command> utility that comes with Subversion provides a " "subcommand (<command>svnadmin create</command>) for doing just that." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:766 #, no-wrap msgid "" "\n" "$ # Create a repository\n" "$ svnadmin create /var/svn/repos\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:772 msgid "" "This creates a new repository in the directory <filename>/var/svn/repos</" "filename>, and with the default filesystem data store. Prior to Subversion " "1.2, the default was to use Berkeley DB; the default is now FSFS. You can " "explicitly choose the filesystem type using the <option>--fs-type</option> " "argument, which accepts as a parameter either <literal>fsfs</literal> or " "<literal>bdb</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:781 #, no-wrap msgid "" "\n" "$ # Create an FSFS-backed repository\n" "$ svnadmin create --fs-type fsfs /var/svn/repos\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:787 #, no-wrap msgid "" "\n" "# Create a Berkeley-DB-backed repository\n" "$ svnadmin create --fs-type bdb /var/svn/repos\n" "$\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:793 #, fuzzy #| msgid "A tool for creating, tweaking, or repairing a Subversion repository" msgid "After running this simple command, you have a Subversion repository." msgstr "" "Ein Werkzeug zum Erstellen, Verändern oder Reparieren eines Repositorys" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch05-repository-admin.xml:797 msgid "" "The path argument to <command>svnadmin</command> is just a regular " "filesystem path and not a URL like the <command>svn</command> client program " "uses when referring to repositories. Both <command>svnadmin</command> and " "<command>svnlook</command> are considered server-side utilities—they " "are used on the machine where the repository resides to examine or modify " "aspects of the repository, and are in fact unable to perform tasks across a " "network. A common mistake made by Subversion newcomers is trying to pass " "URLs (even <quote>local</quote> <literal>file://</literal> ones) to these " "two programs." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:810 msgid "" "Present in the <filename>db/</filename> subdirectory of your repository is " "the implementation of the versioned filesystem. Your new repository's " "versioned filesystem begins life at revision 0, which is defined to consist " "of nothing but the top-level root (<filename>/</filename>) directory. " "Initially, revision 0 also has a single revision property, <literal>svn:" "date</literal>, set to the time at which the repository was created." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:819 msgid "Now that you have a repository, it's time to customize it." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:823 msgid "" "While some parts of a Subversion repository—such as the configuration " "files and hook scripts—are meant to be examined and modified manually, " "you shouldn't (and shouldn't need to) tamper with the other parts of the " "repository <quote>by hand.</quote> The <command>svnadmin</command> tool " "should be sufficient for any changes necessary to your repository, or you " "can look to third-party tools (such as Berkeley DB's tool suite) for " "tweaking relevant subsections of the repository. Do <emphasis>not</" "emphasis> attempt manual manipulation of your version control history by " "poking and prodding around in your repository's data store files!" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:841 msgid "Implementing Repository Hooks" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:843 msgid "" "A <firstterm>hook</firstterm> is a program triggered by some repository " "event, such as the creation of a new revision or the modification of an " "unversioned property. Some hooks (the so-called <quote>pre hooks</quote>) " "run in advance of a repository operation and provide a means by which to " "both report what is about to happen and prevent it from happening at all. " "Other hooks (the <quote>post hooks</quote>) run after the completion of a " "repository event and are useful for performing tasks that examine—but " "don't modify—the repository. Each hook is handed enough information " "to tell what that event is (or was), the specific repository changes " "proposed (or completed), and the username of the person who triggered the " "event." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:857 msgid "" "The <filename>hooks</filename> subdirectory is, by default, filled with " "templates for various repository hooks:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:861 #, no-wrap msgid "" "\n" "$ ls repos/hooks/\n" "post-commit.tmpl post-unlock.tmpl pre-revprop-change.tmpl\n" "post-lock.tmpl pre-commit.tmpl pre-unlock.tmpl\n" "post-revprop-change.tmpl pre-lock.tmpl start-commit.tmpl\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:869 msgid "" "There is one template for each hook that the Subversion repository supports; " "by examining the contents of those template scripts, you can see what " "triggers each script to run and what data is passed to that script. Also " "present in many of these templates are examples of how one might use that " "script, in conjunction with other Subversion-supplied programs, to perform " "common useful tasks. To actually install a working hook, you need only " "place some executable program or script into the <filename>repos/hooks</" "filename> directory, which can be executed as the name (such as " "<command>start-commit</command> or <command>post-commit</command>) of the " "hook." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:882 msgid "" "On Unix platforms, this means supplying a script or program (which could be " "a shell script, a Python program, a compiled C binary, or any number of " "other things) named exactly like the name of the hook. Of course, the " "template files are present for more than just informational purposes—" "the easiest way to install a hook on Unix platforms is to simply copy the " "appropriate template file to a new file that lacks the <filename>.tmpl</" "filename> extension, customize the hook's contents, and ensure that the " "script is executable. Windows, however, uses file extensions to determine " "whether a program is executable, so you would need to supply a program whose " "basename is the name of the hook and whose extension is one of the special " "extensions recognized by Windows for executable programs, such as <filename>." "exe</filename> for programs and <filename>.bat</filename> for batch files." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch05-repository-admin.xml:900 msgid "" "For security reasons, the Subversion repository executes hook programs with " "an empty environment—that is, no environment variables are set at all, " "not even <literal>$PATH</literal> (or <literal>%PATH%</literal>, under " "Windows). Because of this, many administrators are baffled when their hook " "program runs fine by hand, but doesn't work when run by Subversion. Be sure " "to explicitly set any necessary environment variables in your hook program " "and/or use absolute paths to programs." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:911 msgid "" "Subversion executes hooks as the same user who owns the process that is " "accessing the Subversion repository. In most cases, the repository is being " "accessed via a Subversion server, so this user is the same user as whom the " "server runs on the system. The hooks themselves will need to be configured " "with OS-level permissions that allow that user to execute them. Also, this " "means that any programs or files (including the Subversion repository) " "accessed directly or indirectly by the hook will be accessed as the same " "user. In other words, be alert to potential permission-related problems " "that could prevent the hook from performing the tasks it is designed to " "perform." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:924 msgid "" "There are nine hooks implemented by the Subversion repository, and you can " "get details about each of them in <xref linkend=\"svn.ref.reposhooks\" />. " "As a repository administrator, you'll need to decide which hooks you wish to " "implement (by way of providing an appropriately named and permissioned hook " "program), and how. When you make this decision, keep in mind the big " "picture of how your repository is deployed. For example, if you are using " "server configuration to determine which users are permitted to commit " "changes to your repository, you don't need to do this sort of access control " "via the hook system." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:937 msgid "" "There is no shortage of Subversion hook programs and scripts that are freely " "available either from the Subversion community itself or elsewhere. These " "scripts cover a wide range of utility—basic access control, policy " "adherence checking, issue tracker integration, email- or syndication-based " "commit notification, and beyond. Or, if you wish to write your own, see " "<xref linkend=\"svn.developer\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:946 msgid "" "While hook scripts can do almost anything, there is one dimension in which " "hook script authors should show restraint: do <emphasis>not</emphasis> " "modify a commit transaction using hook scripts. While it might be tempting " "to use hook scripts to automatically correct errors, shortcomings, or policy " "violations present in the files being committed, doing so can cause " "problems. Subversion keeps client-side caches of certain bits of repository " "data, and if you change a commit transaction in this way, those caches " "become indetectably stale. This inconsistency can lead to surprising and " "unexpected behavior. Instead of modifying the transaction, you should " "simply <emphasis>validate</emphasis> the transaction in the <filename>pre-" "commit</filename> hook and reject the commit if it does not meet the desired " "requirements. As a bonus, your users will learn the value of careful, " "compliance-minded work habits." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:969 msgid "Berkeley DB Configuration" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:971 msgid "" "A Berkeley DB environment is an encapsulation of one or more databases, " "logfiles, region files, and configuration files. The Berkeley DB " "environment has its own set of default configuration values for things such " "as the number of database locks allowed to be taken out at any given time, " "the maximum size of the journaling logfiles, and so on. Subversion's " "filesystem logic additionally chooses default values for some of the " "Berkeley DB configuration options. However, sometimes your particular " "repository, with its unique collection of data and access patterns, might " "require a different set of configuration option values." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:983 msgid "" "The producers of Berkeley DB understand that different applications and " "database environments have different requirements, so they have provided a " "mechanism for overriding at runtime many of the configuration values for the " "Berkeley DB environment. BDB checks for the presence of a file named " "<filename>DB_CONFIG</filename> in the environment directory (namely, the " "repository's <filename>db</filename> subdirectory), and parses the options " "found in that file. Subversion itself creates this file when it creates the " "rest of the repository. The file initially contains some default options, " "as well as pointers to the Berkeley DB online documentation so that you can " "read about what those options do. Of course, you are free to add any of the " "supported Berkeley DB options to your <filename>DB_CONFIG</filename> file. " "Just be aware that while Subversion never attempts to read or interpret the " "contents of the file and makes no direct use of the option settings in it, " "you'll want to avoid any configuration changes that may cause Berkeley DB to " "behave in a fashion that is at odds with what Subversion might expect. " "Also, changes made to <filename>DB_CONFIG</filename> won't take effect until " "you recover the database environment (using <command>svnadmin recover</" "command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><title> #: ../en/book/ch05-repository-admin.xml:1014 #, fuzzy #| msgid "Repository access URLs" msgid "Repository Maintenance" msgstr "Repository-Zugriffs-URLs" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:1016 msgid "" "Maintaining a Subversion repository can be daunting, mostly due to the " "complexities inherent in systems that have a database backend. Doing the " "task well is all about knowing the tools—what they are, when to use " "them, and how. This section will introduce you to the repository " "administration tools provided by Subversion and discuss how to wield them to " "accomplish tasks such as repository data migration, upgrades, backups, and " "cleanups." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:1027 msgid "An Administrator's Toolkit" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1029 msgid "" "Subversion provides a handful of utilities useful for creating, inspecting, " "modifying, and repairing your repository. Let's look more closely at each " "of those tools. Afterward, we'll briefly examine some of the utilities " "included in the Berkeley DB distribution that provide functionality specific " "to your repository's database backend not otherwise provided by Subversion's " "own tools." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1041 msgid "" "The <command>svnadmin</command> program is the repository administrator's " "best friend. Besides providing the ability to create Subversion " "repositories, this program allows you to perform several maintenance " "operations on those repositories. The syntax of <command>svnadmin</command> " "is similar to that of other Subversion command-line programs:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1049 #, no-wrap msgid "" "\n" "$ svnadmin help\n" "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n" "Type 'svnadmin --version' to see the program version and FS modules.\n" "\n" "Available subcommands:\n" " crashtest\n" " create\n" " deltify\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1062 msgid "" "Previously in this chapter (in <xref linkend=\"svn.reposadmin.basics.creating" "\"/>), we were introduced to the <command>svnadmin create</command> " "subcommand. Most of the other <command>svnadmin</command> subcommands we " "will cover later in this chapter. And you can consult <xref linkend=\"svn." "ref.svnadmin\" /> for a full rundown of subcommands and what each of them " "offers." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1076 msgid "" "<command>svnlook</command> is a tool provided by Subversion for examining " "the various revisions and <firstterm>transactions</firstterm> (which are " "revisions in the making) in a repository. No part of this program attempts " "to change the repository. <command>svnlook</command> is typically used by " "the repository hooks for reporting the changes that are about to be " "committed (in the case of the <command>pre-commit</command> hook) or that " "were just committed (in the case of the <command>post-commit</command> hook) " "to the repository. A repository administrator may use this tool for " "diagnostic purposes." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1088 msgid "<command>svnlook</command> has a straightforward syntax:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1091 #, no-wrap msgid "" "\n" "$ svnlook help\n" "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Note: any subcommand which takes the '--revision' and '--transaction'\n" " options will, if invoked without one of those options, act on\n" " the repository's youngest revision.\n" "Type 'svnlook help <subcommand>' for help on a specific subcommand.\n" "Type 'svnlook --version' to see the program version and FS modules.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1102 msgid "" "Most of <command>svnlook</command>'s subcommands can operate on either a " "revision or a transaction tree, printing information about the tree itself, " "or how it differs from the previous revision of the repository. You use the " "<option>--revision</option> (<option>-r</option>) and <option>--transaction</" "option> (<option>-t</option>) options to specify which revision or " "transaction, respectively, to examine. In the absence of both the <option>--" "revision</option> (<option>-r</option>) and <option>--transaction</option> " "(<option>-t</option>) options, <command>svnlook</command> will examine the " "youngest (or <literal>HEAD</literal>) revision in the repository. So the " "following two commands do exactly the same thing when 19 is the youngest " "revision in the repository located at <filename>/var/svn/repos</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1119 #, no-wrap msgid "" "\n" "$ svnlook info /var/svn/repos\n" "$ svnlook info /var/svn/repos -r 19\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1124 msgid "" "One exception to these rules about subcommands is the <command>svnlook " "youngest</command> subcommand, which takes no options and simply prints out " "the repository's youngest revision number:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1129 #, no-wrap msgid "" "\n" "$ svnlook youngest /var/svn/repos\n" "19\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><note><para> #: ../en/book/ch05-repository-admin.xml:1136 msgid "" "Keep in mind that the only transactions you can browse are uncommitted " "ones. Most repositories will have no such transactions because transactions " "are usually either committed (in which case, you should access them as " "revision with the <option>--revision</option> (<option>-r</option>) option) " "or aborted and removed." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1145 msgid "" "Output from <command>svnlook</command> is designed to be both human- and " "machine-parsable. Take, as an example, the output of the <command>svnlook " "info</command> subcommand:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1149 #, no-wrap msgid "" "\n" "$ svnlook info /var/svn/repos\n" "sally\n" "2002-11-04 09:29:13 -0600 (Mon, 04 Nov 2002)\n" "27\n" "Added the usual\n" "Greek tree.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1159 msgid "" "The output of <command>svnlook info</command> consists of the following, in " "the order given:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1164 msgid "The author, followed by a newline" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1167 msgid "The date, followed by a newline" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1170 msgid "The number of characters in the log message, followed by a newline" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1174 msgid "The log message itself, followed by a newline" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1178 msgid "" "This output is human-readable, meaning items such as the datestamp are " "displayed using a textual representation instead of something more obscure " "(such as the number of nanoseconds since the Tasty Freeze guy drove by). " "But the output is also machine-parsable—because the log message can " "contain multiple lines and be unbounded in length, <command>svnlook</" "command> provides the length of that message before the message itself. " "This allows scripts and other wrappers around this command to make " "intelligent decisions about the log message, such as how much memory to " "allocate for the message, or at least how many bytes to skip in the event " "that this output is not the last bit of data in the stream." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1192 msgid "" "<command>svnlook</command> can perform a variety of other queries: " "displaying subsets of bits of information we've mentioned previously, " "recursively listing versioned directory trees, reporting which paths were " "modified in a given revision or transaction, showing textual and property " "differences made to files and directories, and so on. See <xref linkend=" "\"svn.ref.svnlook\" /> for a full reference of <command>svnlook</command>'s " "features." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1207 msgid "" "While it won't be the most commonly used tool at the administrator's " "disposal, <command>svndumpfilter</command> provides a very particular brand " "of useful functionality—the ability to quickly and easily modify " "streams of Subversion repository history data by acting as a path-based " "filter." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1214 msgid "The syntax of <command>svndumpfilter</command> is as follows:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1217 #, no-wrap msgid "" "\n" "$ svndumpfilter help\n" "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" "Type \"svndumpfilter help <subcommand>\" for help on a specific subcommand.\n" "Type 'svndumpfilter --version' to see the program version.\n" " \n" "Available subcommands:\n" " exclude\n" " include\n" " help (?, h)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1229 msgid "" "There are only two interesting subcommands: <command>svndumpfilter exclude</" "command> and <command>svndumpfilter include</command>. They allow you to " "make the choice between implicit or explicit inclusion of paths in the " "stream. You can learn more about these subcommands and " "<command>svndumpfilter</command>'s unique purpose later in this chapter, in " "<xref linkend=\"svn.reposadmin.maint.filtering\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch05-repository-admin.xml:1244 msgid "" "The <command>svnsync</command> program, which is new to the 1.4 release of " "Subversion, provides all the functionality required for maintaining a read-" "only mirror of a Subversion repository. The program really has one " "job—to transfer one repository's versioned history into another " "repository. And while there are few ways to do that, its primary strength " "is that it can operate remotely—the <quote>source</quote> and " "<quote>sink</quote> <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:1254 msgid "Or is that, the <quote>sync</quote>?" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1255 msgid "" "</footnote> repositories may be on different computers from each other and " "from <command>svnsync</command> itself." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1259 msgid "" "As you might expect, <command>svnsync</command> has a syntax that looks very " "much like every other program we've mentioned in this chapter:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1263 #, no-wrap msgid "" "\n" "$ svnsync help\n" "general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n" "Type 'svnsync help <subcommand>' for help on a specific subcommand.\n" "Type 'svnsync --version' to see the program version and RA modules.\n" "\n" "Available subcommands:\n" " initialize (init)\n" " synchronize (sync)\n" " copy-revprops\n" " help (?, h)\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1277 msgid "" "We talk more about replicating repositories with <command>svnsync</command> " "later in this chapter (see <xref linkend=\"svn.reposadmin.maint.replication" "\" />)." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:1285 msgid "fsfs-reshard.py" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1287 msgid "" "While not an official member of the Subversion toolchain, the <command>fsfs-" "reshard.py</command> script (found in the <filename>tools/server-side</" "filename> directory of the Subversion source distribution) is a useful " "performance tuning tool for administrators of FSFS-backed Subversion " "repositories. FSFS repositories contain files that describe the changes " "made in a single revision, and files that contain the revision properties " "associated with a single revision. Repositories created in versions of " "Subversion prior to 1.5 keep these files in two directories—one for " "each type of file. As new revisions are committed to the repository, " "Subversion drops more files into these two directories—over time, the " "number of these files in each directory can grow to be quite large. This " "has been observed to cause performance problems on certain network-based " "filesystems." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1304 msgid "" "Subversion 1.5 creates FSFS-backed repositories using a slightly modified " "layout in which the contents of these two directories are " "<firstterm>sharded</firstterm>, or scattered across several subdirectories. " "This can greatly reduce the time it takes the system to locate any one of " "these files, and therefore increases the overall performance of Subversion " "when reading from the repository. The number of subdirectories used to " "house these files is configurable, though, and that's where <command>fsfs-" "reshard.py</command> comes in. This script reshuffles the repository's file " "structure into a new arrangement that reflects the requested number of " "sharding subdirectories. This is especially useful for converting an older " "Subversion repository into the new Subversion 1.5 sharded layout (which " "Subversion will not automatically do for you) or for fine-tuning an already " "sharded repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:1326 msgid "Berkeley DB utilities" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1328 msgid "" "If you're using a Berkeley DB repository, all of your versioned filesystem's " "structure and data live in a set of database tables within the <filename>db/" "</filename> subdirectory of your repository. This subdirectory is a regular " "Berkeley DB environment directory and can therefore be used in conjunction " "with any of the Berkeley database tools, typically provided as part of the " "Berkeley DB distribution." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1337 msgid "" "For day-to-day Subversion use, these tools are unnecessary. Most of the " "functionality typically needed for Subversion repositories has been " "duplicated in the <command>svnadmin</command> tool. For example, " "<command>svnadmin list-unused-dblogs</command> and <command>svnadmin list-" "dblogs</command> perform a subset of what is provided by the Berkeley " "<command>db_archive</command> utility, and <command>svnadmin recover</" "command> reflects the common use cases of the <command>db_recover</command> " "utility." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1348 msgid "" "However, there are still a few Berkeley DB utilities that you might find " "useful. The <command>db_dump</command> and <command>db_load</command> " "programs write and read, respectively, a custom file format that describes " "the keys and values in a Berkeley DB database. Since Berkeley databases are " "not portable across machine architectures, this format is a useful way to " "transfer those databases from machine to machine, irrespective of " "architecture or operating system. As we describe later in this chapter, you " "can also use <command>svnadmin dump</command> and <command>svnadmin load</" "command> for similar purposes, but <command>db_dump</command> and " "<command>db_load</command> can do certain jobs just as well and much " "faster. They can also be useful if the experienced Berkeley DB hacker needs " "to do in-place tweaking of the data in a BDB-backed repository for some " "reason, which is something Subversion's utilities won't allow. Also, the " "<command>db_stat</command> utility can provide useful information about the " "status of your Berkeley DB environment, including detailed statistics about " "the locking and storage subsystems." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1369 msgid "" "For more information on the Berkeley DB tool chain, visit the documentation " "section of the Berkeley DB section of Oracle's web site, located at <ulink " "url=\"http://www.oracle.com/technology/documentation/berkeley-db/db/\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:1380 msgid "Commit Log Message Correction" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1382 msgid "" "Sometimes a user will have an error in her log message (a misspelling or " "some misinformation, perhaps). If the repository is configured (using the " "<literal>pre-revprop-change</literal> hook; see <xref linkend=\"svn." "reposadmin.create.hooks\"/>) to accept changes to this log message after the " "commit is finished, the user can <quote>fix</quote> her log message remotely " "using <command>svn propset</command> (see <xref linkend=\"svn.ref.svn.c." "propset\"/>). However, because of the potential to lose information " "forever, Subversion repositories are not, by default, configured to allow " "changes to unversioned properties—except by an administrator." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1396 msgid "" "If a log message needs to be changed by an administrator, this can be done " "using <command>svnadmin setlog</command>. This command changes the log " "message (the <literal>svn:log</literal> property) on a given revision of a " "repository, reading the new value from a provided file." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:1402 #, no-wrap msgid "" "\n" "$ echo \"Here is the new, correct log message\" > newlog.txt\n" "$ svnadmin setlog myrepos newlog.txt -r 388\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1407 msgid "" "The <command>svnadmin setlog</command> command, by default, is still bound " "by the same protections against modifying unversioned properties as a remote " "client is—the <literal>pre-</literal> and <literal>post-revprop-" "change</literal> hooks are still triggered, and therefore must be set up to " "accept changes of this nature. But an administrator can get around these " "protections by passing the <option>--bypass-hooks</option> option to the " "<command>svnadmin setlog</command> command." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:1419 msgid "" "Remember, though, that by bypassing the hooks, you are likely avoiding such " "things as email notifications of property changes, backup systems that track " "unversioned property changes, and so on. In other words, be very careful " "about what you are changing, and how you change it." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:1432 msgid "Managing Disk Space" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1434 msgid "" "While the cost of storage has dropped incredibly in the past few years, disk " "usage is still a valid concern for administrators seeking to version large " "amounts of data. Every bit of version history information stored in the " "live repository needs to be backed up elsewhere, perhaps multiple times as " "part of rotating backup schedules. It is useful to know what pieces of " "Subversion's repository data need to remain on the live site, which need to " "be backed up, and which can be safely removed." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:1446 msgid "How Subversion saves disk space" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1448 msgid "" "To keep the repository small, Subversion uses <firstterm>deltification</" "firstterm> (or deltified storage) within the repository itself. " "Deltification involves encoding the representation of a chunk of data as a " "collection of differences against some other chunk of data. If the two " "pieces of data are very similar, this deltification results in storage " "savings for the deltified chunk—rather than taking up space equal to " "the size of the original data, it takes up only enough space to say, " "<quote>I look just like this other piece of data over here, except for the " "following couple of changes.</quote> The result is that most of the " "repository data that tends to be bulky—namely, the contents of " "versioned files—is stored at a much smaller size than the original " "full-text representation of that data. And for repositories created with " "Subversion 1.4 or later, the space savings are even better—now those " "full-text representations of file contents are themselves compressed." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><note><para> #: ../en/book/ch05-repository-admin.xml:1469 msgid "" "Because all of the data that is subject to deltification in a BDB-backed " "repository is stored in a single Berkeley DB database file, reducing the " "size of the stored values will not immediately reduce the size of the " "database file itself. Berkeley DB will, however, keep internal records of " "unused areas of the database file and consume those areas first before " "growing the size of the database file. So while deltification doesn't " "produce immediate space savings, it can drastically slow future growth of " "the database." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:1485 msgid "Removing dead transactions" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1487 msgid "" "Though they are uncommon, there are circumstances in which a Subversion " "commit process might fail, leaving behind in the repository the remnants of " "the revision-to-be that wasn't—an uncommitted transaction and all the " "file and directory changes associated with it. This could happen for " "several reasons: perhaps the client operation was inelegantly terminated by " "the user, or a network failure occurred in the middle of an operation. " "Regardless of the reason, dead transactions can happen. They don't do any " "real harm, other than consuming disk space. A fastidious administrator may " "nonetheless wish to remove them." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1500 msgid "" "You can use the <command>svnadmin lstxns</command> command to list the names " "of the currently outstanding transactions:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1504 #, no-wrap msgid "" "\n" "$ svnadmin lstxns myrepos\n" "19\n" "3a1\n" "a45\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1512 msgid "" "Each item in the resultant output can then be used with <command>svnlook</" "command> (and its <option>--transaction</option> (<option>-t</option>) " "option) to determine who created the transaction, when it was created, what " "types of changes were made in the transaction—information that is " "helpful in determining whether the transaction is a safe candidate for " "removal! If you do indeed want to remove a transaction, its name can be " "passed to <command>svnadmin rmtxns</command>, which will perform the cleanup " "of the transaction. In fact, <command>svnadmin rmtxns</command> can take " "its input directly from the output of <command>svnadmin lstxns</command>!" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1526 #, no-wrap msgid "" "\n" "$ svnadmin rmtxns myrepos `svnadmin lstxns myrepos`\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1531 msgid "" "If you use these two subcommands like this, you should consider making your " "repository temporarily inaccessible to clients. That way, no one can begin " "a legitimate transaction before you start your cleanup. <xref linkend=\"svn." "reposadmin.maint.diskspace.deadtxns.ex-1\" /> contains a bit of shell-" "scripting that can quickly generate information about each outstanding " "transaction in your repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><title> #: ../en/book/ch05-repository-admin.xml:1541 msgid "txn-info.sh (reporting outstanding transactions)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><programlisting> #: ../en/book/ch05-repository-admin.xml:1543 #, no-wrap msgid "" "\n" "#!/bin/sh\n" "\n" "### Generate informational output for all outstanding transactions in\n" "### a Subversion repository.\n" "\n" "REPOS=\"${1}\"\n" "if [ \"x$REPOS\" = x ] ; then\n" " echo \"usage: $0 REPOS_PATH\"\n" " exit\n" "fi\n" "\n" "for TXN in `svnadmin lstxns ${REPOS}`; do \n" " echo \"---[ Transaction ${TXN} ]-------------------------------------------\"\n" " svnlook info \"${REPOS}\" -t \"${TXN}\"\n" "done\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1562 msgid "" "The output of the script is basically a concatenation of several chunks of " "<command>svnlook info</command> output (see <xref linkend=\"svn.reposadmin." "maint.tk.svnlook\"/>) and will look something like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1567 #, no-wrap msgid "" "\n" "$ txn-info.sh myrepos\n" "---[ Transaction 19 ]-------------------------------------------\n" "sally\n" "2001-09-04 11:57:19 -0500 (Tue, 04 Sep 2001)\n" "0\n" "---[ Transaction 3a1 ]-------------------------------------------\n" "harry\n" "2001-09-10 16:50:30 -0500 (Mon, 10 Sep 2001)\n" "39\n" "Trying to commit over a faulty network.\n" "---[ Transaction a45 ]-------------------------------------------\n" "sally\n" "2001-09-12 11:09:28 -0500 (Wed, 12 Sep 2001)\n" "0\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1585 msgid "" "A long-abandoned transaction usually represents some sort of failed or " "interrupted commit. A transaction's datestamp can provide interesting " "information—for example, how likely is it that an operation begun nine " "months ago is still active?" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1591 msgid "" "In short, transaction cleanup decisions need not be made unwisely. Various " "sources of information—including Apache's error and access logs, " "Subversion's operational logs, Subversion revision history, and so on—" "can be employed in the decision-making process. And of course, an " "administrator can often simply communicate with a seemingly dead " "transaction's owner (via email, e.g.) to verify that the transaction is, in " "fact, in a zombie state." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch05-repository-admin.xml:1604 msgid "Purging unused Berkeley DB logfiles" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1606 msgid "" "Until recently, the largest offender of disk space usage with respect to BDB-" "backed Subversion repositories were the logfiles in which Berkeley DB " "performs its prewrites before modifying the actual database files. These " "files capture all the actions taken along the route of changing the database " "from one state to another—while the database files, at any given time, " "reflect a particular state, the logfiles contain all of the many changes " "along the way <emphasis>between</emphasis> states. Thus, they can grow and " "accumulate quite rapidly." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1617 msgid "" "Fortunately, beginning with the 4.2 release of Berkeley DB, the database " "environment has the ability to remove its own unused logfiles " "automatically. Any repositories created using <command>svnadmin</command> " "when compiled against Berkeley DB version 4.2 or later will be configured " "for this automatic logfile removal. If you don't want this feature enabled, " "simply pass the <option>--bdb-log-keep</option> option to the " "<command>svnadmin create</command> command. If you forget to do this or " "change your mind at a later time, simply edit the <filename>DB_CONFIG</" "filename> file found in your repository's <filename>db</filename> directory, " "comment out the line that contains the <literal>set_flags DB_LOG_AUTOREMOVE</" "literal> directive, and then run <command>svnadmin recover</command> on your " "repository to force the configuration changes to take effect. See <xref " "linkend=\"svn.reposadmin.create.bdb\"/> for more information about database " "configuration." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch05-repository-admin.xml:1636 msgid "" "Without some sort of automatic logfile removal in place, logfiles will " "accumulate as you use your repository. This is actually somewhat of a " "feature of the database system—you should be able to recreate your " "entire database using nothing but the logfiles, so these files can be useful " "for catastrophic database recovery. But typically, you'll want to archive " "the logfiles that are no longer in use by Berkeley DB, and then remove them " "from disk to conserve space. Use the <command>svnadmin list-unused-dblogs</" "command> command to list the unused logfiles:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch05-repository-admin.xml:1648 #, no-wrap msgid "" "\n" "$ svnadmin list-unused-dblogs /var/svn/repos\n" "/var/svn/repos/log.0000000031\n" "/var/svn/repos/log.0000000032\n" "/var/svn/repos/log.0000000033\n" "…\n" "$ rm `svnadmin list-unused-dblogs /var/svn/repos`\n" "## disk space reclaimed!\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><warning><para> #: ../en/book/ch05-repository-admin.xml:1659 msgid "" "BDB-backed repositories whose logfiles are used as part of a backup or " "disaster recovery plan should <emphasis>not</emphasis> make use of the " "logfile autoremoval feature. Reconstruction of a repository's data from " "logfiles can only be accomplished only when <emphasis>all</emphasis> the " "logfiles are available. If some of the logfiles are removed from disk " "before the backup system has a chance to copy them elsewhere, the incomplete " "set of backed-up logfiles is essentially useless." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:1676 msgid "Berkeley DB Recovery" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1678 msgid "" "As mentioned in <xref linkend=\"svn.reposadmin.basics.backends.bdb\"/>, a " "Berkeley DB repository can sometimes be left in a frozen state if not closed " "properly. When this happens, an administrator needs to rewind the database " "back into a consistent state. This is unique to BDB-backed repositories, " "though—if you are using FSFS-backed ones instead, this won't apply to " "you. And for those of you using Subversion 1.4 with Berkeley DB 4.4 or " "later, you should find that Subversion has become much more resilient in " "these types of situations. Still, wedged Berkeley DB repositories do occur, " "and an administrator needs to know how to safely deal with this circumstance." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1691 msgid "" "To protect the data in your repository, Berkeley DB uses a locking " "mechanism. This mechanism ensures that portions of the database are not " "simultaneously modified by multiple database accessors, and that each " "process sees the data in the correct state when that data is being read from " "the database. When a process needs to change something in the database, it " "first checks for the existence of a lock on the target data. If the data is " "not locked, the process locks the data, makes the change it wants to make, " "and then unlocks the data. Other processes are forced to wait until that " "lock is removed before they are permitted to continue accessing that section " "of the database. (This has nothing to do with the locks that you, as a " "user, can apply to versioned files within the repository; we try to clear up " "the confusion caused by this terminology collision in the sidebar <xref " "linkend=\"svn.advanced.locking.meanings\" />.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1708 msgid "" "In the course of using your Subversion repository, fatal errors or " "interruptions can prevent a process from having the chance to remove the " "locks it has placed in the database. The result is that the backend " "database system gets <quote>wedged.</quote> When this happens, any attempts " "to access the repository hang indefinitely (since each new accessor is " "waiting for a lock to go away—which isn't going to happen)." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:1717 msgid "" "If this happens to your repository, don't panic. The Berkeley DB filesystem " "takes advantage of database transactions, checkpoints, and prewrite " "journaling to ensure that only the most catastrophic of events <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:1722 msgid "For example, hard drive + huge electromagnet = disaster." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1723 msgid "" "</footnote> can permanently destroy a database environment. A sufficiently " "paranoid repository administrator will have made off-site backups of the " "repository data in some fashion, but don't head off to the tape backup " "storage closet just yet." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1729 msgid "" "Instead, use the following recipe to attempt to <quote>unwedge</quote> your " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1734 msgid "" "Make sure no processes are accessing (or attempting to access) the " "repository. For networked repositories, this also means shutting down the " "Apache HTTP Server or svnserve daemon." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1740 msgid "" "Become the user who owns and manages the repository. This is important, as " "recovering a repository while running as the wrong user can tweak the " "permissions of the repository's files in such a way that your repository " "will still be inaccessible even after it is <quote>unwedged.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1748 msgid "" "Run the command <userinput>svnadmin recover /var/svn/repos</userinput>. You " "should see output such as this:" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><screen> #: ../en/book/ch05-repository-admin.xml:1752 #, no-wrap msgid "" "\n" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" "\n" "Recovery completed.\n" "The latest repos revision is 19.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1759 msgid "This command may take many minutes to complete." msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch05-repository-admin.xml:1762 msgid "Restart the server process." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1766 msgid "" "This procedure fixes almost every case of repository wedging. Make sure " "that you run this command as the user that owns and manages the database, " "not just as <literal>root</literal>. Part of the recovery process might " "involve re-creating from scratch various database files (shared memory " "regions, e.g.). Recovering as <literal>root</literal> will create those " "files such that they are owned by <literal>root</literal>, which means that " "even after you restore connectivity to your repository, regular users will " "be unable to access it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1777 msgid "" "If the previous procedure, for some reason, does not successfully unwedge " "your repository, you should do two things. First, move your broken " "repository directory aside (perhaps by renaming it to something like " "<filename>repos.BROKEN</filename>) and then restore your latest backup of " "it. Then, send an email to the Subversion users mailing list (at " "<email>users@subversion.tigris.org</email>) describing your problem in " "detail. Data integrity is an extremely high priority to the Subversion " "developers." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:1791 msgid "Migrating Repository Data Elsewhere" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1793 msgid "" "A Subversion filesystem has its data spread throughout files in the " "repository, in a fashion generally understood by (and of interest to) only " "the Subversion developers themselves. However, circumstances may arise that " "call for all, or some subset, of that data to be copied or moved into " "another repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1800 msgid "" "Subversion provides such functionality by way of <firstterm>repository dump " "streams</firstterm>. A repository dump stream (often referred to as a " "<quote>dump file</quote> when stored as a file on disk) is a portable, flat " "file format that describes the various revisions in your repository—" "what was changed, by whom, when, and so on. This dump stream is the primary " "mechanism used to marshal versioned history—in whole or in part, with " "or without modification—between repositories. And Subversion provides " "the tools necessary for creating and loading these dump streams: the " "<command>svnadmin dump</command> and <command>svnadmin load</command> " "subcommands, respectively." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:1815 msgid "" "While the Subversion repository dump format contains human-readable portions " "and a familiar structure (it resembles an RFC 822 format, the same type of " "format used for most email), it is <emphasis>not</emphasis> a plain-text " "file format. It is a binary file format, highly sensitive to meddling. For " "example, many text editors will corrupt the file by automatically converting " "line endings." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1824 msgid "" "There are many reasons for dumping and loading Subversion repository data. " "Early in Subversion's life, the most common reason was due to the evolution " "of Subversion itself. As Subversion matured, there were times when changes " "made to the backend database schema caused compatibility issues with " "previous versions of the repository, so users had to dump their repository " "data using the previous version of Subversion and load it into a freshly " "created repository with the new version of Subversion. Now, these types of " "schema changes haven't occurred since Subversion's 1.0 release, and the " "Subversion developers promise not to force users to dump and load their " "repositories when upgrading between minor versions (such as from 1.3 to 1.4) " "of Subversion. But there are still other reasons for dumping and loading, " "including re-deploying a Berkeley DB repository on a new OS or CPU " "architecture, switching between the Berkeley DB and FSFS backends, or (as " "we'll cover later in this chapter in <xref linkend=\"svn.reposadmin.maint." "filtering\" />) purging versioned data from repository history." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch05-repository-admin.xml:1845 msgid "" "The Subversion repository dump format describes versioned repository changes " "only. It will not carry any information about uncommitted transactions, " "user locks on filesystem paths, repository or server configuration " "customizations (including hook scripts), and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1852 msgid "" "Whatever your reason for migrating repository history, using the " "<command>svnadmin dump</command> and <command>svnadmin load</command> " "subcommands is straightforward. <command>svnadmin dump</command> will " "output a range of repository revisions that are formatted using Subversion's " "custom filesystem dump format. The dump format is printed to the standard " "output stream, while informative messages are printed to the standard error " "stream. This allows you to redirect the output stream to a file while " "watching the status output in your terminal window. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:1864 #, no-wrap msgid "" "\n" "$ svnlook youngest myrepos\n" "26\n" "$ svnadmin dump myrepos > dumpfile\n" "* Dumped revision 0.\n" "* Dumped revision 1.\n" "* Dumped revision 2.\n" "…\n" "* Dumped revision 25.\n" "* Dumped revision 26.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1876 msgid "" "At the end of the process, you will have a single file (<filename>dumpfile</" "filename> in the previous example) that contains all the data stored in your " "repository in the requested range of revisions. Note that <command>svnadmin " "dump</command> is reading revision trees from the repository just like any " "other <quote>reader</quote> process would (e.g., <command>svn checkout</" "command>), so it's safe to run this command at any time." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1885 msgid "" "The other subcommand in the pair, <command>svnadmin load</command>, parses " "the standard input stream as a Subversion repository dump file and " "effectively replays those dumped revisions into the target repository for " "that operation. It also gives informative feedback, this time using the " "standard output stream:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:1892 #, no-wrap msgid "" "\n" "$ svnadmin load newrepos < dumpfile\n" "<<< Started new txn, based on original revision 1\n" " * adding path : A ... done.\n" " * adding path : A/B ... done.\n" " …\n" "------- Committed new rev 1 (loaded from original rev 1) >>>\n" "\n" "<<< Started new txn, based on original revision 2\n" " * editing path : A/mu ... done.\n" " * editing path : A/D/G/rho ... done.\n" "\n" "------- Committed new rev 2 (loaded from original rev 2) >>>\n" "\n" "…\n" "\n" "<<< Started new txn, based on original revision 25\n" " * editing path : A/D/gamma ... done.\n" "\n" "------- Committed new rev 25 (loaded from original rev 25) >>>\n" "\n" "<<< Started new txn, based on original revision 26\n" " * adding path : A/Z/zeta ... done.\n" " * editing path : A/mu ... done.\n" "\n" "------- Committed new rev 26 (loaded from original rev 26) >>>\n" "\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1921 msgid "" "The result of a load is new revisions added to a repository—the same " "thing you get by making commits against that repository from a regular " "Subversion client. Just as in a commit, you can use hook programs to " "perform actions before and after each of the commits made during a load " "process. By passing the <option>--use-pre-commit-hook</option> and " "<option>--use-post-commit-hook</option> options to <command>svnadmin load</" "command>, you can instruct Subversion to execute the pre-commit and post-" "commit hook programs, respectively, for each loaded revision. You might use " "these, for example, to ensure that loaded revisions pass through the same " "validation steps that regular commits pass through. Of course, you should " "use these options with care—if your post-commit hook sends emails to a " "mailing list for each new commit, you might not want to spew hundreds or " "thousands of commit emails in rapid succession at that list! You can read " "more about the use of hook scripts in <xref linkend=\"svn.reposadmin.create." "hooks\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1941 msgid "" "Note that because <command>svnadmin</command> uses standard input and output " "streams for the repository dump and load processes, people who are feeling " "especially saucy can try things such as this (perhaps even using different " "versions of <command>svnadmin</command> on each side of the pipe):" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:1947 #, no-wrap msgid "" "\n" "$ svnadmin create newrepos\n" "$ svnadmin dump oldrepos | svnadmin load newrepos\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1952 msgid "" "By default, the dump file will be quite large—much larger than the " "repository itself. That's because by default every version of every file is " "expressed as a full text in the dump file. This is the fastest and simplest " "behavior, and it's nice if you're piping the dump data directly into some " "other process (such as a compression program, filtering program, or loading " "process). But if you're creating a dump file for longer-term storage, " "you'll likely want to save disk space by using the <option>--deltas</option> " "option. With this option, successive revisions of files will be output as " "compressed, binary differences—just as file revisions are stored in a " "repository. This option is slower, but it results in a dump file much " "closer in size to the original repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1967 msgid "" "We mentioned previously that <command>svnadmin dump</command> outputs a " "range of revisions. Use the <option>--revision</option> (<option>-r</" "option>) option to specify a single revision, or a range of revisions, to " "dump. If you omit this option, all the existing repository revisions will " "be dumped." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:1974 #, no-wrap msgid "" "\n" "$ svnadmin dump myrepos -r 23 > rev-23.dumpfile\n" "$ svnadmin dump myrepos -r 100:200 > revs-100-200.dumpfile\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1979 msgid "" "As Subversion dumps each new revision, it outputs only enough information to " "allow a future loader to re-create that revision based on the previous one. " "In other words, for any given revision in the dump file, only the items that " "were changed in that revision will appear in the dump. The only exception " "to this rule is the first revision that is dumped with the current " "<command>svnadmin dump</command> command." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1988 msgid "" "By default, Subversion will not express the first dumped revision as merely " "differences to be applied to the previous revision. For one thing, there is " "no previous revision in the dump file! And second, Subversion cannot know " "the state of the repository into which the dump data will be loaded (if it " "ever is). To ensure that the output of each execution of <command>svnadmin " "dump</command> is self-sufficient, the first dumped revision is, by default, " "a full representation of every directory, file, and property in that " "revision of the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:1999 msgid "" "However, you can change this default behavior. If you add the <option>--" "incremental</option> option when you dump your repository, " "<command>svnadmin</command> will compare the first dumped revision against " "the previous revision in the repository—the same way it treats every " "other revision that gets dumped. It will then output the first revision " "exactly as it does the rest of the revisions in the dump range—" "mentioning only the changes that occurred in that revision. The benefit of " "this is that you can create several small dump files that can be loaded in " "succession, instead of one large one, like so:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2011 #, no-wrap msgid "" "\n" "$ svnadmin dump myrepos -r 0:1000 > dumpfile1\n" "$ svnadmin dump myrepos -r 1001:2000 --incremental > dumpfile2\n" "$ svnadmin dump myrepos -r 2001:3000 --incremental > dumpfile3\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2017 msgid "" "These dump files could be loaded into a new repository with the following " "command sequence:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2020 #, no-wrap msgid "" "\n" "$ svnadmin load newrepos < dumpfile1\n" "$ svnadmin load newrepos < dumpfile2\n" "$ svnadmin load newrepos < dumpfile3\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2026 msgid "" "Another neat trick you can perform with this <option>--incremental</option> " "option involves appending to an existing dump file a new range of dumped " "revisions. For example, you might have a <literal>post-commit</literal> " "hook that simply appends the repository dump of the single revision that " "triggered the hook. Or you might have a script that runs nightly to append " "dump file data for all the revisions that were added to the repository since " "the last time the script ran. Used like this, <command>svnadmin dump</" "command> can be one way to back up changes to your repository over time in " "case of a system crash or some other catastrophic event." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2038 msgid "" "The dump format can also be used to merge the contents of several different " "repositories into a single repository. By using the <option>--parent-dir</" "option> option of <command>svnadmin load</command>, you can specify a new " "virtual root directory for the load process. That means if you have dump " "files for three repositories—say <filename>calc-dumpfile</filename>, " "<filename>cal-dumpfile</filename>, and <filename>ss-dumpfile</" "filename>—you can first create a new repository to hold them all:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2049 #, no-wrap msgid "" "\n" "$ svnadmin create /var/svn/projects\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2054 msgid "" "Then, make new directories in the repository that will encapsulate the " "contents of each of the three previous repositories:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2058 #, no-wrap msgid "" "\n" "$ svn mkdir -m \"Initial project roots\" \\\n" " file:///var/svn/projects/calc \\\n" " file:///var/svn/projects/calendar \\\n" " file:///var/svn/projects/spreadsheet\n" "Committed revision 1.\n" "$ \n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2067 msgid "" "Lastly, load the individual dump files into their respective locations in " "the new repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2070 #, no-wrap msgid "" "\n" "$ svnadmin load /var/svn/projects --parent-dir calc < calc-dumpfile\n" "…\n" "$ svnadmin load /var/svn/projects --parent-dir calendar < cal-dumpfile\n" "…\n" "$ svnadmin load /var/svn/projects --parent-dir spreadsheet < ss-dumpfile\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2080 msgid "" "We'll mention one final way to use the Subversion repository dump " "format—conversion from a different storage mechanism or version " "control system altogether. Because the dump file format is, for the most " "part, human-readable, it should be relatively easy to describe generic sets " "of changes—each of which should be treated as a new revision—" "using this file format. In fact, the <command>cvs2svn</command> utility " "(see <xref linkend=\"svn.forcvs.convert\"/>) uses the dump format to " "represent the contents of a CVS repository so that those contents can be " "copied into a Subversion repository." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch05-repository-admin.xml:2096 #, fuzzy #| msgid "Subversion Repository URLs" msgid "Filtering Repository History" msgstr "Subversion-Repository-URLs" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:2098 msgid "" "Since Subversion stores your versioned history using, at the very least, " "binary differencing algorithms and data compression (optionally in a " "completely opaque database system), attempting manual tweaks is unwise if " "not quite difficult, and at any rate strongly discouraged. And once data " "has been stored in your repository, Subversion generally doesn't provide an " "easy way to remove that data. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:2106 msgid "That's rather the reason you use version control at all, right?" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:2108 msgid "" "</footnote> But inevitably, there will be times when you would like to " "manipulate the history of your repository. You might need to strip out all " "instances of a file that was accidentally added to the repository (and " "shouldn't be there for whatever reason). <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:2115 msgid "" "Conscious, cautious removal of certain bits of versioned data is actually " "supported by real use cases. That's why an <quote>obliterate</quote> " "feature has been one of the most highly requested Subversion features, and " "one which the Subversion developers hope to soon provide." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2121 msgid "" "</footnote> Or, perhaps you have multiple projects sharing a single " "repository, and you decide to split them up into their own repositories. To " "accomplish tasks such as these, administrators need a more manageable and " "malleable representation of the data in their repositories—the " "Subversion repository dump format." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2129 msgid "" "As we described earlier in <xref linkend=\"svn.reposadmin.maint.migrate\" /" ">, the Subversion repository dump format is a human-readable representation " "of the changes that you've made to your versioned data over time. Use the " "<command>svnadmin dump</command> command to generate the dump data, and " "<command>svnadmin load</command> to populate a new repository with it. The " "great thing about the human-readability aspect of the dump format is that, " "if you aren't careless about it, you can manually inspect and modify it. Of " "course, the downside is that if you have three years' worth of repository " "activity encapsulated in what is likely to be a very large dump file, it " "could take you a long, long time to manually inspect and modify it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2143 msgid "" "That's where <command>svndumpfilter</command> becomes useful. This program " "acts as a path-based filter for repository dump streams. Simply give it " "either a list of paths you wish to keep or a list of paths you wish to not " "keep, and then pipe your repository dump data through this filter. The " "result will be a modified stream of dump data that contains only the " "versioned paths you (explicitly or implicitly) requested." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2152 msgid "" "Let's look at a realistic example of how you might use this program. " "Earlier in this chapter (see <xref linkend=\"svn.reposadmin.projects." "chooselayout\"/>), we discussed the process of deciding how to choose a " "layout for the data in your repositories—using one repository per " "project or combining them, arranging stuff within your repository, and so " "on. But sometimes after new revisions start flying in, you rethink your " "layout and would like to make some changes. A common change is the decision " "to move multiple projects that are sharing a single repository into separate " "repositories for each project." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2164 msgid "" "Our imaginary repository contains three projects: <literal>calc</literal>, " "<literal>calendar</literal>, and <literal>spreadsheet</literal>. They have " "been living side-by-side in a layout like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2169 #, no-wrap msgid "" "\n" "/\n" " calc/\n" " trunk/\n" " branches/\n" " tags/\n" " calendar/\n" " trunk/\n" " branches/\n" " tags/\n" " spreadsheet/\n" " trunk/\n" " branches/\n" " tags/\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2185 msgid "" "To get these three projects into their own repositories, we first dump the " "whole repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2188 #, no-wrap msgid "" "\n" "$ svnadmin dump /var/svn/repos > repos-dumpfile\n" "* Dumped revision 0.\n" "* Dumped revision 1.\n" "* Dumped revision 2.\n" "* Dumped revision 3.\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2198 msgid "" "Next, run that dump file through the filter, each time including only one of " "our top-level directories. This results in three new dump files:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2202 #, no-wrap msgid "" "\n" "$ svndumpfilter include calc < repos-dumpfile > calc-dumpfile\n" "…\n" "$ svndumpfilter include calendar < repos-dumpfile > cal-dumpfile\n" "…\n" "$ svndumpfilter include spreadsheet < repos-dumpfile > ss-dumpfile\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2212 msgid "" "At this point, you have to make a decision. Each of your dump files will " "create a valid repository, but will preserve the paths exactly as they were " "in the original repository. This means that even though you would have a " "repository solely for your <literal>calc</literal> project, that repository " "would still have a top-level directory named <filename>calc</filename>. If " "you want your <filename>trunk</filename>, <filename>tags</filename>, and " "<filename>branches</filename> directories to live in the root of your " "repository, you might wish to edit your dump files, tweaking the " "<literal>Node-path</literal> and <literal>Node-copyfrom-path</literal> " "headers so that they no longer have that first <filename>calc/</filename> " "path component. Also, you'll want to remove the section of dump data that " "creates the <filename>calc</filename> directory. It will look something " "like the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2229 #, no-wrap msgid "" "\n" "Node-path: calc\n" "Node-action: add\n" "Node-kind: dir\n" "Content-length: 0\n" " \n" msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:2238 msgid "" "If you do plan on manually editing the dump file to remove a top-level " "directory, make sure your editor is not set to automatically convert end-of-" "line characters to the native format (e.g., <literal>\\r\\n</literal> to " "<literal>\\n</literal>), as the content will then not agree with the " "metadata. This will render the dump file useless." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2247 msgid "" "All that remains now is to create your three new repositories, and load each " "dump file into the right repository, ignoring the UUID found in the dump " "stream:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2251 #, no-wrap msgid "" "\n" "$ svnadmin create calc\n" "$ svnadmin load --ignore-uuid calc < calc-dumpfile\n" "<<< Started new transaction, based on original revision 1\n" " * adding path : Makefile ... done.\n" " * adding path : button.c ... done.\n" "…\n" "$ svnadmin create calendar\n" "$ svnadmin load --ignore-uuid calendar < cal-dumpfile\n" "<<< Started new transaction, based on original revision 1\n" " * adding path : Makefile ... done.\n" " * adding path : cal.c ... done.\n" "…\n" "$ svnadmin create spreadsheet\n" "$ svnadmin load --ignore-uuid spreadsheet < ss-dumpfile\n" "<<< Started new transaction, based on original revision 1\n" " * adding path : Makefile ... done.\n" " * adding path : ss.c ... done.\n" "…\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2273 msgid "" "Both of <command>svndumpfilter</command>'s subcommands accept options for " "deciding how to deal with <quote>empty</quote> revisions. If a given " "revision contains only changes to paths that were filtered out, that now-" "empty revision could be considered uninteresting or even unwanted. So to " "give the user control over what to do with those revisions, " "<command>svndumpfilter</command> provides the following command-line options:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:2284 #: ../en/book/ch09-reference.xml:8226 msgid "<option>--drop-empty-revs</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:2286 msgid "Do not generate empty revisions at all—just omit them." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:2291 #: ../en/book/ch09-reference.xml:8235 msgid "<option>--renumber-revs</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:2293 msgid "" "If empty revisions are dropped (using the <option>--drop-empty-revs</option> " "option), change the revision numbers of the remaining revisions so that " "there are no gaps in the numeric sequence." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch05-repository-admin.xml:2300 #: ../en/book/ch09-reference.xml:8254 msgid "<option>--preserve-revprops</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch05-repository-admin.xml:2302 msgid "" "If empty revisions are not dropped, preserve the revision properties (log " "message, author, date, custom properties, etc.) for those empty revisions. " "Otherwise, empty revisions will contain only the original datestamp, and a " "generated log message that indicates that this revision was emptied by " "<command>svndumpfilter</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2313 msgid "" "While <command>svndumpfilter</command> can be very useful and a huge " "timesaver, there are unfortunately a couple of gotchas. First, this utility " "is overly sensitive to path semantics. Pay attention to whether paths in " "your dump file are specified with or without leading slashes. You'll want " "to look at the <literal>Node-path</literal> and <literal>Node-copyfrom-path</" "literal> headers." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2321 #, no-wrap msgid "" "\n" "…\n" "Node-path: spreadsheet/Makefile\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:2327 msgid "" "If the paths have leading slashes, you should include leading slashes in the " "paths you pass to <command>svndumpfilter include</command> and " "<command>svndumpfilter exclude</command> (and if they don't, you " "shouldn't). Further, if your dump file has an inconsistent usage of leading " "slashes for some reason, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:2334 msgid "" "While <command>svnadmin dump</command> has a consistent leading slash policy " "(to not include them), other programs that generate dump data might not be " "so consistent." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2338 msgid "" "</footnote> you should probably normalize those paths so that they all have, " "or all lack, leading slashes." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2342 msgid "" "Also, copied paths can give you some trouble. Subversion supports copy " "operations in the repository, where a new path is created by copying some " "already existing path. It is possible that at some point in the lifetime of " "your repository, you might have copied a file or directory from some " "location that <command>svndumpfilter</command> is excluding, to a location " "that it is including. To make the dump data self-sufficient, " "<command>svndumpfilter</command> needs to still show the addition of the new " "path—including the contents of any files created by the copy—and " "not represent that addition as a copy from a source that won't exist in your " "filtered dump data stream. But because the Subversion repository dump " "format shows only what was changed in each revision, the contents of the " "copy source might not be readily available. If you suspect that you have " "any copies of this sort in your repository, you might want to rethink your " "set of included/excluded paths, perhaps including the paths that served as " "sources of your troublesome copy operations, too." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2363 msgid "" "Finally, <command>svndumpfilter</command> takes path filtering quite " "literally. If you are trying to copy the history of a project rooted at " "<filename>trunk/my-project</filename> and move it into a repository of its " "own, you would, of course, use the <command>svndumpfilter include</command> " "command to keep all the changes in and under <filename>trunk/my-project</" "filename>. But the resultant dump file makes no assumptions about the " "repository into which you plan to load this data. Specifically, the dump " "data might begin with the revision that added the <filename>trunk/my-" "project</filename> directory, but it will <emphasis>not</emphasis> contain " "directives that would create the <filename>trunk</filename> directory itself " "(because <filename>trunk</filename> doesn't match the include filter). " "You'll need to make sure that any directories that the new dump stream " "expects to exist actually do exist in the target repository before trying to " "load the stream into that repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:2387 #, fuzzy #| msgid "Repository URLs" msgid "Repository Replication" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2389 msgid "" "There are several scenarios in which it is quite handy to have a Subversion " "repository whose version history is exactly the same as some other " "repository's. Perhaps the most obvious one is the maintenance of a simple " "backup repository, used when the primary repository has become inaccessible " "due to a hardware failure, network outage, or other such annoyance. Other " "scenarios include deploying mirror repositories to distribute heavy " "Subversion load across multiple servers, use as a soft-upgrade mechanism, " "and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2399 msgid "" "As of version 1.4, Subversion provides a program for managing scenarios such " "as these—<command>svnsync</command>. This works by essentially asking " "the Subversion server to <quote>replay</quote> revisions, one at a time. It " "then uses that revision information to mimic a commit of the same to another " "repository. Neither repository needs to be locally accessible to the " "machine on which <command>svnsync</command> is running—its parameters " "are repository URLs, and it does all its work through Subversion's " "Repository Access (RA) interfaces. All it requires is read access to the " "source repository and read/write access to the destination repository." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch05-repository-admin.xml:2414 msgid "" "When using <command>svnsync</command> against a remote source repository, " "the Subversion server for that repository must be running Subversion version " "1.4 or later." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:2419 msgid "" "Assuming you already have a source repository that you'd like to mirror, the " "next thing you need is an empty target repository that will actually serve " "as that mirror. This target repository can use either of the available " "filesystem data-store backends (see <xref linkend=\"svn.reposadmin.basics." "backends\" />), but it must not yet have any version history in it. The " "protocol that <command>svnsync</command> uses to communicate revision " "information is highly sensitive to mismatches between the versioned " "histories contained in the source and target repositories. For this reason, " "while <command>svnsync</command> cannot <emphasis>demand</emphasis> that the " "target repository be read-only, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:2433 msgid "" "In fact, it can't truly be read-only, or <command>svnsync</command> itself " "would have a tough time copying revision history into it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2436 msgid "" "</footnote> allowing the revision history in the target repository to change " "by any mechanism other than the mirroring process is a recipe for disaster." msgstr "" # type: Content of: <chapter><sect1><sect2><warning><para> #: ../en/book/ch05-repository-admin.xml:2442 msgid "" "Do <emphasis>not</emphasis> modify a mirror repository in such a way as to " "cause its version history to deviate from that of the repository it " "mirrors. The only commits and revision property modifications that ever " "occur on that mirror repository should be those performed by the " "<command>svnsync</command> tool." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2450 msgid "" "Another requirement of the target repository is that the <command>svnsync</" "command> process be allowed to modify revision properties. Because " "<command>svnsync</command> works within the framework of that repository's " "hook system, the default state of the repository (which is to disallow " "revision property changes; see <xref linkend=\"svn.ref.reposhooks.pre-" "revprop-change\" />) is insufficient. You'll need to explicitly implement " "the pre-revprop-change hook, and your script must allow <command>svnsync</" "command> to set and change revision properties. With those provisions in " "place, you are ready to start mirroring repository revisions." msgstr "" # type: Content of: <chapter><sect1><sect2><tip><para> #: ../en/book/ch05-repository-admin.xml:2464 msgid "" "It's a good idea to implement authorization measures that allow your " "repository replication process to perform its tasks while preventing other " "users from modifying the contents of your mirror repository at all." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2470 msgid "" "Let's walk through the use of <command>svnsync</command> in a somewhat " "typical mirroring scenario. We'll pepper this discourse with practical " "recommendations, which you are free to disregard if they aren't required by " "or suitable for your environment." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2476 msgid "" "As a service to the fine developers of our favorite version control system, " "we will be mirroring the public Subversion source code repository and " "exposing that mirror publicly on the Internet, hosted on a different machine " "than the one on which the original Subversion source code repository lives. " "This remote host has a global configuration that permits anonymous users to " "read the contents of repositories on the host, but requires users to " "authenticate to modify those repositories. (Please forgive us for glossing " "over the details of Subversion server configuration for the moment—" "those are covered thoroughly in <xref linkend=\"svn.serverconfig\" />.) And " "for no other reason than that it makes for a more interesting example, we'll " "be driving the replication process from a third machine—the one that " "we currently find ourselves using." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2492 msgid "" "First, we'll create the repository which will be our mirror. This and the " "next couple of steps do require shell access to the machine on which the " "mirror repository will live. Once the repository is all configured, though, " "we shouldn't need to touch it directly again." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2498 #, no-wrap msgid "" "\n" "$ ssh admin@svn.example.com \\\n" " \"svnadmin create /var/svn/svn-mirror\"\n" "admin@svn.example.com's password: ********\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2505 msgid "" "At this point, we have our repository, and due to our server's " "configuration, that repository is now <quote>live</quote> on the Internet. " "Now, because we don't want anything modifying the repository except our " "replication process, we need a way to distinguish that process from other " "would-be committers. To do so, we use a dedicated username for our " "process. Only commits and revision property modifications performed by the " "special username <literal>syncuser</literal> will be allowed." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2515 msgid "" "We'll use the repository's hook system both to allow the replication process " "to do what it needs to do and to enforce that only it is doing those " "things. We accomplish this by implementing two of the repository event " "hooks—pre-revprop-change and start-commit. Our <filename>pre-revprop-" "change</filename> hook script is found in <xref linkend=\"svn.reposadmin." "maint.replication.pre-revprop-change\" />, and basically verifies that the " "user attempting the property changes is our <literal>syncuser</literal> " "user. If so, the change is allowed; otherwise, it is denied." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch05-repository-admin.xml:2528 msgid "Mirror repository's pre-revprop-change hook script" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch05-repository-admin.xml:2530 #, no-wrap msgid "" "\n" "#!/bin/sh \n" "\n" "USER=\"$3\"\n" "\n" "if [ \"$USER\" = \"syncuser\" ]; then exit 0; fi\n" "\n" "echo \"Only the syncuser user may change revision properties\" >&2\n" "exit 1\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2542 msgid "" "That covers revision property changes. Now we need to ensure that only the " "<literal>syncuser</literal> user is permitted to commit new revisions to the " "repository. We do this using a <filename>start-commit</filename> hook " "scripts such as the one in <xref linkend=\"svn.reposadmin.maint.replication." "start-commit\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch05-repository-admin.xml:2551 msgid "Mirror repository's start-commit hook script" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch05-repository-admin.xml:2553 #, no-wrap msgid "" "\n" "#!/bin/sh \n" "\n" "USER=\"$2\"\n" "\n" "if [ \"$USER\" = \"syncuser\" ]; then exit 0; fi\n" "\n" "echo \"Only the syncuser user may commit new revisions\" >&2\n" "exit 1\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2565 msgid "" "After installing our hook scripts and ensuring that they are executable by " "the Subversion server, we're finished with the setup of the mirror " "repository. Now, we get to actually do the mirroring." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2570 msgid "" "The first thing we need to do with <command>svnsync</command> is to register " "in our target repository the fact that it will be a mirror of the source " "repository. We do this using the <command>svnsync initialize</command> " "subcommand. The URLs we provide point to the root directories of the target " "and source repositories, respectively. In Subversion 1.4, this is " "required—only full mirroring of repositories is permitted. In " "Subversion 1.5, though, you can use <command>svnsync</command> to mirror " "only some subtree of the repository, too." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2581 #, no-wrap msgid "" "\n" "$ svnsync help init\n" "initialize (init): usage: svnsync initialize DEST_URL SOURCE_URL\n" "\n" "Initialize a destination repository for synchronization from\n" "another repository.\n" "…\n" "$ svnsync initialize http://svn.example.com/svn-mirror \\\n" " http://svn.collab.net/repos/svn \\\n" " --sync-username syncuser --sync-password syncpass\n" "Copied properties for revision 0.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2595 msgid "" "Our target repository will now remember that it is a mirror of the public " "Subversion source code repository. Notice that we provided a username and " "password as arguments to <command>svnsync</command>—that was required " "by the pre-revprop-change hook on our mirror repository." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch05-repository-admin.xml:2602 msgid "" "In Subversion 1.4, the values given to <command>svnsync</command>'s " "<option>--username</option> and <option>--password</option> command-line " "options were used for authentication against both the source and destination " "repositories. This caused problems when a user's credentials weren't " "exactly the same for both repositories, especially when running in " "noninteractive mode (with the <option>--non-interactive</option> option)." msgstr "" # type: Content of: <chapter><sect1><sect2><note><para> #: ../en/book/ch05-repository-admin.xml:2611 msgid "" "This has been fixed in Subversion 1.5 with the introduction of two new pairs " "of options. Use <option>--source-username</option> and <option>--source-" "password</option> to provide authentication credentials for the source " "repository; use <option>--sync-username</option> and <option>--sync-" "password</option> to provide credentials for the destination repository. " "(The old <option>--username</option> and <option>--password</option> options " "still exist for compatibility, but we advise against using them.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:2625 msgid "" "And now comes the fun part. With a single subcommand, we can tell " "<command>svnsync</command> to copy all the as-yet-unmirrored revisions from " "the source repository to the target. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:2630 msgid "" "Be forewarned that while it will take only a few seconds for the average " "reader to parse this paragraph and the sample output that follows it, the " "actual time required to complete such a mirroring operation is, shall we " "say, quite a bit longer." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2635 msgid "" "</footnote> The <command>svnsync synchronize</command> subcommand will peek " "into the special revision properties previously stored on the target " "repository, and determine both what repository it is mirroring as well as " "that the most recently mirrored revision was revision 0. Then it will query " "the source repository and determine what the latest revision in that " "repository is. Finally, it asks the source repository's server to start " "replaying all the revisions between 0 and that latest revision. As " "<command>svnsync</command> get the resultant response from the source " "repository's server, it begins forwarding those revisions to the target " "repository's server as new commits." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2649 #, no-wrap msgid "" "\n" "$ svnsync help synchronize\n" "synchronize (sync): usage: svnsync synchronize DEST_URL\n" "\n" "Transfer all pending revisions to the destination from the source\n" "with which it was initialized.\n" "…\n" "$ svnsync synchronize http://svn.example.com/svn-mirror\n" "Transmitting file data ........................................\n" "Committed revision 1.\n" "Copied properties for revision 1.\n" "Transmitting file data ..\n" "Committed revision 2.\n" "Copied properties for revision 2.\n" "Transmitting file data .....\n" "Committed revision 3.\n" "Copied properties for revision 3.\n" "…\n" "Transmitting file data ..\n" "Committed revision 23406.\n" "Copied properties for revision 23406.\n" "Transmitting file data .\n" "Committed revision 23407.\n" "Copied properties for revision 23407.\n" "Transmitting file data ....\n" "Committed revision 23408.\n" "Copied properties for revision 23408.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2679 msgid "" "Of particular interest here is that for each mirrored revision, there is " "first a commit of that revision to the target repository, and then property " "changes follow. This is because the initial commit is performed by (and " "attributed to) the user <literal>syncuser</literal>, and it is datestamped " "with the time as of that revision's creation. Also, Subversion's underlying " "repository access interfaces don't provide a mechanism for setting arbitrary " "revision properties as part of a commit. So <command>svnsync</command> " "follows up with an immediate series of property modifications that copy into " "the target repository all the revision properties found for that revision in " "the source repository. This also has the effect of fixing the author and " "datestamp of the revision to match that of the source repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2694 msgid "" "Also noteworthy is that <command>svnsync</command> performs careful " "bookkeeping that allows it to be safely interrupted and restarted without " "ruining the integrity of the mirrored data. If a network glitch occurs " "while mirroring a repository, simply repeat the <command>svnsync " "synchronize</command> command, and it will happily pick up right where it " "left off. In fact, as new revisions appear in the source repository, this " "is exactly what you to do to keep your mirror up to date." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:2705 msgid "svnsync Bookkeeping" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch05-repository-admin.xml:2707 msgid "" "<command>svnsync</command> needs to be able to set and modify revision " "properties on the mirror repository because those properties are part of the " "data it is tasked with mirroring. As those properties change in the source " "repository, those changes need to be reflected in the mirror repository, " "too. But <command>svnsync</command> also uses a set of custom revision " "properties—stored in revision 0 of the mirror repository—for its " "own internal bookkeeping. These properties contain information such as the " "URL and UUID of the source repository, plus some additional state-tracking " "information." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch05-repository-admin.xml:2719 msgid "" "One of those pieces of state-tracking information is a flag that essentially " "just means <quote>there's a synchronization in progress right now.</quote> " "This is used to prevent multiple <command>svnsync</command> processes from " "colliding with each other while trying to mirror data to the same " "destination repository. Now, generally you won't need to pay any attention " "whatsoever to <emphasis>any</emphasis> of these special properties (all of " "which begin with the prefix <literal>svn:sync-</literal>). Occasionally, " "though, if a synchronization fails unexpectedly, Subversion never has a " "chance to remove this particular state flag. This causes all future " "synchronization attempts to fail because it appears that a synchronization " "is still in progress when, in fact, none is. Fortunately, recovering from " "this situation is as simple as removing the <literal>svn:sync-lock</literal> " "property which serves as this flag from revision 0 of the mirror repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch05-repository-admin.xml:2738 #, no-wrap msgid "" "\n" "$ svn propdel --revprop -r0 svn:sync-lock http://svn.example.com/svn-mirror\n" "property 'svn:sync-lock' deleted from repository revision 0\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch05-repository-admin.xml:2744 msgid "" "That <command>svnsync</command> stores the source repository URL in a " "bookkeeping property on the mirror repository is the reason why you have to " "specify that URL only once, during <command>svnsync init</command>. Future " "synchronization operations against that mirror simply consult the special " "<literal>svn:sync-from-url</literal> property stored on the mirror itself to " "know where to synchronize from. This value is used literally by the " "synchronization process, though. So while from within CollabNet's network " "you can perhaps access our example source URL as <literal>http://svn/repos/" "svn</literal> (because that first <literal>svn</literal> magically gets " "<literal>.collab.net</literal> appended to it by DNS voodoo), if you later " "need to update that mirror from another machine outside CollabNet's network, " "the synchronization might fail (because the hostname <literal>svn</literal> " "is ambiguous). For this reason, it's best to use fully qualified source " "repository URLs when initializing a mirror repository rather than those that " "refer to only hostnames or IP addresses (which can change over time). But " "here again, if you need an existing mirror to start referring to a different " "URL for the same source repository, you can change the bookkeeping property " "which houses that information:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch05-repository-admin.xml:2769 #, no-wrap msgid "" "\n" "$ svn propset --revprop -r0 svn:sync-from-url <replaceable>NEW-SOURCE-URL</replaceable> \\\n" " http://svn.example.com/svn-mirror\n" "property 'svn:sync-from-url' set on repository revision 0\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch05-repository-admin.xml:2776 msgid "" "Another interesting thing about these special bookkeeping properties is that " "<command>svnsync</command> will not attempt to mirror any of those " "properties when they are found in the source repository. The reason is " "probably obvious, but basically boils down to <command>svnsync</command> not " "being able to distinguish the special properties it has merely copied from " "the source repository from those it needs to consult and maintain for its " "own bookkeeping needs. This situation could occur if, for example, you were " "maintaining a mirror of a mirror of a third repository. When " "<command>svnsync</command> sees its own special properties in revision 0 of " "the source repository, it simply ignores them." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2792 msgid "" "There is, however, one bit of inelegance in the process. Because Subversion " "revision properties can be changed at any time throughout the lifetime of " "the repository, and because they don't leave an audit trail that indicates " "when they were changed, replication processes have to pay special attention " "to them. If you've already mirrored the first 15 revisions of a repository " "and someone then changes a revision property on revision 12, " "<command>svnsync</command> won't know to go back and patch up its copy of " "revision 12. You'll need to tell it to do so manually by using (or with " "some additional tooling around) the <command>svnsync copy-revprops</command> " "subcommand, which simply rereplicates all the revision properties for a " "particular revision or range thereof." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2806 #, no-wrap msgid "" "\n" "$ svnsync help copy-revprops\n" "copy-revprops: usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n" "\n" "Copy the revision properties in a given range of revisions to the\n" "destination from the source with which it was initialized.\n" "…\n" "$ svnsync copy-revprops http://svn.example.com/svn-mirror 12\n" "Copied properties for revision 12.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2818 msgid "" "That's repository replication in a nutshell. You'll likely want some " "automation around such a process. For example, while our example was a pull-" "and-push setup, you might wish to have your primary repository push changes " "to one or more blessed mirrors as part of its post-commit and post-revprop-" "change hook implementations. This would enable the mirror to be up to date " "in as near to real time as is likely possible." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2827 msgid "" "Also, while it isn't very commonplace to do so, <command>svnsync</command> " "does gracefully mirror repositories in which the user as whom it " "authenticates has only partial read access. It simply copies only the bits " "of the repository that it is permitted to see. Obviously, such a mirror is " "not useful as a backup solution." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2834 msgid "" "In Subversion 1.5, <command>svnsync</command> grew the ability to also " "mirror a subset of a repository rather than the whole thing. The process of " "setting up and maintaining such a mirror is exactly the same as when " "mirroring a whole repository, except that instead of specifying the source " "repository's root URL when running <command>svnsync init</command>, you " "specify the URL of some subdirectory within that repository. " "Synchronization to that mirror will now copy only the bits that changed " "under that source repository subdirectory. There are some limitations to " "this support, though. First, you can't mirror multiple disjoint " "subdirectories of the source repository into a single mirror " "repository—you'd need to instead mirror some parent directory that is " "common to both. Second, the filtering logic is entirely path-based, so if " "the subdirectory you are mirroring was renamed at some point in the past, " "your mirror would contain only the revisions since the directory appeared at " "the URL you specified. And likewise, if the source subdirectory is renamed " "in the future, your synchronization processes will stop mirroring data at " "the point that the source URL you specified is no longer valid." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2856 msgid "" "As far as user interaction with repositories and mirrors goes, it " "<emphasis>is</emphasis> possible to have a single working copy that " "interacts with both, but you'll have to jump through some hoops to make it " "happen. First, you need to ensure that both the primary and mirror " "repositories have the same repository UUID (which is not the case by " "default). See <xref linkend=\"svn.reposadmin.maint.uuids\" /> later in this " "chapter for more about this." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2865 msgid "" "Once the two repositories have the same UUID, you can use <command>svn " "switch</command> with the <option>--relocate</option> option to point your " "working copy to whichever of the repositories you wish to operate against, a " "process that is described in <xref linkend=\"svn.ref.svn.c.switch\" />. " "There is a possible danger here, though, in that if the primary and mirror " "repositories aren't in close synchronization, a working copy up to date " "with, and pointing to, the primary repository will, if relocated to point to " "an out-of-date mirror, become confused about the apparent sudden loss of " "revisions it fully expects to be present, and it will throw errors to that " "effect. If this occurs, you can relocate your working copy back to the " "primary repository and then either wait until the mirror repository is up to " "date, or backdate your working copy to a revision you know is present in the " "sync repository, and then retry the relocation." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2882 msgid "" "Finally, be aware that the revision-based replication provided by " "<command>svnsync</command> is only that—replication of revisions. " "Only information carried by the Subversion repository dump file format is " "available for replication. As such, <command>svnsync</command> has the same " "sorts of limitations that the repository dump stream has, and does not " "include such things as the hook implementations, repository or server " "configuration data, uncommitted transactions, or information about user " "locks on repository paths." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:2897 #, fuzzy #| msgid "Repository URLs" msgid "Repository Backup" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2899 msgid "" "Despite numerous advances in technology since the birth of the modern " "computer, one thing unfortunately rings true with crystalline clarity—" "sometimes things go very, very awry. Power outages, network connectivity " "dropouts, corrupt RAM, and crashed hard drives are but a taste of the evil " "that Fate is poised to unleash on even the most conscientious " "administrator. And so we arrive at a very important topic—how to make " "backup copies of your repository data." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2909 msgid "" "There are two types of backup methods available for Subversion repository " "administrators—full and incremental. A full backup of the repository " "involves squirreling away in one sweeping action all the information " "required to fully reconstruct that repository in the event of a " "catastrophe. Usually, it means, quite literally, the duplication of the " "entire repository directory (which includes either a Berkeley DB or FSFS " "environment). Incremental backups are lesser things: backups of only the " "portion of the repository data that has changed since the previous backup." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2921 msgid "" "As far as full backups go, the naïve approach might seem like a sane one, " "but unless you temporarily disable all other access to your repository, " "simply doing a recursive directory copy runs the risk of generating a faulty " "backup. In the case of Berkeley DB, the documentation describes a certain " "order in which database files can be copied that will guarantee a valid " "backup copy. A similar ordering exists for FSFS data. But you don't have " "to implement these algorithms yourself, because the Subversion development " "team has already done so. The <command>svnadmin hotcopy</command> command " "takes care of the minutia involved in making a hot backup of your " "repository. And its invocation is as trivial as the Unix <command>cp</" "command> or Windows <command>copy</command> operations:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2936 #, no-wrap msgid "" "\n" "$ svnadmin hotcopy /var/svn/repos /var/svn/repos-backup\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2940 msgid "" "The resultant backup is a fully functional Subversion repository, able to be " "dropped in as a replacement for your live repository should something go " "horribly wrong." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2944 msgid "" "When making copies of a Berkeley DB repository, you can even instruct " "<command>svnadmin hotcopy</command> to purge any unused Berkeley DB logfiles " "(see <xref linkend=\"svn.reposadmin.maint.diskspace.bdblogs\" />) from the " "original repository upon completion of the copy. Simply provide the " "<option>--clean-logs</option> option on the command line." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:2952 #, no-wrap msgid "" "\n" "$ svnadmin hotcopy --clean-logs /var/svn/bdb-repos /var/svn/bdb-repos-backup\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2956 msgid "" "Additional tooling around this command is available, too. The " "<filename>tools/backup/</filename> directory of the Subversion source " "distribution holds the <command>hot-backup.py</command> script. This script " "adds a bit of backup management atop <command>svnadmin hotcopy</command>, " "allowing you to keep only the most recent configured number of backups of " "each repository. It will automatically manage the names of the backed-up " "repository directories to avoid collisions with previous backups and will " "<quote>rotate off</quote> older backups, deleting them so that only the most " "recent ones remain. Even if you also have an incremental backup, you might " "want to run this program on a regular basis. For example, you might " "consider using <command>hot-backup.py</command> from a program scheduler " "(such as <command>cron</command> on Unix systems), which can cause it to run " "nightly (or at whatever granularity of time you deem safe)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2974 msgid "" "Some administrators use a different backup mechanism built around generating " "and storing repository dump data. We described in <xref linkend=\"svn." "reposadmin.maint.migrate\" /> how to use <command>svnadmin dump</command> " "with the <option>--incremental</option> option to perform an incremental " "backup of a given revision or range of revisions. And of course, you can " "achieve a full backup variation of this by omitting the <option>--" "incremental</option> option to that command. There is some value in these " "methods, in that the format of your backed-up information is flexible—" "it's not tied to a particular platform, versioned filesystem type, or " "release of Subversion or Berkeley DB. But that flexibility comes at a cost, " "namely that restoring that data can take a long time—longer with each " "new revision committed to your repository. Also, as is the case with so " "many of the various backup methods, revision property changes that are made " "to already backed-up revisions won't get picked up by a nonoverlapping, " "incremental dump generation. For these reasons, we recommend against " "relying solely on dump-based backup approaches." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:2994 msgid "" "As you can see, each of the various backup types and methods has its " "advantages and disadvantages. The easiest is by far the full hot backup, " "which will always result in a perfect working replica of your repository. " "Should something bad happen to your live repository, you can restore from " "the backup with a simple recursive directory copy. Unfortunately, if you " "are maintaining multiple backups of your repository, these full copies will " "each eat up just as much disk space as your live repository. Incremental " "backups, by contrast, tend to be quicker to generate and smaller to store. " "But the restoration process can be a pain, often involving applying multiple " "incremental backups. And other methods have their own peculiarities. " "Administrators need to find the balance between the cost of making the " "backup and the cost of restoring it." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3010 msgid "" "The <command>svnsync</command> program (see <xref linkend=\"svn.reposadmin." "maint.replication\" />) actually provides a rather handy middle-ground " "approach. If you are regularly synchronizing a read-only mirror with your " "main repository, in a pinch your read-only mirror is probably a good " "candidate for replacing that main repository if it falls over. The primary " "disadvantage of this method is that only the versioned repository data gets " "synchronized—repository configuration files, user-specified repository " "path locks, and other items that might live in the physical repository " "directory but not <emphasis>inside</emphasis> the repository's virtual " "versioned filesystem are not handled by <command>svnsync</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:3024 msgid "" "In any backup scenario, repository administrators need to be aware of how " "modifications to unversioned revision properties affect their backups. " "Since these changes do not themselves generate new revisions, they will not " "trigger post-commit hooks, and may not even trigger the pre-revprop-change " "and post-revprop-change hooks. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:3031 msgid "" "<command>svnadmin setlog</command> can be called in a way that bypasses the " "hook interface altogether." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3033 msgid "" "</footnote> And since you can change revision properties without respect to " "chronological order—you can change any revision's properties at any " "time—an incremental backup of the latest few revisions might not catch " "a property modification to a revision that was included as part of a " "previous backup." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3041 msgid "" "Generally speaking, only the truly paranoid would need to back up their " "entire repository, say, every time a commit occurred. However, assuming " "that a given repository has some other redundancy mechanism in place with " "relatively fine granularity (such as per-commit emails or incremental " "dumps), a hot backup of the database might be something that a repository " "administrator would want to include as part of a system-wide nightly " "backup. It's your data—protect it as much as you'd like." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch05-repository-admin.xml:3051 msgid "" "Often, the best approach to repository backups is a diversified one that " "leverages combinations of the methods described here. The Subversion " "developers, for example, back up the Subversion source code repository " "nightly using <command>hot-backup.py</command> and an off-site " "<command>rsync</command> of those full backups; keep multiple archives of " "all the commit and property change notification emails; and have repository " "mirrors maintained by various volunteers using <command>svnsync</command>. " "Your solution might be similar, but should be catered to your needs and that " "delicate balance of convenience with paranoia. And whatever you do, " "validate your backups from time to time—what good is a spare tire that " "has a hole in it? While all of this might not save your hardware from the " "iron fist of Fate, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch05-repository-admin.xml:3066 msgid "" "You know—the collective term for all of her <quote>fickle fingers.</" "quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3068 msgid "" "</footnote> it should certainly help you recover from those trying times." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch05-repository-admin.xml:3076 #, fuzzy #| msgid "Repository URLs" msgid "Managing Repository UUIDs" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3078 msgid "" "Subversion repositories have a universally unique identifier (UUID) " "associated with them. This is used by Subversion clients to verify the " "identity of a repository when other forms of verification aren't good enough " "(such as checking the repository URL, which can change over time). Most " "Subversion repository administrators rarely, if ever, need to think about " "repository UUIDs as anything more than a trivial implementation detail of " "Subversion. Sometimes, however, there is cause for attention to this detail." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3088 msgid "" "As a general rule, you want the UUIDs of your live repositories to be " "unique. That is, after all, the point of having UUIDs. But there are times " "when you want the repository UUIDs of two repositories to be exactly the " "same. For example, if you make a copy of a repository for backup purposes, " "you want the backup to be a perfect replica of the original so that, in the " "event that you have to restore that backup and replace the live repository, " "users don't suddenly see what looks like a different repository. When " "dumping and loading repository history (as described earlier in <xref " "linkend=\"svn.reposadmin.maint.migrate\" />), you get to decide whether to " "apply the UUID encapsulated in the data dump stream to the repository in " "which you are loading the data. The particular circumstance will dictate " "the correct behavior." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3104 msgid "" "There are a couple of ways to set (or reset) a repository's UUID, should you " "need to. As of Subversion 1.5, this is as simple as using the " "<command>svnadmin setuuid</command> command. If you provide this subcommand " "with an explicit UUID, it will validate that the UUID is well-formed and " "then set the repository UUID to that value. If you omit the UUID, a brand-" "new UUID will be generated for your repository." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:3113 #, no-wrap msgid "" "\n" "$ svnlook uuid /var/svn/repos\n" "cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec\n" "$ svnadmin setuuid /var/svn/repos # generate a new UUID\n" "$ svnlook uuid /var/svn/repos\n" "3c3c38fe-acc0-11dc-acbc-1b37ff1c8e7c\n" "$ svnadmin setuuid /var/svn/repos \\\n" " cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec # restore the old UUID\n" "$ svnlook uuid /var/svn/repos\n" "cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3126 msgid "" "For folks using versions of Subversion earlier than 1.5, these tasks are a " "little more complicated. You can explicitly set a repository's UUID by " "piping a repository dump file stub that carries the new UUID specification " "through <userinput>svnadmin load --force-uuid <replaceable>REPOS-PATH</" "replaceable></userinput>." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch05-repository-admin.xml:3132 #, no-wrap msgid "" "\n" "$ svnadmin load --force-uuid /var/svn/repos <<EOF\n" "SVN-fs-dump-format-version: 2\n" "\n" "UUID: cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec\n" "EOF\n" "$ svnlook uuid /var/svn/repos\n" "cf2b9d22-acb5-11dc-bc8c-05e83ce5dbec\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch05-repository-admin.xml:3143 msgid "" "Having older versions of Subversion generate a brand-new UUID is not quite " "as simple to do, though. Your best bet here is to find some other way to " "generate a UUID, and then explicitly set the repository's UUID to that value." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch05-repository-admin.xml:3156 msgid "Moving and Removing Repositories" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:3158 msgid "" "Subversion repository data is wholly contained within the repository " "directory. As such, you can move a Subversion repository to some other " "location on disk, rename a repository, copy a repository, or delete a " "repository altogether using the tools provided by your operating system for " "manipulating directories—<command>mv</command>, <command>cp -a</" "command>, and <command>rm -r</command> on Unix platforms; <command>copy</" "command>, <command>move</command>, and <command>rmdir /s /q</command> on " "Windows; vast numbers of mouse and menu gyrations in various graphical file " "explorer applications, and so on." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:3170 msgid "" "Of course, there's often still more to be done when trying to cleanly affect " "changes such as this. For example, you might need to update your Subversion " "server configuration to point to the new location of a relocated repository " "or to remove configuration bits for a now-deleted repository. If you have " "automated processes that publish information from or about your " "repositories, they may need to be updated. Hook scripts might need to be " "reconfigured. Users may need to be notified. The list can go on " "indefinitely, or at least to the extent that you've built processes and " "procedures around your Subversion repository." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:3182 msgid "" "In the case of a copied repository, you should also consider the fact that " "Subversion uses repository UUIDs to distinguish repositories. If you copy a " "Subversion repository using a typical shell recursive copy command, you'll " "wind up with two repositories that are identical in every way—" "including their UUIDs. In some circumstances, this might be desirable. But " "in the instances where it is not, you'll need to generate a new UUID for one " "of these identical repositories. See <xref linkend=\"svn.reposadmin.maint." "uuids\" /> for more about managing repository UUIDs." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:3201 msgid "" "By now you should have a basic understanding of how to create, configure, " "and maintain Subversion repositories. We introduced you to the various " "tools that will assist you with this task. Throughout the chapter, we noted " "common administration pitfalls and offered suggestions for avoiding them." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch05-repository-admin.xml:3208 msgid "" "All that remains is for you to decide what exciting data to store in your " "repository, and finally, how to make it available over a network. The next " "chapter is all about networking." msgstr "" # type: Content of: <chapter><title> #: ../en/book/ch06-server-configuration.xml:2 msgid "Server Configuration" msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch06-server-configuration.xml:4 msgid "" "A Subversion repository can be accessed simultaneously by clients running on " "the same machine on which the repository resides using the <literal>file://</" "literal> method. But the typical Subversion setup involves a single server " "machine being accessed from clients on computers all over the office—" "or, perhaps, all over the world." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch06-server-configuration.xml:11 msgid "" "This chapter describes how to get your Subversion repository exposed outside " "its host machine for use by remote clients. We will cover Subversion's " "currently available server mechanisms, discussing the configuration and use " "of each. After reading this chapter, you should be able to decide which " "networking setup is right for your needs, as well as understand how to " "enable such a setup on your host computer." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:25 #, fuzzy #| msgid "svnserve" msgid "Overview" msgstr "svnserve" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:27 msgid "" "Subversion was designed with an abstract network layer. This means that a " "repository can be programmatically accessed by any sort of server process, " "and the client <quote>repository access</quote> API allows programmers to " "write plug-ins that speak relevant network protocols. In theory, Subversion " "can use an infinite number of network implementations. In practice, there " "are only two servers at the time of this writing." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:35 msgid "" "Apache is an extremely popular web server; using the <command>mod_dav_svn</" "command> module, Apache can access a repository and make it available to " "clients via the WebDAV/DeltaV protocol, which is an extension of HTTP. " "Because Apache is an extremely extensible server, it provides a number of " "features <quote>for free,</quote> such as encrypted SSL communication, " "logging, integration with a number of third-party authentication systems, " "and limited built-in web browsing of repositories." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:45 msgid "" "In the other corner is <command>svnserve</command>: a small, lightweight " "server program that speaks a custom protocol with clients. Because its " "protocol is explicitly designed for Subversion and is stateful (unlike " "HTTP), it provides significantly faster network operations—but at the " "cost of some features as well. While it can use SASL to provide a variety " "of authentication and encryption options, it has no logging or built-in web " "browsing. It is, however, extremely easy to set up and is often the best " "option for small teams just starting out with Subversion." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:56 msgid "" "A third option is to use <command>svnserve</command> tunneled over an SSH " "connection. Even though this scenario still uses <command>svnserve</" "command>, it differs quite a bit in features from a traditional " "<command>svnserve</command> deployment. SSH is used to encrypt all " "communication. SSH is also used exclusively to authenticate, so real system " "accounts are required on the server host (unlike vanilla <command>svnserve</" "command>, which has its own private user accounts). Finally, because this " "setup requires that each user spawn a private, temporary <command>svnserve</" "command> process, it's equivalent (from a permissions point of view) to " "allowing a group of local users to all access the repository via " "<literal>file://</literal> URLs. Path-based access control has no meaning, " "since each user is accessing the repository database files directly." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:72 msgid "" "<xref linkend=\"svn.serverconfig.overview.tbl-1\"/> provides a quick summary " "of the three typical server deployments." msgstr "" # type: Content of: <chapter><sect1><table><title> #: ../en/book/ch06-server-configuration.xml:76 msgid "Comparison of subversion server options" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:81 #, fuzzy #| msgid "mod_dav_svn" msgid "Apache + mod_dav_svn" msgstr "mod_dav_svn" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:83 #: ../en/book/ch06-server-configuration.xml:244 #, fuzzy #| msgid "svnserve" msgid "svnserve over SSH" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:88 #, fuzzy #| msgid "Authenticating As a Different User" msgid "Authentication options" msgstr "Authentifizierung als ein anderer Anwender" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:89 msgid "" "HTTP(S) basic auth, X.509 certificates, LDAP, NTLM, or any other mechanism " "available to Apache httpd" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:91 msgid "" "CRAM-MD5 by default; LDAP, NTLM, or any other mechanism available to SASL" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:93 msgid "SSH" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:97 msgid "User account options" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:98 msgid "" "Private 'users' file, or other mechanisms available to Apache httpd (LDAP, " "SQL, etc.)" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:100 msgid "" "Private 'users' file, or other mechanisms available to SASL (LDAP, SQL, etc.)" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:102 msgid "System accounts" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:106 msgid "Authorization options" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:107 #: ../en/book/ch06-server-configuration.xml:109 msgid "" "Read/write access can be granted over the whole repository, or specified per " "path" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:111 msgid "Read/write access only grantable over the whole repository" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:116 msgid "Encryption" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:117 msgid "Available via optional SSL" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:118 msgid "Available via optional SASL features" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:119 msgid "Inherent in SSH connection" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:123 msgid "Logging" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:124 msgid "" "Full Apache logs of each HTTP request, with optional <quote>high-level</" "quote> logging of general client operations" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:127 #: ../en/book/ch06-server-configuration.xml:128 msgid "No logging" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:132 msgid "Interoperability" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:133 msgid "Accessible by other WebDAV clients" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:134 #: ../en/book/ch06-server-configuration.xml:135 msgid "Talks only to svn clients" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:139 msgid "Web viewing" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:140 msgid "Limited built-in support, or via third-party tools such as ViewVC" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:142 #: ../en/book/ch06-server-configuration.xml:143 msgid "Only via third-party tools such as ViewVC" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:147 msgid "Master-slave server replication" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:148 msgid "Transparent write-proxying available from slave to master" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:149 #: ../en/book/ch06-server-configuration.xml:150 msgid "Can only create read-only slave servers" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:155 msgid "Speed" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:156 msgid "Somewhat slower" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:157 #: ../en/book/ch06-server-configuration.xml:158 msgid "Somewhat faster" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:162 #: ../en/book/ch06-server-configuration.xml:1261 #, fuzzy #| msgid "Initial Checkout" msgid "Initial setup" msgstr "Anfänglicher Checkout" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:163 msgid "Somewhat complex" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:164 msgid "Extremely simple" msgstr "" # type: Content of: <chapter><sect1><table><tgroup><tbody><row><entry> #: ../en/book/ch06-server-configuration.xml:165 msgid "Moderately simple" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:176 msgid "Choosing a Server Configuration" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:178 msgid "So, which server should you use? Which is best?" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:180 msgid "" "Obviously, there's no right answer to that question. Every team has " "different needs, and the different servers all represent different sets of " "trade-offs. The Subversion project itself doesn't endorse one server or " "another, or consider either server more <quote>official</quote> than another." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:186 msgid "" "Here are some reasons why you might choose one deployment over another, as " "well as reasons you might <emphasis>not</emphasis> choose one." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:192 msgid "The svnserve Server" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:196 #: ../en/book/ch06-server-configuration.xml:248 #: ../en/book/ch06-server-configuration.xml:296 msgid "Why you might want to use it:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:200 msgid "Quick and easy to set up." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:203 msgid "Network protocol is stateful and noticeably faster than WebDAV." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:206 msgid "No need to create system accounts on server." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:209 msgid "Password is not passed over the network." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:217 #: ../en/book/ch06-server-configuration.xml:266 #: ../en/book/ch06-server-configuration.xml:328 msgid "Why you might want to avoid it:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:221 msgid "" "By default, only one authentication method is available, the network " "protocol is not encrypted, and the server stores clear text passwords. (All " "these things can be changed by configuring SASL, but it's a bit more work to " "do.)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:227 msgid "No logging of any kind, not even errors." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:230 msgid "" "No built-in web browsing. (You'd have to install a separate web server and " "repository browsing software to add this.)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:252 msgid "The network protocol is stateful and noticeably faster than WebDAV." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:255 msgid "" "You can take advantage of existing SSH accounts and user infrastructure." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:258 msgid "All network traffic is encrypted." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:270 msgid "Only one choice of authentication method is available." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:273 msgid "There is no logging of any kind, not even errors." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:276 msgid "" "It requires users to be in the same system group, or use a shared SSH key." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:279 msgid "If used improperly, it can lead to file permission problems." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:292 msgid "The Apache HTTP Server" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:300 msgid "" "It allows Subversion to use any of the numerous authentication systems " "already integrated with Apache." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:304 msgid "There is no need to create system accounts on the server." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:307 msgid "Full Apache logging is available." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:309 msgid "Network traffic can be encrypted via SSL." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:312 msgid "HTTP(S) can usually go through corporate firewalls." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:315 msgid "Built-in repository browsing is available via web browser." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:318 msgid "" "The repository can be mounted as a network drive for transparent version " "control (see <xref linkend=\"svn.webdav.autoversioning\"/>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:332 msgid "" "Noticeably slower than <command>svnserve</command>, because HTTP is a " "stateless protocol and requires more network turnarounds." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:337 msgid "Initial setup can be complex." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:349 msgid "Recommendations" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:351 msgid "" "In general, the authors of this book recommend a vanilla <command>svnserve</" "command> installation for small teams just trying to get started with a " "Subversion server; it's the simplest to set up and has the fewest " "maintenance issues. You can always switch to a more complex server " "deployment as your needs change." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:358 msgid "" "Here are some general recommendations and tips, based on years of supporting " "users:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:363 msgid "" "If you're trying to set up the simplest possible server for your group, a " "vanilla <command>svnserve</command> installation is the easiest, fastest " "route. Note, however, that your repository data will be transmitted in the " "clear over the network. If your deployment is entirely within your " "company's LAN or VPN, this isn't an issue. If the repository is exposed to " "the wide-open Internet, you might want to make sure that either the " "repository's contents aren't sensitive (e.g., it contains only open source " "code), or that you go the extra mile in configuring SASL to encrypt network " "communications." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:378 msgid "" "If you need to integrate with existing legacy identity systems (LDAP, Active " "Directory, NTLM, X.509, etc.), you must use either the Apache-based server " "or <command>svnserve</command> configured with SASL. If you absolutely need " "server-side logs of either server errors or client activities, an Apache-" "based server is your only option." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:388 msgid "" "If you've decided to use either Apache or stock <command>svnserve</command>, " "create a single <command>svn</command> user on your system and run the " "server process as that user. Be sure to make the repository directory " "wholly owned by the <command>svn</command> user as well. From a security " "point of view, this keeps the repository data nicely siloed and protected by " "operating system filesystem permissions, changeable by only the Subversion " "server process itself." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:400 msgid "" "If you have an existing infrastructure that is heavily based on SSH " "accounts, and if your users already have system accounts on your server " "machine, it makes sense to deploy an <command>svnserve</command>-over-SSH " "solution. Otherwise, we don't widely recommend this option to the public. " "It's generally considered safer to have your users access the repository via " "(imaginary) accounts managed by <command>svnserve</command> or Apache, " "rather than by full-blown system accounts. If your deep desire for " "encrypted communication still draws you to this option, we recommend using " "Apache with SSL or <command>svnserve</command> with SASL encryption instead." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:415 msgid "" "Do <emphasis>not</emphasis> be seduced by the simple idea of having all of " "your users access a repository directly via <literal>file://</literal> " "URLs. Even if the repository is readily available to everyone via a network " "share, this is a bad idea. It removes any layers of protection between the " "users and the repository: users can accidentally (or intentionally) corrupt " "the repository database, it becomes hard to take the repository offline for " "inspection or upgrade, and it can lead to a mess of file permission problems " "(see <xref linkend=\"svn.serverconfig.multimethod\"/>). Note that this is " "also one of the reasons we warn against accessing repositories via " "<literal>svn+ssh://</literal> URLs—from a security standpoint, it's " "effectively the same as local users accessing via <literal>file://</" "literal>, and it can entail all the same problems if the administrator isn't " "careful." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:443 msgid "svnserve, a Custom Server" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:445 msgid "" "The <command>svnserve</command> program is a lightweight server, capable of " "speaking to clients over TCP/IP using a custom, stateful protocol. Clients " "contact an <command>svnserve</command> server by using URLs that begin with " "the <literal>svn://</literal> or <literal>svn+ssh://</literal> scheme. This " "section will explain the different ways of running <command>svnserve</" "command>, how clients authenticate themselves to the server, and how to " "configure appropriate access control to your repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:457 msgid "Invoking the Server" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:459 #, fuzzy #| msgid "This is a perfect opportunity to use <command>svn revert</command>:" msgid "" "There are a few different ways to run the <command>svnserve</command> " "program:" msgstr "" "Dies ist die perfekte Gelegenheit, <command>svn revert</command> zu benutzen:" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:463 msgid "" "Run <command>svnserve</command> as a standalone daemon, listening for " "requests." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:466 msgid "" "Have the Unix <command>inetd</command> daemon temporarily spawn " "<command>svnserve</command> whenever a request comes in on a certain port." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:469 msgid "" "Have SSH invoke a temporary <command>svnserve</command> over an encrypted " "tunnel." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:472 msgid "Run <command>svnserve</command> as a Microsoft Windows service." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:478 #, fuzzy #| msgid "svnserve" msgid "svnserve as daemon" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:480 msgid "" "The easiest option is to run <command>svnserve</command> as a standalone " "<quote>daemon</quote> process. Use the <option>-d</option> option for this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:484 #, no-wrap msgid "" "\n" "$ svnserve -d\n" "$ # svnserve is now running, listening on port 3690\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:489 msgid "" "When running <command>svnserve</command> in daemon mode, you can use the " "<option>--listen-port=</option> and <option>--listen-host=</option> options " "to customize the exact port and hostname to <quote>bind</quote> to." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:494 msgid "" "Once we successfully start <command>svnserve</command> as explained " "previously, it makes every repository on your system available to the " "network. A client needs to specify an <emphasis>absolute</emphasis> path in " "the repository URL. For example, if a repository is located at <filename>/" "var/svn/project1</filename>, a client would reach it via" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:501 msgid "" ". To increase security, you can pass the <option>-r</option> option to " "<command>svnserve</command>, which restricts it to exporting only " "repositories below that path. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:507 #, no-wrap msgid "" "\n" "$ svnserve -d -r /var/svn\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:512 msgid "" "Using the <option>-r</option> option effectively modifies the location that " "the program treats as the root of the remote filesystem space. Clients then " "use URLs that have that path portion removed from them, leaving much shorter " "(and much less revealing) URLs:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:518 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.example.com:9834/repos\n" #| "…\n" msgid "" "\n" "$ svn checkout svn://host.example.com/project1\n" "…\n" msgstr "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch06-server-configuration.xml:527 #, fuzzy #| msgid "svnserve" msgid "svnserve via inetd" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:529 msgid "" "If you want <command>inetd</command> to launch the process, you need to pass " "the <option>-i</option> (<option>--inetd</option>) option. In the following " "example, we've shown the output from running <literal>svnserve -i</literal> " "at the command line, but note that this isn't how you actually start the " "daemon; see the paragraphs following the example for how to configure " "<command>inetd</command> to start <command>svnserve</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:539 #, no-wrap msgid "" "\n" "$ svnserve -i\n" "( success ( 1 2 ( ANONYMOUS ) ( edit-pipeline ) ) )\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:544 msgid "" "When invoked with the <option>--inetd</option> option, <command>svnserve</" "command> attempts to speak with a Subversion client via <filename>stdin</" "filename> and <filename>stdout</filename> using a custom protocol. This is " "the standard behavior for a program being run via <command>inetd</command>. " "The IANA has reserved port 3690 for the Subversion protocol, so on a Unix-" "like system you can add lines to <filename>/etc/services</filename> such as " "these (if they don't already exist):" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:554 #, no-wrap msgid "" "\n" "svn 3690/tcp # Subversion\n" "svn 3690/udp # Subversion\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:559 msgid "" "If your system is using a classic Unix-like <command>inetd</command> daemon, " "you can add this line to <filename>/etc/inetd.conf</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:563 #, no-wrap msgid "" "\n" "svn stream tcp nowait svnowner /usr/bin/svnserve svnserve -i\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:567 msgid "" "Make sure <quote>svnowner</quote> is a user that has appropriate permissions " "to access your repositories. Now, when a client connection comes into your " "server on port 3690, <command>inetd</command> will spawn an " "<command>svnserve</command> process to service it. Of course, you may also " "want to add <option>-r</option> to the configuration line as well, to " "restrict which repositories are exported." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:580 msgid "svnserve over a tunnel" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:582 msgid "" "A third way to invoke <command>svnserve</command> is in tunnel mode, using " "the <option>-t</option> option. This mode assumes that a remote-service " "program such as <command>rsh</command> or <command>ssh</command> has " "successfully authenticated a user and is now invoking a private " "<command>svnserve</command> process <emphasis>as that user</emphasis>. " "(Note that you, the user, will rarely, if ever, have reason to invoke " "<command>svnserve</command> with the <option>-t</option> at the command " "line; instead, the SSH daemon does so for you.) The <command>svnserve</" "command> program behaves normally (communicating via <filename>stdin</" "filename> and <filename>stdout</filename>) and assumes that the traffic is " "being automatically redirected over some sort of tunnel back to the client. " "When <command>svnserve</command> is invoked by a tunnel agent like this, be " "sure that the authenticated user has full read and write access to the " "repository database files. It's essentially the same as a local user " "accessing the repository via <literal>file://</literal> URLs." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:603 msgid "" "This option is described in much more detail later in this chapter in <xref " "linkend=\"svn.serverconfig.svnserve.sshauth\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:611 msgid "svnserve as Windows service" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:613 msgid "" "If your Windows system is a descendant of Windows NT (2000, 2003, XP, or " "Vista), you can run <command>svnserve</command> as a standard Windows " "service. This is typically a much nicer experience than running it as a " "standalone daemon with the <option>--daemon (-d)</option> option. Using " "daemon mode requires launching a console, typing a command, and then leaving " "the console window running indefinitely. A Windows service, however, runs " "in the background, can start at boot time automatically, and can be started " "and stopped using the same consistent administration interface as other " "Windows services." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:626 msgid "" "You'll need to define the new service using the command-line tool " "<command>SC.EXE</command>. Much like the <command>inetd</command> " "configuration line, you must specify an exact invocation of " "<command>svnserve</command> for Windows to run at startup time:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:632 #, no-wrap msgid "" "\n" "C:\\> sc create svn\n" " binpath= \"C:\\svn\\bin\\svnserve.exe --service -r C:\\repos\"\n" " displayname= \"Subversion Server\"\n" " depend= Tcpip\n" " start= auto\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:640 msgid "" "This defines a new Windows service named <quote>svn,</quote> which executes " "a particular <command>svnserve.exe</command> command when started (in this " "case, rooted at <filename>C:\\repos</filename>). There are a number of " "caveats in the prior example, however." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:647 msgid "" "First, notice that the <command>svnserve.exe</command> program must always " "be invoked with the <option>--service</option> option. Any other options to " "<command>svnserve</command> must then be specified on the same line, but you " "cannot add conflicting options such as <option>--daemon (-d)</option>, " "<option>--tunnel</option>, or <option>--inetd (-i)</option>. Options such " "as <option>-r</option> or <option>--listen-port</option> are fine, though. " "Second, be careful about spaces when invoking the <command>SC.EXE</command> " "command: the <literal>key= value</literal> patterns must have no spaces " "between <literal>key=</literal> and must have exactly one space before the " "<literal>value</literal>. Lastly, be careful about spaces in your command " "line to be invoked. If a directory name contains spaces (or other " "characters that need escaping), place the entire inner value of " "<literal>binpath</literal> in double quotes, by escaping them:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:666 #, no-wrap msgid "" "\n" "C:\\> sc create svn\n" " binpath= \"\\\"C:\\program files\\svn\\bin\\svnserve.exe\\\" --service -r C:\\repos\"\n" " displayname= \"Subversion Server\"\n" " depend= Tcpip\n" " start= auto\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:674 msgid "" "Also note that the word <literal>binpath</literal> is misleading—its " "value is a <emphasis>command line</emphasis>, not the path to an " "executable. That's why you need to surround it with quotes if it contains " "embedded spaces." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:680 msgid "" "Once the service is defined, it can be stopped, started, or queried using " "standard GUI tools (the Services administrative control panel), or at the " "command line:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:685 #, no-wrap msgid "" "\n" "C:\\> net stop svn\n" "C:\\> net start svn\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:690 msgid "" "The service can also be uninstalled (i.e., undefined) by deleting its " "definition: <userinput>sc delete svn</userinput>. Just be sure to stop the " "service first! The <command>SC.EXE</command> program has many other " "subcommands and options; run <userinput>sc /?</userinput> to learn more " "about it." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:703 msgid "Built-in Authentication and Authorization" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:705 msgid "" "When a client connects to an <command>svnserve</command> process, the " "following things happen:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:709 msgid "The client selects a specific repository." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:712 msgid "" "The server processes the repository's <filename>conf/svnserve.conf</" "filename> file and begins to enforce any authentication and authorization " "policies it describes." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:717 msgid "Depending on the defined policies, one of the following may occur:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:721 msgid "" "The client may be allowed to make requests anonymously, without ever " "receiving an authentication challenge." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:725 msgid "The client may be challenged for authentication at any time." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:728 msgid "" "If operating in tunnel mode, the client will declare itself to be already " "externally authenticated (typically by SSH)." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch06-server-configuration.xml:736 msgid "" "The <command>svnserve</command> server, by default, knows only how to send a " "CRAM-MD5 <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:739 msgid "See RFC 2195." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:740 msgid "" "</footnote> authentication challenge. In essence, the server sends a small " "amount of data to the client. The client uses the MD5 hash algorithm to " "create a fingerprint of the data and password combined, and then sends the " "fingerprint as a response. The server performs the same computation with " "the stored password to verify that the result is identical. <emphasis>At no " "point does the actual password travel over the network.</emphasis>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:750 msgid "" "If your <command>svnserve</command> server was built with SASL support, it " "not only knows how to send CRAM-MD5 challenges, but also likely knows a " "whole host of other authentication mechanisms. See <xref linkend=\"svn." "serverconfig.svnserve.sasl\"/> later in this chapter to learn how to " "configure SASL authentication and encryption." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:758 msgid "" "It's also possible, of course, for the client to be externally authenticated " "via a tunnel agent, such as <command>ssh</command>. In that case, the " "server simply examines the user it's running as, and uses this name as the " "authenticated username. For more on this, see the later section, <xref " "linkend=\"svn.serverconfig.svnserve.sshauth\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:766 msgid "" "As you've already guessed, a repository's <filename>svnserve.conf</filename> " "file is the central mechanism for controlling authentication and " "authorization policies. The file has the same format as other configuration " "files (see <xref linkend=\"svn.advanced.confarea\"/>): section names are " "marked by square brackets (<literal>[</literal> and <literal>]</literal>), " "comments begin with hashes (<literal>#</literal>), and each section contains " "specific variables that can be set (<literal>variable = value</literal>). " "Let's walk through these files and learn how to use them." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:780 msgid "Create a users file and realm" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:782 msgid "" "For now, the <literal>[general]</literal> section of <filename>svnserve." "conf</filename> has all the variables you need. Begin by changing the " "values of those variables: choose a name for a file that will contain your " "usernames and passwords and choose an authentication realm:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:788 #, no-wrap msgid "" "\n" "[general]\n" "password-db = userfile\n" "realm = example realm\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:794 msgid "" "The <literal>realm</literal> is a name that you define. It tells clients " "which sort of <quote>authentication namespace</quote> they're connecting to; " "the Subversion client displays it in the authentication prompt and uses it " "as a key (along with the server's hostname and port) for caching credentials " "on disk (see <xref linkend=\"svn.serverconfig.netmodel.credcache\"/>). The " "<literal>password-db</literal> variable points to a separate file that " "contains a list of usernames and passwords, using the same familiar format. " "For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:805 #, no-wrap msgid "" "\n" "[users]\n" "harry = foopassword\n" "sally = barpassword\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:811 msgid "" "The value of <literal>password-db</literal> can be an absolute or relative " "path to the users file. For many admins, it's easy to keep the file right " "in the <filename>conf/</filename> area of the repository, alongside " "<filename>svnserve.conf</filename>. On the other hand, it's possible you " "may want to have two or more repositories share the same users file; in that " "case, the file should probably live in a more public place. The " "repositories sharing the users file should also be configured to have the " "same realm, since the list of users essentially defines an authentication " "realm. Wherever the file lives, be sure to set the file's read and write " "permissions appropriately. If you know which user(s) <command>svnserve</" "command> will run as, restrict read access to the users file as necessary." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:830 msgid "Set access controls" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:832 msgid "" "There are two more variables to set in the <filename>svnserve.conf</" "filename> file: they determine what unauthenticated (anonymous) and " "authenticated users are allowed to do. The variables <literal>anon-access</" "literal> and <literal>auth-access</literal> can be set to the value " "<literal>none</literal>, <literal>read</literal>, or <literal>write</" "literal>. Setting the value to <literal>none</literal> prohibits both " "reading and writing; <literal>read</literal> allows read-only access to the " "repository, and <literal>write</literal> allows complete read/write access " "to the repository. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:844 #, no-wrap msgid "" "\n" "[general]\n" "password-db = userfile\n" "realm = example realm\n" "\n" "# anonymous users can only read the repository\n" "anon-access = read\n" "\n" "# authenticated users can both read and write\n" "auth-access = write\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:856 msgid "" "The example settings are, in fact, the default values of the variables, " "should you forget to define them. If you want to be even more conservative, " "you can block anonymous access completely:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:861 #, no-wrap msgid "" "\n" "[general]\n" "password-db = userfile\n" "realm = example realm\n" "\n" "# anonymous users aren't allowed\n" "anon-access = none\n" "\n" "# authenticated users can both read and write\n" "auth-access = write\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:873 msgid "" "The server process understands not only these <quote>blanket</quote> access " "controls to the repository, but also finer-grained access restrictions " "placed on specific files and directories within the repository. To make use " "of this feature, you need to define a file containing more detailed rules, " "and then set the <literal>authz-db</literal> variable to point to it:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:881 #, no-wrap msgid "" "\n" "[general]\n" "password-db = userfile\n" "realm = example realm\n" "\n" "# Specific access rules for specific locations\n" "authz-db = authzfile\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:890 msgid "" "We discuss the syntax of the <filename>authzfile</filename> file in detail " "later in this chapter, in <xref linkend=\"svn.serverconfig.pathbasedauthz\"/" ">. Note that the <literal>authz-db</literal> variable isn't mutually " "exclusive with the <literal>anon-access</literal> and <literal>auth-access</" "literal> variables; if all the variables are defined at once, <emphasis>all</" "emphasis> of the rules must be satisfied before access is allowed." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:904 #, fuzzy #| msgid "<command>svn revert</command>" msgid "Using <command>svnserve</command> with SASL" msgstr "<command>svn revert</command>" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:906 msgid "" "For many teams, the built-in CRAM-MD5 authentication is all they need from " "<command>svnserve</command>. However, if your server (and your Subversion " "clients) were built with the Cyrus Simple Authentication and Security Layer " "(SASL) library, you have a number of authentication and encryption options " "available to you." msgstr "" # type: Content of: <preface><sect1><title> #: ../en/book/ch06-server-configuration.xml:914 #, fuzzy #| msgid "What Is Subversion?" msgid "What Is SASL?" msgstr "Was ist Subversion?" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch06-server-configuration.xml:915 msgid "" "The Cyrus Simple Authentication and Security Layer is open source software " "written by Carnegie Mellon University. It adds generic authentication and " "encryption capabilities to any network protocol, and as of Subversion 1.5 " "and later, both the <command>svnserve</command> server and <command>svn</" "command> client know how to make use of this library. It may or may not be " "available to you: if you're building Subversion yourself, you'll need to " "have at least version 2.1 of SASL installed on your system, and you'll need " "to make sure that it's detected during Subversion's build process. If " "you're using a prebuilt Subversion binary package, you'll have to check with " "the package maintainer as to whether SASL support was compiled in. SASL " "comes with a number of pluggable modules that represent different " "authentication systems: Kerberos (GSSAPI), NTLM, One-Time-Passwords (OTP), " "DIGEST-MD5, LDAP, Secure-Remote-Password (SRP), and others. Certain " "mechanisms may or may not be available to you; be sure to check which " "modules are provided." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch06-server-configuration.xml:935 msgid "" "You can download Cyrus SASL (both code and documentation) from <ulink url=" "\"http://asg.web.cmu.edu/sasl/sasl-library.html\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:940 msgid "" "Normally, when a subversion client connects to <command>svnserve</command>, " "the server sends a greeting that advertises a list of the capabilities it " "supports, and the client responds with a similar list of capabilities. If " "the server is configured to require authentication, it then sends a " "challenge that lists the authentication mechanisms available; the client " "responds by choosing one of the mechanisms, and then authentication is " "carried out in some number of round-trip messages. Even when SASL " "capabilities aren't present, the client and server inherently know how to " "use the CRAM-MD5 and ANONYMOUS mechanisms (see <xref linkend=\"svn." "serverconfig.svnserve.auth\"/>). If server and client were linked against " "SASL, a number of other authentication mechanisms may also be available. " "However, you'll need to explicitly configure SASL on the server side to " "advertise them." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:958 #, fuzzy #| msgid "Authenticating As a Different User" msgid "Authenticating with SASL" msgstr "Authentifizierung als ein anderer Anwender" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:960 msgid "" "To activate specific SASL mechanisms on the server, you'll need to do two " "things. First, create a <literal>[sasl]</literal> section in your " "repository's <filename>svnserve.conf</filename> file with an initial key-" "value pair:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><programlisting> #: ../en/book/ch06-server-configuration.xml:966 #, no-wrap msgid "" "\n" " [sasl]\n" " use-sasl = true\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:971 msgid "" "Second, create a main SASL configuration file called <filename>svn.conf</" "filename> in a place where the SASL library can find it—typically in " "the directory where SASL plug-ins are located. You'll have to locate the " "plug-in directory on your particular system, such as <filename>/usr/lib/" "sasl2/</filename> or <filename>/etc/sasl2/</filename>. (Note that this is " "<emphasis>not</emphasis> the <filename>svnserve.conf</filename> file that " "lives within a repository!)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:982 msgid "" "On a Windows server, you'll also have to edit the system registry (using a " "tool such as <command>regedit</command>) to tell SASL where to find " "things. Create a registry key named <literal>[HKEY_LOCAL_MACHINE\\SOFTWARE" "\\Carnegie Mellon\\Project Cyrus\\SASL Library]</literal>, and place two " "keys inside it: a key called <literal>SearchPath</literal> (whose value is a " "path to the directory containing the SASL <filename>sasl*.dll</filename> " "plug-in libraries), and a key called <literal>ConfFile</literal> (whose " "value is a path to the parent directory containing the <filename>svn.conf</" "filename> file you created)." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:995 msgid "" "Because SASL provides so many different kinds of authentication mechanisms, " "it would be foolish (and far beyond the scope of this book) to try to " "describe every possible server-side configuration. Instead, we recommend " "that you read the documentation supplied in the <filename>doc/</filename> " "subdirectory of the SASL source code. It goes into great detail about every " "mechanism and how to configure the server appropriately for each. For the " "purposes of this discussion, we'll just demonstrate a simple example of " "configuring the DIGEST-MD5 mechanism. For example, if your " "<filename>subversion.conf</filename> (or <filename>svn.conf</filename>) file " "contains the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1009 #, no-wrap msgid "" "\n" "pwcheck_method: auxprop\n" "auxprop_plugin: sasldb\n" "sasldb_path: /etc/my_sasldb\n" "mech_list: DIGEST-MD5\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1016 msgid "" "you've told SASL to advertise the DIGEST-MD5 mechanism to clients and to " "check user passwords against a private password database located at " "<filename>/etc/my_sasldb</filename>. A system administrator can then use " "the <command>saslpasswd2</command> program to add or modify usernames and " "passwords in the database:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1024 #, no-wrap msgid "" "\n" "$ saslpasswd2 -c -f /etc/my_sasldb -u realm username\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1028 msgid "" "A few words of warning: first, make sure the <quote>realm</quote> argument " "to <command>saslpasswd2</command> matches the same realm you've defined in " "your repository's <filename>svnserve.conf</filename> file; if they don't " "match, authentication will fail. Also, due to a shortcoming in SASL, the " "common realm must be a string with no space characters. Finally, if you " "decide to go with the standard SASL password database, make sure the " "<command>svnserve</command> program has read access to the file (and " "possibly write access as well, if you're using a mechanism such as OTP)." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1041 msgid "" "This is just one simple way of configuring SASL. Many other authentication " "mechanisms are available, and passwords can be stored in other places such " "as in LDAP or a SQL database. Consult the full SASL documentation for " "details." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1047 msgid "" "Remember that if you configure your server to only allow certain SASL " "authentication mechanisms, this forces all connecting clients to have SASL " "support as well. Any Subversion client built without SASL support (which " "includes all pre-1.5 clients) will be unable to authenticate. On the one " "hand, this sort of restriction may be exactly what you want (<quote>My " "clients must all use Kerberos!</quote>). However, if you still want non-" "SASL clients to be able to authenticate, be sure to advertise the CRAM-MD5 " "mechanism as an option. All clients are able to use CRAM-MD5, whether they " "have SASL capabilities or not." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:1062 msgid "SASL encryption" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1064 msgid "" "SASL is also able to perform data encryption if a particular mechanism " "supports it. The built-in CRAM-MD5 mechanism doesn't support encryption, " "but DIGEST-MD5 does, and mechanisms such as SRP actually require use of the " "OpenSSL library. To enable or disable different levels of encryption, you " "can set two values in your repository's <filename>svnserve.conf</filename> " "file:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1072 #, no-wrap msgid "" "\n" "[sasl]\n" "use-sasl = true\n" "min-encryption = 128\n" "max-encryption = 256\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1079 msgid "" "The <literal>min-encryption</literal> and <literal>max-encryption</literal> " "variables control the level of encryption demanded by the server. To " "disable encryption completely, set both values to 0. To enable simple " "checksumming of data (i.e., prevent tampering and guarantee data integrity " "without encryption), set both values to 1. If you wish to allow—but " "not require—encryption, set the minimum value to 0, and the maximum " "value to some bit length. To require encryption unconditionally, set both " "values to numbers greater than 1. In our previous example, we require " "clients to do at least 128-bit encryption, but no more than 256-bit " "encryption." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1099 msgid "Tunneling over SSH" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1101 msgid "" "<command>svnserve</command>'s built-in authentication (and SASL support) can " "be very handy, because it avoids the need to create real system accounts. " "On the other hand, some administrators already have well-established SSH " "authentication frameworks in place. In these situations, all of the " "project's users already have system accounts and the ability to <quote>SSH " "into</quote> the server machine." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1109 msgid "" "It's easy to use SSH in conjunction with <command>svnserve</command>. The " "client simply uses the <literal>svn+ssh://</literal> URL scheme to connect:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1113 #, no-wrap msgid "" "\n" "$ whoami\n" "harry\n" "\n" "$ svn list svn+ssh://host.example.com/repos/project\n" "harry@host.example.com's password: *****\n" "\n" "foo\n" "bar\n" "baz\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1126 msgid "" "In this example, the Subversion client is invoking a local <command>ssh</" "command> process, connecting to <literal>host.example.com</literal>, " "authenticating as the user <literal>harry</literal>, then spawning a private " "<command>svnserve</command> process on the remote machine running as the " "user <literal>harry</literal>. The <command>svnserve</command> command is " "being invoked in tunnel mode (<option>-t</option>), and its network protocol " "is being <quote>tunneled</quote> over the encrypted connection by " "<command>ssh</command>, the tunnel agent. <command>svnserve</command> is " "aware that it's running as the user <literal>harry</literal>, and if the " "client performs a commit, the authenticated username will be used as the " "author of the new revision." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1141 msgid "" "The important thing to understand here is that the Subversion client is " "<emphasis>not</emphasis> connecting to a running <command>svnserve</command> " "daemon. This method of access doesn't require a daemon, nor does it notice " "one if present. It relies wholly on the ability of <command>ssh</command> " "to spawn a temporary <command>svnserve</command> process, which then " "terminates when the network connection is closed." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1150 msgid "" "When using <literal>svn+ssh://</literal> URLs to access a repository, " "remember that it's the <command>ssh</command> program prompting for " "authentication, and <emphasis>not</emphasis> the <command>svn</command> " "client program. That means there's no automatic password-caching going on " "(see <xref linkend=\"svn.serverconfig.netmodel.credcache\"/>). The " "Subversion client often makes multiple connections to the repository, though " "users don't normally notice this due to the password caching feature. When " "using <literal>svn+ssh://</literal> URLs, however, users may be annoyed by " "<command>ssh</command> repeatedly asking for a password for every outbound " "connection. The solution is to use a separate SSH password-caching tool " "such as <command>ssh-agent</command> on a Unix-like system, or " "<command>pageant</command> on Windows." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch06-server-configuration.xml:1166 msgid "" "When running over a tunnel, authorization is primarily controlled by " "operating system permissions to the repository's database files; it's very " "much the same as if Harry were accessing the repository directly via a " "<literal>file://</literal> URL. If multiple system users are going to be " "accessing the repository directly, you may want to place them into a common " "group, and you'll need to be careful about umasks (be sure to read <xref " "linkend=\"svn.serverconfig.multimethod\"/> later in this chapter). But even " "in the case of tunneling, you can still use the <filename>svnserve.conf</" "filename> file to block access, by simply setting <literal>auth-access = " "read</literal> or <literal>auth-access = none</literal>. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:1180 msgid "" "Note that using any sort of <command>svnserve</command>-enforced access " "control at all is a bit pointless; the user already has direct access to the " "repository database." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch06-server-configuration.xml:1187 msgid "" "You'd think that the story of SSH tunneling would end here, but it doesn't. " "Subversion allows you to create custom tunnel behaviors in your runtime " "<filename>config</filename> file (see <xref linkend=\"svn.advanced.confarea" "\"/>.) For example, suppose you want to use RSH instead of SSH. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:1193 msgid "" "We don't actually recommend this, since RSH is notably less secure than SSH." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1195 msgid "" "</footnote> In the <literal>[tunnels]</literal> section of your " "<filename>config</filename> file, simply define it like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1200 #, no-wrap msgid "" "\n" "[tunnels]\n" "rsh = rsh\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1205 msgid "" "And now, you can use this new tunnel definition by using a URL scheme that " "matches the name of your new variable: <literal>svn+rsh://host/path</" "literal>. When using the new URL scheme, the Subversion client will " "actually be running the command <userinput>rsh host svnserve -t</userinput> " "behind the scenes. If you include a username in the URL (e.g., <literal>svn" "+rsh://username@host/path</literal>), the client will also include that in " "its command (<userinput>rsh username@host svnserve -t</userinput>). But you " "can define new tunneling schemes to be much more clever than that:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1216 #, no-wrap msgid "" "\n" "[tunnels]\n" "joessh = $JOESSH /opt/alternate/ssh -p 29934\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1221 msgid "" "This example demonstrates a couple of things. First, it shows how to make " "the Subversion client launch a very specific tunneling binary (the one " "located at <filename>/opt/alternate/ssh</filename>) with specific options. " "In this case, accessing an <literal>svn+joessh://</literal> URL would invoke " "the particular SSH binary with <option>-p 29934</option> as arguments—" "useful if you want the tunnel program to connect to a nonstandard port." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1231 msgid "" "Second, it shows how to define a custom environment variable that can " "override the name of the tunneling program. Setting the <literal>SVN_SSH</" "literal> environment variable is a convenient way to override the default " "SSH tunnel agent. But if you need to have several different overrides for " "different servers, each perhaps contacting a different port or passing a " "different set of options to SSH, you can use the mechanism demonstrated in " "this example. Now if we were to set the <literal>JOESSH</literal> " "environment variable, its value would override the entire value of the " "tunnel variable—<command>$JOESSH</command> would be executed instead " "of <userinput>/opt/alternate/ssh -p 29934</userinput>." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1249 msgid "SSH configuration tricks" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1251 msgid "" "It's possible to control not only the way in which the client invokes " "<command>ssh</command>, but also to control the behavior of <command>sshd</" "command> on your server machine. In this section, we'll show how to control " "the exact <command>svnserve</command> command executed by <command>sshd</" "command>, as well as how to have multiple users share a single system " "account." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1263 msgid "" "To begin, locate the home directory of the account you'll be using to launch " "<command>svnserve</command>. Make sure the account has an SSH public/" "private keypair installed, and that the user can log in via public-key " "authentication. Password authentication will not work, since all of the " "following SSH tricks revolve around using the SSH <filename>authorized_keys</" "filename> file." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1271 msgid "" "If it doesn't already exist, create the <filename>authorized_keys</filename> " "file (on Unix, typically <filename>~/.ssh/authorized_keys</filename>). Each " "line in this file describes a public key that is allowed to connect. The " "lines are typically of the form:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1278 #, no-wrap msgid "" "\n" " ssh-dsa AAAABtce9euch… user@example.com\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1282 msgid "" "The first field describes the type of key, the second field is the base64-" "encoded key itself, and the third field is a comment. However, it's a " "lesser known fact that the entire line can be preceded by a " "<literal>command</literal> field:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1288 #, no-wrap msgid "" "\n" " command=\"program\" ssh-dsa AAAABtce9euch… user@example.com\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1292 msgid "" "When the <literal>command</literal> field is set, the SSH daemon will run " "the named program instead of the typical tunnel-mode <command>svnserve</" "command> invocation that the Subversion client asks for. This opens the " "door to a number of server-side tricks. In the following examples, we " "abbreviate the lines of the file as:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1299 #, no-wrap msgid "" "\n" " command=\"program\" TYPE KEY COMMENT\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:1307 msgid "Controlling the invoked command" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1309 msgid "" "Because we can specify the executed server-side command, it's easy to name a " "specific <command>svnserve</command> binary to run and to pass it extra " "arguments:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1313 #, no-wrap msgid "" "\n" " command=\"/path/to/svnserve -t -r /virtual/root\" TYPE KEY COMMENT\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1317 msgid "" "In this example, <filename>/path/to/svnserve</filename> might be a custom " "wrapper script around <command>svnserve</command> which sets the umask (see " "<xref linkend=\"svn.serverconfig.multimethod\"/>.) It also shows how to " "anchor <command>svnserve</command> in a virtual root directory, just as one " "often does when running <command>svnserve</command> as a daemon process. " "This might be done either to restrict access to parts of the system, or " "simply to relieve the user of having to type an absolute path in the " "<literal>svn+ssh://</literal> URL." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1329 msgid "" "It's also possible to have multiple users share a single account. Instead " "of creating a separate system account for each user, generate a public/" "private key pair for each person. Then place each public key into the " "<filename>authorized_users</filename> file, one per line, and use the " "<option>--tunnel-user</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1337 #, no-wrap msgid "" "\n" " command=\"svnserve -t --tunnel-user=harry\" TYPE1 KEY1 harry@example.com\n" " command=\"svnserve -t --tunnel-user=sally\" TYPE2 KEY2 sally@example.com\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1342 msgid "" "This example allows both Harry and Sally to connect to the same account via " "public key authentication. Each of them has a custom command that will be " "executed; the <option>--tunnel-user</option> option tells <command>svnserve</" "command> to assume that the named argument is the authenticated user. " "Without <option>--tunnel-user</option>, it would appear as though all " "commits were coming from the one shared system account." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1352 msgid "" "A final word of caution: giving a user access to the server via public-key " "in a shared account might still allow other forms of SSH access, even if " "you've set the <literal>command</literal> value in " "<filename>authorized_keys</filename>. For example, the user may still get " "shell access through SSH or be able to perform X11 or general port " "forwarding through your server. To give the user as little permission as " "possible, you may want to specify a number of restrictive options " "immediately after the <literal>command</literal>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1363 #, no-wrap msgid "" "\n" " command=\"svnserve -t --tunnel-user=harry\",no-port-forwarding,no-agent-forw\n" "arding,no-X11-forwarding,no-pty TYPE1 KEY1 harry@example.com\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1368 msgid "" "Note that this all must be on one line—truly on one line—since " "SSH <filename>authorized_keys</filename> files do not even allow the " "conventional backslash character (<literal>\\</literal>) for line " "continuation. The only reason we've formatted it with a line break is to " "fit it on the physical page of a book." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:1387 msgid "httpd, the Apache HTTP Server" msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch06-server-configuration.xml:1389 msgid "" "The Apache HTTP Server is a <quote>heavy-duty</quote> network server that " "Subversion can leverage. Via a custom module, <command>httpd</command> " "makes Subversion repositories available to clients via the WebDAV/DeltaV " "protocol, which is an extension to HTTP 1.1 (see <ulink url=\"http://www." "webdav.org/\"/> for more information). This protocol takes the ubiquitous " "HTTP protocol that is the core of the World Wide Web, and adds writing—" "specifically, versioned writing—capabilities. The result is a " "standardized, robust system that is conveniently packaged as part of the " "Apache 2.0 software, supported by numerous operating systems and third-party " "products, and doesn't require network administrators to open up yet another " "custom port. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:1403 msgid "They really hate doing that." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:1404 msgid "" "</footnote> While an Apache-Subversion server has more features than " "<command>svnserve</command>, it's also a bit more difficult to set up. With " "flexibility often comes more complexity." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:1409 msgid "" "Much of the following discussion includes references to Apache configuration " "directives. While some examples are given of the use of these directives, " "describing them in full is outside the scope of this chapter. The Apache " "team maintains excellent documentation, publicly available on their web site " "at <ulink url=\"http://httpd.apache.org\"/>. For example, a general " "reference for the configuration directives is located at <ulink url=\" " "http://httpd.apache.org/docs-2.0/mod/directives.html\"/>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:1419 msgid "" "Also, as you make changes to your Apache setup, it is likely that somewhere " "along the way a mistake will be made. If you are not already familiar with " "Apache's logging subsystem, you should become aware of it. In your " "<filename>httpd.conf</filename> file are directives that specify the on-disk " "locations of the access and error logs generated by Apache (the " "<literal>CustomLog</literal> and <literal>ErrorLog</literal> directives, " "respectively). Subversion's <command>mod_dav_svn</command> uses Apache's " "error logging interface as well. You can always browse the contents of " "those files for information that might reveal the source of a problem that " "is not clearly noticeable otherwise." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch06-server-configuration.xml:1433 msgid "Why Apache 2?" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:1435 msgid "" "If you're a system administrator, it's very likely that you're already " "running the Apache web server and have some prior experience with it. At " "the time of this writing, Apache 1.3 is the more popular version of Apache. " "The world has been somewhat slow to upgrade to the Apache 2.x series for " "various reasons: some people fear change, especially changing something as " "critical as a web server. Other people depend on plug-in modules that work " "only against the Apache 1.3 API, and they are waiting for a 2.x port. " "Whatever the reason, many people begin to worry when they first discover " "that Subversion's Apache module is written specifically for the Apache 2 API." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:1448 msgid "" "The proper response to this problem is: don't worry about it. It's easy to " "run Apache 1.3 and Apache 2 side by side; simply install them to separate " "places and use Apache 2 as a dedicated Subversion server that runs on a port " "other than 80. Clients can access the repository by placing the port number " "into the URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1455 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn checkout http://svn.example.com:9834/repos\n" #| "…\n" msgid "" "\n" "$ svn checkout http://host.example.com:7382/repos/project\n" msgstr "" "\n" "$ svn checkout http://svn.example.com:9834/repos\n" "…\n" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1463 msgid "Prerequisites" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1465 msgid "" "To network your repository over HTTP, you basically need four components, " "available in two packages. You'll need Apache <command>httpd</command> 2.0, " "the <command>mod_dav</command> DAV module that comes with it, Subversion, " "and the <command>mod_dav_svn</command> filesystem provider module " "distributed with Subversion. Once you have all of those components, the " "process of networking your repository is as simple as:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1476 msgid "" "Getting httpd 2.0 up and running with the <command>mod_dav</command> module" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1480 msgid "" "Installing the <command>mod_dav_svn</command> backend to <command>mod_dav</" "command>, which uses Subversion's libraries to access the repository" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1485 msgid "" "Configuring your <filename>httpd.conf</filename> file to export (or expose) " "the repository" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1490 msgid "" "You can accomplish the first two items either by compiling <command>httpd</" "command> and Subversion from source code or by installing prebuilt binary " "packages of them on your system. For the most up-to-date information on how " "to compile Subversion for use with the Apache HTTP Server, as well as how to " "compile and configure Apache itself for this purpose, see the " "<filename>INSTALL</filename> file in the top level of the Subversion source " "code tree." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1503 msgid "Basic Apache Configuration" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1505 msgid "" "Once you have all the necessary components installed on your system, all " "that remains is the configuration of Apache via its <filename>httpd.conf</" "filename> file. Instruct Apache to load the <command>mod_dav_svn</command> " "module using the <literal>LoadModule</literal> directive. This directive " "must precede any other Subversion-related configuration items. If your " "Apache was installed using the default layout, your <command>mod_dav_svn</" "command> module should have been installed in the <filename>modules</" "filename> subdirectory of the Apache install location (often <filename>/usr/" "local/apache2</filename>). The <literal>LoadModule</literal> directive has " "a simple syntax, mapping a named module to the location of a shared library " "on disk:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1520 #, no-wrap msgid "" "\n" "LoadModule dav_svn_module modules/mod_dav_svn.so\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1524 msgid "" "Note that if <command>mod_dav</command> was compiled as a shared object " "(instead of statically linked directly to the <command>httpd</command> " "binary), you'll need a similar <literal>LoadModule</literal> statement for " "it, too. Be sure that it comes before the <command>mod_dav_svn</command> " "line:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1530 #, no-wrap msgid "" "\n" "LoadModule dav_module modules/mod_dav.so\n" "LoadModule dav_svn_module modules/mod_dav_svn.so\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1536 msgid "" "At a later location in your configuration file, you now need to tell Apache " "where you keep your Subversion repository (or repositories). The " "<literal>Location</literal> directive has an XML-like notation, starting " "with an opening tag and ending with a closing tag, with various other " "configuration directives in the middle. The purpose of the " "<literal>Location</literal> directive is to instruct Apache to do something " "special when handling requests that are directed at a given URL or one of " "its children. In the case of Subversion, you want Apache to simply hand off " "support for URLs that point at versioned resources to the DAV layer. You " "can instruct Apache to delegate the handling of all URLs whose path portions " "(the part of the URL that follows the server's name and the optional port " "number) begin with <filename>/repos/</filename> to a DAV provider whose " "repository is located at <filename>/var/svn/repository</filename> using the " "following <filename>httpd.conf</filename> syntax:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1555 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNPath /var/svn/repository\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1562 msgid "" "If you plan to support multiple Subversion repositories that will reside in " "the same parent directory on your local disk, you can use an alternative " "directive—<literal>SVNParentPath</literal>—to indicate that " "common parent directory. For example, if you know you will be creating " "multiple Subversion repositories in a directory <filename>/var/svn</" "filename> that would be accessed via URLs such as" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1570 msgid "," msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1571 msgid "" ", and so on, you could use the <filename>httpd.conf</filename> configuration " "syntax in the following example:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1575 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" "\n" " # any \"/svn/foo\" URL will map to a repository /var/svn/foo\n" " SVNParentPath /var/svn\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1584 msgid "" "Using the previous syntax, Apache will delegate the handling of all URLs " "whose path portions begin with <filename>/svn/</filename> to the Subversion " "DAV provider, which will then assume that any items in the directory " "specified by the <literal>SVNParentPath</literal> directive are actually " "Subversion repositories. This is a particularly convenient syntax in that, " "unlike the use of the <literal>SVNPath</literal> directive, you don't have " "to restart Apache to create and network new repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1594 msgid "" "Be sure that when you define your new <literal>Location</literal>, it " "doesn't overlap with other exported locations. For example, if your main " "<literal>DocumentRoot</literal> is exported to <filename>/www</filename>, do " "not export a Subversion repository in <literal><Location /www/repos></" "literal>. If a request comes in for the URI <filename>/www/repos/foo.c</" "filename>, Apache won't know whether to look for a file <filename>repos/foo." "c</filename> in the <literal>DocumentRoot</literal>, or whether to delegate " "<command>mod_dav_svn</command> to return <filename>foo.c</filename> from the " "Subversion repository. The result is often an error from the server of the " "form <literal>301 Moved Permanently</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch06-server-configuration.xml:1610 msgid "Server Names and the COPY Request" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch06-server-configuration.xml:1612 msgid "" "Subversion makes use of the <literal>COPY</literal> request type to perform " "server-side copies of files and directories. As part of the sanity checking " "done by the Apache modules, the source of the copy is expected to be located " "on the same machine as the destination of the copy. To satisfy this " "requirement, you might need to tell <command>mod_dav</command> the name you " "use as the hostname of your server. Generally, you can use the " "<literal>ServerName</literal> directive in <filename>httpd.conf</filename> " "to accomplish this." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch06-server-configuration.xml:1623 #, no-wrap msgid "" "\n" "ServerName svn.example.com\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch06-server-configuration.xml:1627 msgid "" "If you are using Apache's virtual hosting support via the " "<literal>NameVirtualHost</literal> directive, you may need to use the " "<literal>ServerAlias</literal> directive to specify additional names by " "which your server is known. Again, refer to the Apache documentation for " "full details." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1635 msgid "" "At this stage, you should strongly consider the question of permissions. If " "you've been running Apache for some time now as your regular web server, you " "probably already have a collection of content—web pages, scripts, and " "such. These items have already been configured with a set of permissions " "that allows them to work with Apache, or more appropriately, that allows " "Apache to work with those files. Apache, when used as a Subversion server, " "will also need the correct permissions to read and write to your Subversion " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1646 msgid "" "You will need to determine a permission system setup that satisfies " "Subversion's requirements without messing up any previously existing web " "page or script installations. This might mean changing the permissions on " "your Subversion repository to match those in use by other things that Apache " "serves for you, or it could mean using the <literal>User</literal> and " "<literal>Group</literal> directives in <filename>httpd.conf</filename> to " "specify that Apache should run as the user and group that owns your " "Subversion repository. There is no single correct way to set up your " "permissions, and each administrator will have different reasons for doing " "things a certain way. Just be aware that permission-related problems are " "perhaps the most common oversight when configuring a Subversion repository " "for use with Apache." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1666 #, fuzzy #| msgid "Authenticating As a Different User" msgid "Authentication Options" msgstr "Authentifizierung als ein anderer Anwender" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1668 msgid "" "At this point, if you configured <filename>httpd.conf</filename> to contain " "something such as the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch06-server-configuration.xml:1672 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1679 msgid "" "your repository is <quote>anonymously</quote> accessible to the world. " "Until you configure some authentication and authorization policies, the " "Subversion repositories that you make available via the <literal>Location</" "literal> directive will be generally accessible to everyone. In other words:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1688 msgid "" "Anyone can use a Subversion client to check out a working copy of a " "repository URL (or any of its subdirectories)." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1693 msgid "" "Anyone can interactively browse the repository's latest revision simply by " "pointing a web browser to the repository URL." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1698 msgid "Anyone can commit to the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:1702 msgid "" "Of course, you might have already set up a <filename>pre-commit</filename> " "hook script to prevent commits (see <xref linkend=\"svn.reposadmin.create." "hooks\"/>). But as you read on, you'll see that it's also possible to use " "Apache's built-in methods to restrict access in specific ways." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:1711 msgid "Setting up HTTP authentication" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1713 msgid "" "The easiest way to authenticate a client is via the HTTP Basic " "authentication mechanism, which simply uses a username and password to " "verify that a user is who she says she is. Apache provides an " "<command>htpasswd</command> utility for managing the list of acceptable " "usernames and passwords. Let's grant commit access to Sally and Harry. " "First, we need to add them to the password file:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1722 #, no-wrap msgid "" "\n" "$ ### First time: use -c to create the file\n" "$ ### Use -m to use MD5 encryption of the password, which is more secure\n" "$ htpasswd -cm /etc/svn-auth-file harry\n" "New password: *****\n" "Re-type new password: *****\n" "Adding password for user harry\n" "$ htpasswd -m /etc/svn-auth-file sally\n" "New password: *******\n" "Re-type new password: *******\n" "Adding password for user sally\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1736 msgid "" "Next, you need to add some more <filename>httpd.conf</filename> directives " "inside your <literal>Location</literal> block to tell Apache what to do with " "your new password file. The <literal>AuthType</literal> directive specifies " "the type of authentication system to use. In this case, we want to specify " "the <literal>Basic</literal> authentication system. <literal>AuthName</" "literal> is an arbitrary name that you give for the authentication domain. " "Most browsers will display this name in the pop-up dialog box when the " "browser is querying the user for her name and password. Finally, use the " "<literal>AuthUserFile</literal> directive to specify the location of the " "password file you created using <command>htpasswd</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1751 msgid "" "After adding these three directives, your <literal><Location></" "literal> block should look something like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1755 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /etc/svn-auth-file\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1765 msgid "" "This <literal><Location></literal> block is not yet complete, and it " "will not do anything useful. It's merely telling Apache that whenever " "authorization is required, Apache should harvest a username and password " "from the Subversion client. What's missing here, however, are directives " "that tell Apache <emphasis>which</emphasis> sorts of client requests require " "authorization. Wherever authorization is required, Apache will demand " "authentication as well. The simplest thing to do is protect all requests. " "Adding <literal>Require valid-user</literal> tells Apache that all requests " "require an authenticated user:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1777 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /etc/svn-auth-file\n" " Require valid-user\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1788 msgid "" "Be sure to read the next section (<xref linkend=\"svn.serverconfig.httpd." "authz\"/>) for more detail on the <literal>Require</literal> directive and " "other ways to set authorization policies." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1793 msgid "" "One word of warning: HTTP Basic Auth passwords pass in very nearly plain " "text over the network, and thus are extremely insecure." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1797 msgid "" "Another option is to not use Basic authentication, but to use Digest " "authentication instead. Digest authentication allows the server to verify " "the client's identity <emphasis>without</emphasis> passing the plain-text " "password over the network. Assuming that the client and server both know " "the user's password, they can verify that the password is the same by using " "it to apply a hashing function to a one-time bit of information. The server " "sends a small random-ish string to the client; the client uses the user's " "password to hash the string; the server then looks to see whether the hashed " "value is what it expected." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1809 msgid "" "Configuring Apache for Digest authentication is also fairly easy, and only a " "small variation on our prior example. Be sure to consult Apache's " "documentation for full details." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1814 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" " AuthType Digest\n" " AuthName \"Subversion repository\"\n" " AuthDigestDomain /svn/\n" " AuthUserFile /etc/svn-auth-file\n" " Require valid-user\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch06-server-configuration.xml:1826 msgid "" "If you're looking for maximum security, public key cryptography is the best " "solution. It may be best to use some sort of SSL encryption, so that " "clients authenticate via <literal>https://</literal> instead of " "<literal>http://</literal>; at a bare minimum, you can configure Apache to " "use a self-signed server certificate. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:1833 msgid "" "While self-signed server certificates are still vulnerable to a <quote>man-" "in-the-middle</quote> attack, such an attack is much more difficult for a " "casual observer to pull off, compared to sniffing unprotected passwords." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1838 msgid "" "</footnote> Consult Apache's documentation (and OpenSSL documentation) " "about how to do that." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:1847 msgid "SSL certificate management" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1849 msgid "" "Businesses that need to expose their repositories for access outside the " "company firewall should be conscious of the possibility that unauthorized " "parties could be <quote>sniffing</quote> their network traffic. SSL makes " "that kind of unwanted attention less likely to result in sensitive data " "leaks." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1856 msgid "" "If a Subversion client is compiled to use OpenSSL, it gains the ability to " "speak to an Apache server via <literal>https://</literal> URLs. The Neon " "library used by the Subversion client is not only able to verify server " "certificates, but can also supply client certificates when challenged. When " "the client and server have exchanged SSL certificates and successfully " "authenticated one another, all further communication is encrypted via a " "session key." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1865 msgid "" "It's beyond the scope of this book to describe how to generate client and " "server certificates and how to configure Apache to use them. Many other " "books, including Apache's own documentation, describe this task. But what " "we <emphasis>can</emphasis> cover here is how to manage server and client " "certificates from an ordinary Subversion client." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1873 msgid "" "When speaking to Apache via <literal>https://</literal>, a Subversion client " "can receive two different types of information:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1878 msgid "A server certificate" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:1879 msgid "A demand for a client certificate" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1882 msgid "" "If the client receives a server certificate, it needs to verify that it " "trusts the certificate: is the server really who it claims to be? The " "OpenSSL library does this by examining the signer of the server certificate, " "or <firstterm>certificate authority</firstterm> (CA). If OpenSSL is unable " "to automatically trust the CA, or if some other problem occurs (such as an " "expired certificate or hostname mismatch), the Subversion command-line " "client will ask you whether you want to trust the server certificate anyway:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1893 #, no-wrap msgid "" "\n" "$ svn list https://host.example.com/repos/project\n" "\n" "Error validating server certificate for 'https://host.example.com:443':\n" " - The certificate is not issued by a trusted authority. Use the\n" " fingerprint to validate the certificate manually!\n" "Certificate information:\n" " - Hostname: host.example.com\n" " - Valid: from Jan 30 19:23:56 2004 GMT until Jan 30 19:23:56 2006 GMT\n" " - Issuer: CA, example.com, Sometown, California, US\n" " - Fingerprint: 7d:e1:a9:34:33:39:ba:6a:e9:a5:c4:22:98:7b:76:5c:92:a0:9c:7b\n" "\n" "(R)eject, accept (t)emporarily or accept (p)ermanently?\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1908 msgid "" "This dialogue should look familiar; it's essentially the same question " "you've probably seen coming from your web browser (which is just another " "HTTP client like Subversion). If you choose the <literal>(p)</" "literal>ermanent option, the server certificate will be cached in your " "private runtime <filename>auth/</filename> area in just the same way your " "username and password are cached (see <xref linkend=\"svn.serverconfig." "netmodel.credcache\"/>). If cached, Subversion will automatically trust " "this certificate in future negotiations." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1919 msgid "" "Your runtime <filename>servers</filename> file also gives you the ability to " "make your Subversion client automatically trust specific CAs, either " "globally or on a per-host basis. Simply set the <literal>ssl-authority-" "files</literal> variable to a semicolon-separated list of PEM-encoded CA " "certificates:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1926 #, no-wrap msgid "" "\n" "[global]\n" "ssl-authority-files = /path/to/CAcert1.pem;/path/to/CAcert2.pem\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1931 msgid "" "Many OpenSSL installations also have a predefined set of <quote>default</" "quote> CAs that are nearly universally trusted. To make the Subversion " "client automatically trust these standard authorities, set the <literal>ssl-" "trust-default-ca</literal> variable to <literal>true</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1938 msgid "" "When talking to Apache, a Subversion client might also receive a challenge " "for a client certificate. Apache is asking the client to identify itself: " "is the client really who it says it is? If all goes correctly, the " "Subversion client sends back a private certificate signed by a CA that " "Apache trusts. A client certificate is usually stored on disk in encrypted " "format, protected by a local password. When Subversion receives this " "challenge, it will ask you for a path to the certificate and the password " "that protects it:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1949 #, no-wrap msgid "" "\n" "$ svn list https://host.example.com/repos/project\n" "\n" "Authentication realm: https://host.example.com:443\n" "Client certificate filename: /path/to/my/cert.p12\n" "Passphrase for '/path/to/my/cert.p12': ********\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1958 msgid "" "Notice that the client certificate is a <quote>p12</quote> file. To use a " "client certificate with Subversion, it must be in PKCS#12 format, which is a " "portable standard. Most web browsers are already able to import and export " "certificates in that format. Another option is to use the OpenSSL command-" "line tools to convert existing certificates into PKCS#12." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:1966 msgid "" "Again, the runtime <filename>servers</filename> file allows you to automate " "this challenge on a per-host basis. Either or both pieces of information " "can be described in runtime variables:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:1971 #, no-wrap msgid "" "\n" "[groups]\n" "examplehost = host.example.com\n" "\n" "[examplehost]\n" "ssl-client-cert-file = /path/to/my/cert.p12\n" "ssl-client-cert-password = somepassword\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch06-server-configuration.xml:1980 msgid "" "Once you've set the <literal>ssl-client-cert-file</literal> and <literal>ssl-" "client-cert-password</literal> variables, the Subversion client can " "automatically respond to a client certificate challenge without prompting " "you. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:1986 msgid "" "More security-conscious folk might not want to store the client certificate " "password in the runtime <filename>servers</filename> file." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:1998 msgid "Authorization Options" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:2000 msgid "" "At this point, you've configured authentication, but not authorization. " "Apache is able to challenge clients and confirm identities, but it has not " "been told how to allow or restrict access to the clients bearing those " "identities. This section describes two strategies for controlling access to " "your repositories." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:2009 msgid "Blanket access control" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2011 msgid "" "The simplest form of access control is to authorize certain users for either " "read-only access to a repository or read/write access to a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2015 msgid "" "You can restrict access on all repository operations by adding the " "<literal>Require valid-user</literal> directive to your <literal><" "Location></literal> block. Using our previous example, this would mean " "that only clients that claimed to be either <literal>harry</literal> or " "<literal>sally</literal> and that provided the correct password for their " "respective username would be allowed to do anything with the Subversion " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2024 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " # how to authenticate a user\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /path/to/users/file\n" "\n" " # only authenticated users may access the repository\n" " Require valid-user\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2039 msgid "" "Sometimes you don't need to run such a tight ship. For example, " "Subversion's own source code repository at <ulink url=\"http://svn.collab." "net/repos/svn\"/> allows anyone in the world to perform read-only repository " "tasks (such as checking out working copies and browsing the repository with " "a web browser), but restricts all write operations to authenticated users. " "To do this type of selective restriction, you can use the <literal>Limit</" "literal> and <literal>LimitExcept</literal> configuration directives. Like " "the <literal>Location</literal> directive, these blocks have starting and " "ending tags, and you would nest them inside your <literal><Location></" "literal> block." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2053 msgid "" "The parameters present on the <literal>Limit</literal> and " "<literal>LimitExcept</literal> directives are HTTP request types that are " "affected by that block. For example, if you wanted to disallow all access " "to your repository except the currently supported read-only operations, you " "would use the <literal>LimitExcept</literal> directive, passing the " "<literal>GET</literal>, <literal>PROPFIND</literal>, <literal>OPTIONS</" "literal>, and <literal>REPORT</literal> request type parameters. Then the " "previously mentioned <literal>Require valid-user</literal> directive would " "be placed inside the <literal><LimitExcept></literal> block instead of " "just inside the <literal><Location></literal> block." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2067 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " # how to authenticate a user\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /path/to/users/file\n" "\n" " # For any operations other than these, require an authenticated user.\n" " <LimitExcept GET PROPFIND OPTIONS REPORT>\n" " Require valid-user\n" " </LimitExcept>\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2084 msgid "" "These are only a few simple examples. For more in-depth information about " "Apache access control and the <literal>Require</literal> directive, take a " "look at the <literal>Security</literal> section of the Apache " "documentation's tutorials collection at <ulink url=\"http://httpd.apache.org/" "docs-2.0/misc/tutorials.html\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:2096 msgid "Per-directory access control" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2098 msgid "" "It's possible to set up finer-grained permissions using a second Apache " "httpd module, <command>mod_authz_svn</command>. This module grabs the " "various opaque URLs passing from client to server, asks " "<command>mod_dav_svn</command> to decode them, and then possibly vetoes " "requests based on access policies defined in a configuration file." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2106 msgid "" "If you've built Subversion from source code, <command>mod_authz_svn</" "command> is automatically built and installed alongside " "<command>mod_dav_svn</command>. Many binary distributions install it " "automatically as well. To verify that it's installed correctly, make sure " "it comes right after <command>mod_dav_svn</command>'s <literal>LoadModule</" "literal> directive in <filename>httpd.conf</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2115 #, no-wrap msgid "" "\n" "LoadModule dav_module modules/mod_dav.so\n" "LoadModule dav_svn_module modules/mod_dav_svn.so\n" "LoadModule authz_svn_module modules/mod_authz_svn.so\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2121 msgid "" "To activate this module, you need to configure your <literal>Location</" "literal> block to use the <literal>AuthzSVNAccessFile</literal> directive, " "which specifies a file containing the permissions policy for paths within " "your repositories. (In a moment, we'll discuss the format of that file.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2128 msgid "" "Apache is flexible, so you have the option to configure your block in one of " "three general patterns. To begin, choose one of these basic configuration " "patterns. (The following examples are very simple; look at Apache's own " "documentation for much more detail on Apache authentication and " "authorization options.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2135 msgid "" "The simplest block is to allow open access to everyone. In this scenario, " "Apache never sends authentication challenges, so all users are treated as " "<quote>anonymous.</quote> (See <xref linkend=\"svn.serverconfig.httpd.authz." "perdir.ex-1\"/>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><title> #: ../en/book/ch06-server-configuration.xml:2142 msgid "A sample configuration for anonymous access" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><programlisting> #: ../en/book/ch06-server-configuration.xml:2143 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " # our access control policy\n" " AuthzSVNAccessFile /path/to/access/file\n" "</Location>\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2154 msgid "" "On the opposite end of the paranoia scale, you can configure your block to " "demand authentication from everyone. All clients must supply credentials to " "identify themselves. Your block unconditionally requires authentication via " "the <literal>Require valid-user</literal> directive, and it defines a means " "to authenticate. (See <xref linkend=\"svn.serverconfig.httpd.authz.perdir." "ex-2\"/>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><title> #: ../en/book/ch06-server-configuration.xml:2163 msgid "A sample configuration for authenticated access" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><programlisting> #: ../en/book/ch06-server-configuration.xml:2164 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " # our access control policy\n" " AuthzSVNAccessFile /path/to/access/file\n" "\n" " # only authenticated users may access the repository\n" " Require valid-user\n" "\n" " # how to authenticate a user\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /path/to/users/file\n" "</Location>\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2183 msgid "" "A third very popular pattern is to allow a combination of authenticated and " "anonymous access. For example, many administrators want to allow anonymous " "users to read certain repository directories, but want only authenticated " "users to read (or write) more sensitive areas. In this setup, all users " "start out accessing the repository anonymously. If your access control " "policy demands a real username at any point, Apache will demand " "authentication from the client. To do this, use both the <literal>Satisfy " "Any</literal> and <literal>Require valid-user</literal> directives " "together. (See <xref linkend=\"svn.serverconfig.httpd.authz.perdir.ex-3\"/" ">.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><title> #: ../en/book/ch06-server-configuration.xml:2197 msgid "A sample configuration for mixed authenticated/anonymous access" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><programlisting> #: ../en/book/ch06-server-configuration.xml:2199 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " # our access control policy\n" " AuthzSVNAccessFile /path/to/access/file\n" "\n" " # try anonymous access first, resort to real\n" " # authentication if necessary.\n" " Satisfy Any\n" " Require valid-user\n" "\n" " # how to authenticate a user\n" " AuthType Basic\n" " AuthName \"Subversion repository\"\n" " AuthUserFile /path/to/users/file\n" "</Location>\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2220 msgid "" "Once you've settled on one of these three basic <filename>httpd.conf</" "filename> templates, you need to create your file containing access rules " "for particular paths within the repository. We describe this later in this " "chapter, in <xref linkend=\"svn.serverconfig.pathbasedauthz\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:2231 #, fuzzy #| msgid "Disabling Password Caching" msgid "Disabling path-based checks" msgstr "Das Zwischenspeichern des Passwortes abstellen" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2233 msgid "" "The <command>mod_dav_svn</command> module goes through a lot of work to make " "sure that data you've marked <quote>unreadable</quote> doesn't get " "accidentally leaked. This means it needs to closely monitor all of the " "paths and file-contents returned by commands such as <command>svn checkout</" "command> and <command>svn update</command>. If these commands encounter a " "path that isn't readable according to some authorization policy, the path is " "typically omitted altogether. In the case of history or rename " "tracing—for example, running a command such as <userinput>svn cat -r " "OLD foo.c</userinput> on a file that was renamed long ago—the rename " "tracking will simply halt if one of the object's former names is determined " "to be read-restricted." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2248 msgid "" "All of this path checking can sometimes be quite expensive, especially in " "the case of <command>svn log</command>. When retrieving a list of " "revisions, the server looks at every changed path in each revision and " "checks it for readability. If an unreadable path is discovered, it's " "omitted from the list of the revision's changed paths (normally seen with " "the <option>--verbose</option> option), and the whole log message is " "suppressed. Needless to say, this can be time-consuming on revisions that " "affect a large number of files. This is the cost of security: even if you " "haven't configured a module such as <command>mod_authz_svn</command> at all, " "the <command>mod_dav_svn</command> module is still asking Apache " "<command>httpd</command> to run authorization checks on every path. The " "<command>mod_dav_svn</command> module has no idea what authorization modules " "have been installed, so all it can do is ask Apache to invoke whatever might " "be present." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2268 msgid "" "On the other hand, there's also an escape hatch of sorts, which allows you " "to trade security features for speed. If you're not enforcing any sort of " "per-directory authorization (i.e., not using <command>mod_authz_svn</" "command> or similar module), you can disable all of this path checking. In " "your <filename>httpd.conf</filename> file, use the <literal>SVNPathAuthz</" "literal> directive as shown in <xref linkend=\"svn.serverconfig.httpd.authz." "pathauthzoff.ex-1\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><title> #: ../en/book/ch06-server-configuration.xml:2280 msgid "Disabling path checks altogether" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><example><programlisting> #: ../en/book/ch06-server-configuration.xml:2281 #, no-wrap msgid "" "\n" "<Location /repos>\n" " DAV svn\n" " SVNParentPath /var/svn\n" "\n" " SVNPathAuthz off\n" "</Location>\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2291 msgid "" "The <literal>SVNPathAuthz</literal> directive is <quote>on</quote> by " "default. When set to <quote>off,</quote> all path-based authorization " "checking is disabled; <command>mod_dav_svn</command> stops invoking " "authorization checks on every path it discovers." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch06-server-configuration.xml:2304 msgid "Extra Goodies" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch06-server-configuration.xml:2306 msgid "" "We've covered most of the authentication and authorization options for " "Apache and <command>mod_dav_svn</command>. But there are a few other nice " "features that Apache provides." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch06-server-configuration.xml:2313 #, fuzzy #| msgid "Repository URLs" msgid "Repository browsing" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2315 msgid "" "One of the most useful benefits of an Apache/WebDAV configuration for your " "Subversion repository is that the youngest revisions of your versioned files " "and directories are immediately available for viewing via a regular web " "browser. Since Subversion uses URLs to identify versioned resources, those " "URLs used for HTTP-based repository access can be typed directly into a web " "browser. Your browser will issue an HTTP <literal>GET</literal> request for " "that URL; based on whether that URL represents a versioned directory or " "file, <command>mod_dav_svn</command> will respond with a directory listing " "or with file contents." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2327 msgid "" "Since the URLs do not contain any information about which version of the " "resource you wish to see, <command>mod_dav_svn</command> will always answer " "with the youngest version. This functionality has the wonderful side effect " "that you can pass around Subversion URLs to your peers as references to " "documents, and those URLs will always point at the latest manifestation of " "that document. Of course, you can even use the URLs as hyperlinks from " "other web sites, too." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><title> #: ../en/book/ch06-server-configuration.xml:2338 msgid "Can I View Older Revisions?" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2340 msgid "" "With an ordinary web browser? In one word: nope. At least, not with " "<command>mod_dav_svn</command> as your only tool." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2344 msgid "" "Your web browser speaks ordinary HTTP only. That means it knows only how to " "GET public URLs, which represent the latest versions of files and " "directories. According to the WebDAV/DeltaV specification, each server " "defines a private URL syntax for older versions of resources, and that " "syntax is opaque to clients. To find an older version of a file, a client " "must follow a specific procedure to <quote>discover</quote> the proper URL; " "the procedure involves issuing a series of WebDAV PROPFIND requests and " "understanding DeltaV concepts. This is something your web browser simply " "can't do." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para><footnote> #: ../en/book/ch06-server-configuration.xml:2356 msgid "" "So, to answer the question, one obvious way to see older revisions of files " "and directories is by passing the <option>--revision</option> (<option>-r</" "option>) argument to the <command>svn list</command> and <command>svn cat</" "command> commands. To browse old revisions with your web browser, however, " "you can use third-party software. A good example of this is ViewVC (<ulink " "url=\"http://viewvc.tigris.org/\"/>). ViewVC was originally written to " "display CVS repositories through the Web, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:2366 msgid "Back then, it was called ViewCVS." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2367 msgid "" "</footnote> and the latest releases are able to understand Subversion " "repositories as well." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2373 msgid "Proper MIME type" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2375 msgid "" "When browsing a Subversion repository, the web browser gets a clue about how " "to render a file's contents by looking at the <literal>Content-Type:</" "literal> header returned in Apache's response to the HTTP <literal>GET</" "literal> request. The value of this header is some sort of MIME type. By " "default, Apache will tell the web browsers that all repository files are of " "the <quote>default</quote> MIME type, typically <literal>text/plain</" "literal>. This can be frustrating, however, if a user wishes repository " "files to render as something more meaningful—for example, it might be " "nice to have a <filename>foo.html</filename> file in the repository actually " "render as HTML when browsing." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2390 msgid "" "To make this happen, you need only to make sure that your files have the " "proper <literal>svn:mime-type</literal> set. We discuss this in more detail " "in <xref linkend=\"svn.advanced.props.special.mime-type\"/>, and you can " "even configure your client to automatically attach proper <literal>svn:mime-" "type</literal> properties to files entering the repository for the first " "time; see <xref linkend=\"svn.advanced.props.auto\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2400 msgid "" "So in our example, if one were to set the <literal>svn:mime-type</literal> " "property to <literal>text/html</literal> on file <filename>foo.html</" "filename>, Apache would properly tell your web browser to render the file as " "HTML. One could also attach proper <literal>image/*</literal> MIME-type " "properties to image files and ultimately get an entire web site to be " "viewable directly from a repository! There's generally no problem with this, " "as long as the web site doesn't contain any dynamically generated content." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2415 msgid "Customizing the look" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2417 msgid "" "You generally will get more use out of URLs to versioned files—after " "all, that's where the interesting content tends to lie. But you might have " "occasion to browse a Subversion directory listing, where you'll quickly note " "that the generated HTML used to display that listing is very basic, and " "certainly not intended to be aesthetically pleasing (or even interesting). " "To enable customization of these directory displays, Subversion provides an " "XML index feature. A single <literal>SVNIndexXSLT</literal> directive in " "your repository's <literal>Location</literal> block of <filename>httpd.conf</" "filename> will instruct <command>mod_dav_svn</command> to generate XML " "output when displaying a directory listing, and to reference the XSLT " "stylesheet of your choice:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><screen> #: ../en/book/ch06-server-configuration.xml:2433 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" " SVNIndexXSLT \"/svnindex.xsl\"\n" " …\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2442 msgid "" "Using the <literal>SVNIndexXSLT</literal> directive and a creative XSLT " "stylesheet, you can make your directory listings match the color schemes and " "imagery used in other parts of your web site. Or, if you'd prefer, you can " "use the sample stylesheets provided in the Subversion source distribution's " "<filename>tools/xslt/</filename> directory. Keep in mind that the path " "provided to the <literal>SVNIndexXSLT</literal> directory is actually a URL " "path—browsers need to be able to read your stylesheets to make use of " "them!" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2456 msgid "Listing repositories" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2458 msgid "" "If you're serving a collection of repositories from a single URL via the " "<literal>SVNParentPath</literal> directive, then it's also possible to have " "Apache display all available repositories to a web browser. Just activate " "the <literal>SVNListParentPath</literal> directive:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><screen> #: ../en/book/ch06-server-configuration.xml:2465 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath /var/svn\n" " SVNListParentPath on\n" " …\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2474 msgid "" "If a user now points her web browser to the URL <literal>http://host.example." "com/svn/</literal>, she'll see a list of all Subversion repositories sitting " "in <filename>/var/svn</filename>. Obviously, this can be a security " "problem, so this feature is turned off by default." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:2487 msgid "Apache logging" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2489 msgid "" "Because Apache is an HTTP server at heart, it contains fantastically " "flexible logging features. It's beyond the scope of this book to discuss " "all of the ways logging can be configured, but we should point out that even " "the most generic <filename>httpd.conf</filename> file will cause Apache to " "produce two logs: <filename>error_log</filename> and <filename>access_log</" "filename>. These logs may appear in different places, but are typically " "created in the logging area of your Apache installation. (On Unix, they " "often live in <filename>/usr/local/apache2/logs/</filename>.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2502 msgid "" "The <filename>error_log</filename> describes any internal errors that Apache " "runs into as it works. The <filename>access_log</filename> file records " "every incoming HTTP request received by Apache. This makes it easy to see, " "for example, which IP addresses Subversion clients are coming from, how " "often particular clients use the server, which users are authenticating " "properly, and which requests succeed or fail." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2511 msgid "" "Unfortunately, because HTTP is a stateless protocol, even the simplest " "Subversion client operation generates multiple network requests. It's very " "difficult to look at the <filename>access_log</filename> and deduce what the " "client was doing—most operations look like a series of cryptic " "<literal>PROPPATCH</literal>, <literal>GET</literal>, <literal>PUT</" "literal>, and <literal>REPORT</literal> requests. To make things worse, " "many client operations send nearly identical series of requests, so it's " "even harder to tell them apart." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2522 msgid "" "<command>mod_dav_svn</command>, however, can come to your aid. By " "activating an <quote>operational logging</quote> feature, you can ask " "<command>mod_dav_svn</command> to create a separate log file describing what " "sort of high-level operations your clients are performing." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2529 msgid "" "To do this, you need to make use of Apache's <literal>CustomLog</literal> " "directive (which is explained in more detail in Apache's own " "documentation). Be sure to invoke this directive <emphasis>outside</" "emphasis> your Subversion <literal>Location</literal> block:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2536 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " …\n" "</Location>\n" "\n" "CustomLog logs/svn_logfile \"%t %u %{SVN-ACTION}e\" env=SVN-ACTION\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2545 msgid "" "In this example, we're asking Apache to create a special logfile, " "<filename>svn_logfile</filename>, in the standard Apache <filename>logs</" "filename> directory. The <literal>%t</literal> and <literal>%u</literal> " "variables are replaced by the time and username of the request, " "respectively. The really important parts are the two instances of " "<literal>SVN-ACTION</literal>. When Apache sees that variable, it " "substitutes the value of the <literal>SVN-ACTION</literal> environment " "variable, which is automatically set by <command>mod_dav_svn</command> " "whenever it detects a high-level client action." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2557 msgid "" "So, instead of having to interpret a traditional <filename>access_log</" "filename> like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2561 #, no-wrap msgid "" "\n" "[26/Jan/2007:22:25:29 -0600] \"PROPFIND /svn/calc/!svn/vcc/default HTTP/1.1\" 207 398\n" "[26/Jan/2007:22:25:29 -0600] \"PROPFIND /svn/calc/!svn/bln/59 HTTP/1.1\" 207 449\n" "[26/Jan/2007:22:25:29 -0600] \"PROPFIND /svn/calc HTTP/1.1\" 207 647\n" "[26/Jan/2007:22:25:29 -0600] \"REPORT /svn/calc/!svn/vcc/default HTTP/1.1\" 200 607\n" "[26/Jan/2007:22:25:31 -0600] \"OPTIONS /svn/calc HTTP/1.1\" 200 188\n" "[26/Jan/2007:22:25:31 -0600] \"MKACTIVITY /svn/calc/!svn/act/e6035ef7-5df0-4ac0-b811-4be7c823f998 HTTP/1.1\" 201 227\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2571 msgid "" "you can peruse a much more intelligible <filename>svn_logfile</filename> " "like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch06-server-configuration.xml:2575 #, no-wrap msgid "" "\n" "[26/Jan/2007:22:24:20 -0600] - get-dir /tags r1729 props\n" "[26/Jan/2007:22:24:27 -0600] - update /trunk r1729 depth=infinity send-copyfrom-args\n" "[26/Jan/2007:22:25:29 -0600] - status /trunk/foo r1729 depth=infinity\n" "[26/Jan/2007:22:25:31 -0600] sally commit r1730\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2582 msgid "" "For an exhaustive list of all actions logged, see <xref linkend=\"svn.ref." "mod_dav_svn.conf.logging\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:2589 msgid "Write-through proxying" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2591 msgid "" "One of the nice advantages of using Apache as a Subversion server is that it " "can be set up for simple replication. For example, suppose that your team " "is distributed across four offices around the globe. The Subversion " "repository can exist only in one of those offices, which means the other " "three offices will not enjoy accessing it—they're likely to experience " "significantly slower traffic and response times when updating and committing " "code. A powerful solution is to set up a system consisting of one " "<firstterm>master</firstterm> Apache server and several <firstterm>slave</" "firstterm> Apache servers. If you place a slave server in each office, " "users can check out a working copy from whichever slave is closest to them. " "All read requests go to their local slave. Write requests get automatically " "routed to the single master server. When the commit completes, the master " "then automatically <quote>pushes</quote> the new revision to each slave " "server using the <command>svnsync</command> replication tool." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2611 msgid "" "This configuration creates a huge perceptual speed increase for your users, " "because Subversion client traffic is typically 80–90% read requests. " "And if those requests are coming from a <emphasis>local</emphasis> server, " "it's a huge win." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2617 msgid "" "In this section, we'll walk you through a standard setup of this single-" "master/multiple-slave system. However, keep in mind that your servers must " "be running at least Apache 2.2.0 (with <command>mod_proxy</command> loaded) " "and Subversion 1.5 (<command>mod_dav_svn</command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2624 msgid "Configure the servers" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2626 msgid "" "First, configure your master server's <filename>httpd.conf</filename> file " "in the usual way. Make the repository available at a certain URI location, " "and configure authentication and authorization however you'd like. After " "that's done, configure each of your <quote>slave</quote> servers in the " "exact same way, but add the special <literal>SVNMasterURI</literal> " "directive to the block:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><screen> #: ../en/book/ch06-server-configuration.xml:2635 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" " SVNPath /var/svn/repos\n" " SVNMasterURI http://master.example.com/svn\n" " …\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2644 msgid "" "This new directive tells a slave server to redirect all write requests to " "the master. (This is done automatically via Apache's <command>mod_proxy</" "command> module.) Ordinary read requests, however, are still serviced by " "the slaves. Be sure that your master and slave servers all have matching " "authentication and authorization configurations; if they fall out of sync, " "it can lead to big headaches." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2653 msgid "" "Next, we need to deal with the problem of infinite recursion. With the " "current configuration, imagine what will happen when a Subversion client " "performs a commit to the master server. After the commit completes, the " "server uses <command>svnsync</command> to replicate the new revision to each " "slave. But because <command>svnsync</command> appears to be just another " "Subversion client performing a commit, the slave will immediately attempt to " "proxy the incoming write request back to the master! Hilarity ensues." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2664 msgid "" "The solution to this problem is to have the master push revisions to a " "different <literal><Location></literal> on the slaves. This location " "is configured to <emphasis>not</emphasis> proxy write requests at all, but " "to accept normal commits from (and only from) the master's IP address:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><screen> #: ../en/book/ch06-server-configuration.xml:2671 #, no-wrap msgid "" "\n" "<Location /svn-proxy-sync>\n" " DAV svn\n" " SVNPath /var/svn/repos\n" " Order deny,allow\n" " Deny from all\n" " # Only let the server's IP address access this Location:\n" " Allow from 10.20.30.40\n" " …\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2686 msgid "Set up replication" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2688 msgid "" "Now that you've configured your <literal>Location</literal> blocks on master " "and slaves, you need to configure the master to replicate to the slaves. " "This is done the usual way— using <command>svnsync</command>. If " "you're not familiar with this tool, see <xref linkend=\"svn.reposadmin.maint." "replication\"/> for details." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2697 msgid "" "First, make sure that each slave repository has a <filename>pre-revprop-" "change</filename> hook script which allows remote revision property " "changes. (This is standard procedure for being on the receiving end of " "<command>svnsync</command>.) Then log into the master server and configure " "each of the slave repository URIs to receive data from the master repository " "on the local disk:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><screen> #: ../en/book/ch06-server-configuration.xml:2706 #, no-wrap msgid "" "\n" "$ svnsync init http://slave1.example.com/svn-proxy-sync file://var/svn/repos\n" "Copied properties for revision 0.\n" "$ svnsync init http://slave2.example.com/svn-proxy-sync file://var/svn/repos\n" "Copied properties for revision 0.\n" "$ svnsync init http://slave3.example.com/svn-proxy-sync file://var/svn/repos\n" "Copied properties for revision 0.\n" "\n" "# Perform the initial replication\n" "\n" "$ svnsync sync http://slave1.example.com/svn-proxy-sync\n" "Transmitting file data ....\n" "Committed revision 1.\n" "Copied properties for revision 1.\n" "Transmitting file data .......\n" "Committed revision 2.\n" "Copied properties for revision 2.\n" "…\n" "\n" "$ svnsync sync http://slave2.example.com/svn-proxy-sync\n" "Transmitting file data ....\n" "Committed revision 1.\n" "Copied properties for revision 1.\n" "Transmitting file data .......\n" "Committed revision 2.\n" "Copied properties for revision 2.\n" "…\n" "\n" "$ svnsync sync http://slave3.example.com/svn-proxy-sync\n" "Transmitting file data ....\n" "Committed revision 1.\n" "Copied properties for revision 1.\n" "Transmitting file data .......\n" "Committed revision 2.\n" "Copied properties for revision 2.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2744 msgid "" "After this is done, we configure the master server's <filename>post-commit</" "filename> hook script to invoke <command>svnsync</command> on each slave " "server:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><programlisting> #: ../en/book/ch06-server-configuration.xml:2748 #, no-wrap msgid "" "\n" "#!/bin/sh\n" "# Post-commit script to replicate newly committed revision to slaves\n" "\n" "svnsync sync http://slave1.example.com/svn-proxy-sync > /dev/null 2>&1\n" "svnsync sync http://slave2.example.com/svn-proxy-sync > /dev/null 2>&1\n" "svnsync sync http://slave3.example.com/svn-proxy-sync > /dev/null 2>&1\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2757 msgid "" "The extra bits on the end of each line aren't necessary, but they're a " "sneaky way to allow the sync commands to run in the background so that the " "Subversion client isn't left waiting forever for the commit to finish. In " "addition to this <filename>post-commit</filename> hook, you'll need a " "<filename>post-revprop-change</filename> hook as well so that when a user, " "say, modifies a log message, the slave servers get that change also:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><programlisting> #: ../en/book/ch06-server-configuration.xml:2767 #, no-wrap msgid "" "\n" "#!/bin/sh\n" "# Post-revprop-change script to replicate revprop-changes to slaves\n" "\n" "REV=${2}\n" "svnsync copy-revprops http://slave1.example.com/svn-proxy-sync ${REV} > /dev/null 2>&1\n" "svnsync copy-revprops http://slave2.example.com/svn-proxy-sync ${REV} > /dev/null 2>&1\n" "svnsync copy-revprops http://slave3.example.com/svn-proxy-sync ${REV} > /dev/null 2>&1\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2777 msgid "" "The only thing we've left out here is what to do about locks. Because locks " "are strictly enforced by the master server (the only place where commits " "happen), we don't technically need to do anything. Many teams don't use " "Subversion's locking features at all, so it may be a nonissue for you. " "However, if lock changes aren't replicated from master to slaves, it means " "that clients won't be able to query the status of locks (e.g., " "<userinput>svn status -u</userinput> will show no information about " "repository locks). If this bothers you, you can write <filename>post-lock</" "filename> and <filename>post-unlock</filename> hook scripts that run " "<command>svn lock</command> and <command>svn unlock</command> on each slave " "machine, presumably through a remote shell method such as SSH. That's left " "as an exercise for the reader!" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><title> #: ../en/book/ch06-server-configuration.xml:2797 msgid "Caveats" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><para> #: ../en/book/ch06-server-configuration.xml:2799 msgid "" "Your master/slave replication system should now be ready to use. A couple " "of words of warning are in order, however. Remember that this replication " "isn't entirely robust in the face of computer or network crashes. For " "example, if one of the automated <command>svnsync</command> commands fails " "to complete for some reason, the slaves will begin to fall behind. For " "example, your remote users will see that they've committed revision 100, but " "then when they run <command>svn update</command>, their local server will " "tell them that revision 100 doesn't yet exist! Of course, the problem will " "be automatically fixed the next time another commit happens and the " "subsequent <command>svnsync</command> is successful—the sync will " "replicate all waiting revisions. But still, you may want to set up some " "sort of out-of-band monitoring to notice synchronization failures and force " "<command>svnsync</command> to run when things go wrong." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><sidebar><title> #: ../en/book/ch06-server-configuration.xml:2819 msgid "Can We Set Up Replication with svnserve?" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><sect4><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2821 msgid "" "If you're using <command>svnserve</command> instead of Apache as your " "server, you can certainly configure your repository's hook scripts to invoke " "<command>svnsync</command> as we've shown here, thereby causing automatic " "replication from master to slaves. Unfortunately, at the time of this " "writing there is no way to make slave <command>svnserve</command> servers " "automatically proxy write requests back to the master server. This means " "your users would only be able to check out read-only working copies from the " "slave servers. You'd have to configure your slave servers to disallow write " "access completely. This might be useful for creating read-only " "<quote>mirrors</quote> of popular open source projects, but it's not a " "transparent proxying system." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch06-server-configuration.xml:2843 msgid "Other Apache features" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2845 msgid "" "Several of the features already provided by Apache in its role as a robust " "web server can be leveraged for increased functionality or security in " "Subversion as well. The Subversion client is able to use SSL (the Secure " "Sockets Layer, discussed earlier). If your Subversion client is built to " "support SSL, it can access your Apache server using <literal>https://</" "literal> and enjoy a high-quality encrypted network session." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2854 msgid "" "Equally useful are other features of the Apache and Subversion relationship, " "such as the ability to specify a custom port (instead of the default HTTP " "port 80) or a virtual domain name by which the Subversion repository should " "be accessed, or the ability to access the repository through an HTTP proxy." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2861 msgid "" "Finally, because <command>mod_dav_svn</command> is speaking a subset of the " "WebDAV/DeltaV protocol, it's possible to access the repository via third-" "party DAV clients. Most modern operating systems (Win32, OS X, and Linux) " "have the built-in ability to mount a DAV server as a standard network " "<quote>shared folder.</quote> This is a complicated topic, but also wondrous " "when implemented. For details, read <xref linkend=\"svn.webdav\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch06-server-configuration.xml:2870 msgid "" "Note that there are a number of other small tweaks one can make to " "<command>mod_dav_svn</command> that are too obscure to mention in this " "chapter. For a complete list of all <filename>httpd.conf</filename> " "directives that <command>mod_dav_svn</command> responds to, see <xref " "linkend=\"svn.ref.mod_dav_svn.conf.directives\"/>." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:2888 msgid "Path-Based Authorization" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:2890 msgid "" "Both Apache and <command>svnserve</command> are capable of granting (or " "denying) permissions to users. Typically this is done over the entire " "repository: a user can read the repository (or not), and she can write to " "the repository (or not). It's also possible, however, to define finer-" "grained access rules. One set of users may have permission to write to a " "certain directory in the repository, but not others; another directory might " "not even be readable by all but a few special people." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:2900 msgid "" "Both servers use a common file format to describe these path-based access " "rules. In the case of Apache, one needs to load the <command>mod_authz_svn</" "command> module and then add the <literal>AuthzSVNAccessFile</literal> " "directive (within the <filename>httpd.conf</filename> file) pointing to your " "own rules file. (For a full explanation, see <xref linkend=\"svn." "serverconfig.httpd.authz.perdir\"/>.) If you're using <command>svnserve</" "command>, you need to make the <literal>authz-db</literal> variable (within " "<filename>svnserve.conf</filename>) point to your rules file." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch06-server-configuration.xml:2913 msgid "Do You Really Need Path-Based Access Control?" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2915 msgid "" "A lot of administrators setting up Subversion for the first time tend to " "jump into path-based access control without giving it a lot of thought. The " "administrator usually knows which teams of people are working on which " "projects, so it's easy to jump in and grant certain teams access to certain " "directories and not others. It seems like a natural thing, and it appeases " "the administrator's desire to maintain tight control of the repository." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2924 msgid "" "Note, though, that there are often invisible (and visible!) costs associated " "with this feature. In the visible category, the server needs to do a lot " "more work to ensure that the user has the right to read or write each " "specific path; in certain situations, there's very noticeable performance " "loss. In the invisible category, consider the culture you're creating. " "Most of the time, while certain users <emphasis>shouldn't</emphasis> be " "committing changes to certain parts of the repository, that social contract " "doesn't need to be technologically enforced. Teams can sometimes " "spontaneously collaborate with each other; someone may want to help someone " "else out by committing to an area she doesn't normally work on. By " "preventing this sort of thing at the server level, you're setting up " "barriers to unexpected collaboration. You're also creating a bunch of rules " "that need to be maintained as projects develop, new users are added, and so " "on. It's a bunch of extra work to maintain." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2943 msgid "" "Remember that this is a version control system! Even if somebody " "accidentally commits a change to something she shouldn't, it's easy to undo " "the change. And if a user commits to the wrong place with deliberate " "malice, it's a social problem anyway, and that the problem needs to be dealt " "with outside Subversion." msgstr "" # type: Content of: <chapter><sect1><sidebar><para><footnote> #: ../en/book/ch06-server-configuration.xml:2950 msgid "" "So, before you begin restricting users' access rights, ask yourself whether " "there's a real, honest need for this, or whether it's just something that " "<quote>sounds good</quote> to an administrator. Decide whether it's worth " "sacrificing some server speed, and remember that there's very little risk " "involved; it's bad to become dependent on technology as a crutch for social " "problems. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sidebar><para><footnote><para> #: ../en/book/ch06-server-configuration.xml:2958 msgid "A common theme in this book!" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:2962 msgid "" "As an example to ponder, consider that the Subversion project itself has " "always had a notion of who is allowed to commit where, but it's always been " "enforced socially. This is a good model of community trust, especially for " "open source projects. Of course, sometimes there <emphasis>are</emphasis> " "truly legitimate needs for path-based access control; within corporations, " "for example, certain types of data really can be sensitive, and access needs " "to be genuinely restricted to small groups of people." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:2974 msgid "" "Once your server knows where to find your rules file, it's time to define " "the rules." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:2977 msgid "" "The syntax of the file is the same familiar one used by <filename>svnserve." "conf</filename> and the runtime configuration files. Lines that start with " "a hash (<literal>#</literal>) are ignored. In its simplest form, each " "section names a repository and path within it, as well as the authenticated " "usernames are the option names within each section. The value of each " "option describes the user's level of access to the repository path: either " "<literal>r</literal> (read-only) or <literal>rw</literal> (read/write). If " "the user is not mentioned at all, no access is allowed." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:2989 msgid "" "To be more specific: the value of the section names is either of the form " "<literal>[repos-name:path]</literal> or of the form <literal>[path]</" "literal>. If you're using the <literal>SVNParentPath</literal> directive, " "it's important to specify the repository names in your sections. If you " "omit them, a section such as <literal>[/some/dir]</literal> will match the " "path <filename>/some/dir</filename> in <emphasis>every</emphasis> " "repository. If you're using the <literal>SVNPath</literal> directive, " "however, it's fine to only define paths in your sections—after all, " "there's only one repository." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3001 #, no-wrap msgid "" "\n" "[calc:/branches/calc/bug-142]\n" "harry = rw\n" "sally = r\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3007 msgid "" "In this first example, the user <literal>harry</literal> has full read and " "write access on the <filename>/branches/calc/bug-142</filename> directory in " "the <literal>calc</literal> repository, but the user <literal>sally</" "literal> has read-only access. Any other users are blocked from accessing " "this directory." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3014 msgid "" "Of course, permissions are inherited from parent to child directory. That " "means we can specify a subdirectory with a different access policy for Sally:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3018 #, no-wrap msgid "" "\n" "[calc:/branches/calc/bug-142]\n" "harry = rw\n" "sally = r\n" "\n" "# give sally write access only to the 'testing' subdir\n" "[calc:/branches/calc/bug-142/testing]\n" "sally = rw\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3028 msgid "" "Now Sally can write to the <filename>testing</filename> subdirectory of the " "branch, but can still only read other parts. Harry, meanwhile, continues to " "have complete read/write access to the whole branch." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3033 msgid "" "It's also possible to explicitly deny permission to someone via inheritance " "rules, by setting the username variable to nothing:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3037 #, no-wrap msgid "" "\n" "[calc:/branches/calc/bug-142]\n" "harry = rw\n" "sally = r\n" "\n" "[calc:/branches/calc/bug-142/secret]\n" "harry =\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3046 msgid "" "In this example, Harry has read/write access to the entire <filename>bug-" "142</filename> tree, but has absolutely no access at all to the " "<filename>secret</filename> subdirectory within it." msgstr "" # type: Content of: <chapter><sect1><tip><para> #: ../en/book/ch06-server-configuration.xml:3052 msgid "" "The thing to remember is that the most specific path always matches first. " "The server tries to match the path itself, and then the parent of the path, " "then the parent of that, and so on. The net effect is that mentioning a " "specific path in the access file will always override any permissions " "inherited from parent directories." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3060 msgid "" "By default, nobody has any access to the repository at all. That means that " "if you're starting with an empty file, you'll probably want to give at least " "read permission to all users at the root of the repository. You can do this " "by using the asterisk variable (<literal>*</literal>), which means " "<quote>all users</quote>:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3067 #, no-wrap msgid "" "\n" "[/]\n" "* = r\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3072 msgid "" "This is a common setup; notice that no repository name is mentioned in the " "section name. This makes all repositories world-readable to all users. Once " "all users have read access to the repositories, you can give explicit " "<literal>rw</literal> permission to certain users on specific subdirectories " "within specific repositories." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3079 msgid "" "The asterisk variable (<literal>*</literal>) is also worth special mention " "because it's the <emphasis>only</emphasis> pattern that matches an anonymous " "user. If you've configured your server block to allow a mixture of " "anonymous and authenticated access, all users start out accessing " "anonymously. The server looks for a <literal>*</literal> value defined for " "the path being accessed; if it can't find one, it demands real " "authentication from the client." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3089 msgid "" "The access file also allows you to define whole groups of users, much like " "the Unix <filename>/etc/group</filename> file:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3093 #, no-wrap msgid "" "\n" "[groups]\n" "calc-developers = harry, sally, joe\n" "paint-developers = frank, sally, jane\n" "everyone = harry, sally, joe, frank, sally, jane\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3100 msgid "" "Groups can be granted access control just like users. Distinguish them with " "an <quote>at</quote> (<literal>@</literal>) prefix:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3104 #, no-wrap msgid "" "\n" "[calc:/projects/calc]\n" "@calc-developers = rw\n" "\n" "[paint:/projects/paint]\n" "jane = r\n" "@paint-developers = rw\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3113 msgid "" "Another important fact is that the <emphasis>first</emphasis> matching rule " "is the one which gets applied to a user. In the prior example, even though " "Jane is a member of the <literal>paint-developers</literal> group (which has " "read/write access), the <literal>jane = r</literal> rule will be discovered " "and matched before the group rule, thus denying Jane write access." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3121 msgid "Groups can also be defined to contain other groups:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3123 #, no-wrap msgid "" "\n" "[groups]\n" "calc-developers = harry, sally, joe\n" "paint-developers = frank, sally, jane\n" "everyone = @calc-developers, @paint-developers\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3130 msgid "" "Subversion 1.5 brings another useful feature to the access file syntax: " "username aliases. Some authentication systems expect and carry relatively " "short usernames of the sorts we've been describing here—" "<literal>harry</literal>, <literal>sally</literal>, <literal>joe</literal>, " "and so on. But other authentication systems—such as those which use " "LDAP stores or SSL client certificates—may carry much more complex " "usernames. For example, Harry's username in an LDAP-protected system might " "be <literal>CN=Harold Hacker,OU=Engineers,DC=red-bean,DC=com</literal>. " "With usernames like that, the access file can become quite bloated with long " "or obscure usernames that are easy to mistype. Fortunately, username " "aliases allow you to have to type the correct complex username only once, in " "a statement which assigns to it a more easily digestable alias." msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3146 #, no-wrap msgid "" "\n" "[aliases]\n" "harry = CN=Harold Hacker,OU=Engineers,DC=red-bean,DC=com\n" "sally = CN=Sally Swatterbug,OU=Engineers,DC=red-bean,DC=com\n" "joe = CN=Gerald I. Joseph,OU=Engineers,DC=red-bean,DC=com\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3154 msgid "" "Once you've defined a set of aliases, you can refer to the users elsewhere " "in the access file via their aliases in all the same places you could have " "instead used their actual usernames. Simply prepend an ampersand to the " "alias to distinguish it from a regular username:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3160 #, no-wrap msgid "" "\n" "[groups]\n" "calc-developers = &harry, &sally, &joe\n" "paint-developers = &frank, &sally, &jane\n" "everyone = @calc-developers, @paint-developers\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3167 msgid "" "You might also choose to use aliases if your users' usernames change " "frequently. Doing so allows you to need to update only the aliases table " "when these username changes occur, instead of doing global-search-and-" "replace operations on the whole access file." msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch06-server-configuration.xml:3177 msgid "Partial Readability and Checkouts" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:3179 msgid "" "If you're using Apache as your Subversion server and have made certain " "subdirectories of your repository unreadable to certain users, you need to " "be aware of a possible nonoptimal behavior with <command>svn checkout</" "command>." msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:3184 msgid "" "When the client requests a checkout or update over HTTP, it makes a single " "server request and receives a single (often large) server response. When " "the server receives the request, that is the <emphasis>only</emphasis> " "opportunity Apache has to demand user authentication. This has some odd " "side effects. For example, if a certain subdirectory of the repository is " "readable only by user Sally, and user Harry checks out a parent directory, " "his client will respond to the initial authentication challenge as Harry. " "As the server generates the large response, there's no way it can resend an " "authentication challenge when it reaches the special subdirectory; thus the " "subdirectory is skipped altogether, rather than asking the user to " "reauthenticate as Sally at the right moment. In a similar way, if the root " "of the repository is anonymously world-readable, the entire checkout will be " "done without authentication—again, skipping the unreadable directory, " "rather than asking for authentication partway through." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch06-server-configuration.xml:3210 msgid "Supporting Multiple Repository Access Methods" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3212 msgid "" "You've seen how a repository can be accessed in many different ways. But is " "it possible—or safe—for your repository to be accessed by " "multiple methods simultaneously? The answer is yes, provided you use a bit " "of foresight." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3217 msgid "" "At any given time, these processes may require read and write access to your " "repository:" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3222 msgid "" "Regular system users using a Subversion client (as themselves) to access the " "repository directly via <literal>file://</literal> URLs" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3227 msgid "" "Regular system users connecting to SSH-spawned private <command>svnserve</" "command> processes (running as themselves), which access the repository" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3232 msgid "" "An <command>svnserve</command> process—either a daemon or one launched " "by <command>inetd</command>—running as a particular fixed user" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3238 msgid "" "An Apache <command>httpd</command> process, running as a particular fixed " "user" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3243 msgid "" "The most common problem administrators run into is repository ownership and " "permissions. Does every process (or user) in the preceding list have the " "rights to read and write the repository's underlying data files? Assuming " "you have a Unix-like operating system, a straightforward approach might be " "to place every potential repository user into a new <literal>svn</literal> " "group, and make the repository wholly owned by that group. But even that's " "not enough, because a process may write to the database files using an " "unfriendly umask—one that prevents access by other users." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3254 msgid "" "So the next step beyond setting up a common group for repository users is to " "force every repository-accessing process to use a sane umask. For users " "accessing the repository directly, you can make the <command>svn</command> " "program into a wrapper script that first runs <userinput>umask 002</" "userinput> and then runs the real <command>svn</command> client program. " "You can write a similar wrapper script for the <command>svnserve</command> " "program, and add a <userinput>umask 002</userinput> command to Apache's own " "startup script, <filename>apachectl</filename>. For example:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch06-server-configuration.xml:3265 #, no-wrap msgid "" "\n" "$ cat /usr/bin/svn\n" "\n" "#!/bin/sh\n" "\n" "umask 002\n" "/usr/bin/svn-real \"$@\"\n" "\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3275 msgid "" "Another common problem is often encountered on Unix-like systems. If your " "repository is backed by Berkeley DB, for example, it occasionally creates " "new log files to journal its actions. Even if the Berkeley DB repository is " "wholly owned by the <command>svn</command> group, these newly created log " "files won't necessarily be owned by that same group, which then creates more " "permissions problems for your users. A good workaround is to set the group " "SUID bit on the repository's <filename>db</filename> directory. This causes " "all newly created log files to have the same group owner as the parent " "directory." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3287 msgid "" "Once you've jumped through these hoops, your repository should be accessible " "by all the necessary processes. It may seem a bit messy and complicated, " "but the problems of having multiple users sharing write access to common " "files are classic ones that are not often elegantly solved." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch06-server-configuration.xml:3293 msgid "" "Fortunately, most repository administrators will never <emphasis>need</" "emphasis> to have such a complex configuration. Users who wish to access " "repositories that live on the same machine are not limited to using " "<literal>file://</literal> access URLs—they can typically contact the " "Apache HTTP server or <command>svnserve</command> using <literal>localhost</" "literal> for the server name in their <literal>http://</literal> or " "<literal>svn://</literal> URL. And maintaining multiple server processes " "for your Subversion repositories is likely to be more of a headache than " "necessary. We recommend that you choose a single server that best meets " "your needs and stick with it!" msgstr "" # type: Content of: <chapter><sect1><sidebar><title> #: ../en/book/ch06-server-configuration.xml:3307 msgid "The svn+ssh:// Server Checklist" msgstr "" # type: Content of: <chapter><sect1><sidebar><para> #: ../en/book/ch06-server-configuration.xml:3309 msgid "" "It can be quite tricky to get a bunch of users with existing SSH accounts to " "share a repository without permissions problems. If you're confused about " "all the things that you (as an administrator) need to do on a Unix-like " "system, here's a quick checklist that resummarizes some of the topics " "discussed in this section:" msgstr "" # type: Content of: <chapter><sect1><sidebar><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3318 msgid "" "All of your SSH users need to be able to read and write to the repository, " "so put all the SSH users into a single group." msgstr "" # type: Content of: <chapter><sect1><sidebar><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3324 msgid "Make the repository wholly owned by that group." msgstr "" # type: Content of: <chapter><sect1><sidebar><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3328 msgid "Set the group permissions to read/write." msgstr "" # type: Content of: <chapter><sect1><sidebar><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3332 msgid "" "Your users need to use a sane umask when accessing the repository, so make " "sure <command>svnserve</command> (<filename>/usr/bin/svnserve</filename>, or " "wherever it lives in <literal>$PATH</literal>) is actually a wrapper script " "that runs <userinput>umask 002</userinput> and executes the real " "<command>svnserve</command> binary." msgstr "" # type: Content of: <chapter><sect1><sidebar><itemizedlist><listitem><para> #: ../en/book/ch06-server-configuration.xml:3340 msgid "" "Take similar measures when using <command>svnlook</command> and " "<command>svnadmin</command>. Either run them with a sane umask or wrap them " "as just described." msgstr "" # type: Content of: <chapter><title> #: ../en/book/ch07-customizing-svn.xml:2 msgid "Customizing Your Subversion Experience" msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch07-customizing-svn.xml:4 msgid "" "Version control can be a complex subject, as much art as science, that " "offers myriad ways of getting stuff done. Throughout this book, you've read " "of the various Subversion command-line client subcommands and the options " "that modify their behavior. In this chapter, we'll look into still more " "ways to customize the way Subversion works for you—setting up the " "Subversion runtime configuration, using external helper applications, " "Subversion's interaction with the operating system's configured locale, and " "so on." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch07-customizing-svn.xml:24 msgid "Runtime Configuration Area" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:26 msgid "" "Subversion provides many optional behaviors that the user can control. Many " "of these options are of the kind that a user would wish to apply to all " "Subversion operations. So, rather than forcing users to remember command-" "line arguments for specifying these options and to use them for every " "operation they perform, Subversion uses configuration files, segregated into " "a Subversion configuration area." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:34 msgid "" "The Subversion <firstterm>configuration area</firstterm> is a two-tiered " "hierarchy of option names and their values. Usually, this boils down to a " "special directory that contains <firstterm>configuration files</firstterm> " "(the first tier), which are just text files in standard INI format (with " "<quote>sections</quote> providing the second tier). You can easily edit " "these files using your favorite text editor (such as Emacs or vi), and they " "contain directives read by the client to determine which of several optional " "behaviors the user prefers." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:47 msgid "Configuration Area Layout" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch07-customizing-svn.xml:49 msgid "" "The first time the <command>svn</command> command-line client is executed, " "it creates a per-user configuration area. On Unix-like systems, this area " "appears as a directory named <filename>.subversion</filename> in the user's " "home directory. On Win32 systems, Subversion creates a folder named " "<filename>Subversion</filename>, typically inside the <filename>Application " "Data</filename> area of the user's profile directory (which, by the way, is " "usually a hidden directory). However, on this platform, the exact location " "differs from system to system and is dictated by the Windows Registry. " "<footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch07-customizing-svn.xml:61 msgid "" "The <literal>APPDATA</literal> environment variable points to the " "<filename>Application Data</filename> area, so you can always refer to this " "folder as <filename>%APPDATA%\\Subversion</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:65 msgid "" "</footnote> We will refer to the per-user configuration area using its Unix " "name, <filename>.subversion</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:69 msgid "" "In addition to the per-user configuration area, Subversion also recognizes " "the existence of a system-wide configuration area. This gives system " "administrators the ability to establish defaults for all users on a given " "machine. Note that the system-wide configuration area alone does not " "dictate mandatory policy—the settings in the per-user configuration " "area override those in the system-wide one, and command-line arguments " "supplied to the <command>svn</command> program have the final word on " "behavior. On Unix-like platforms, the system-wide configuration area is " "expected to be the <filename>/etc/subversion</filename> directory; on " "Windows machines, it looks for a <filename>Subversion</filename> directory " "inside the common <filename>Application Data</filename> location (again, as " "specified by the Windows Registry). Unlike the per-user case, the " "<command>svn</command> program does not attempt to create the system-wide " "configuration area." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:87 msgid "" "The per-user configuration area currently contains three files—two " "configuration files (<filename>config</filename> and <filename>servers</" "filename>), and a <filename>README.txt</filename> file, which describes the " "INI format. At the time of their creation, the files contain default values " "for each of the supported Subversion options, mostly commented out and " "grouped with textual descriptions about how the values for the key affect " "Subversion's behavior. To change a certain behavior, you need only to load " "the appropriate configuration file into a text editor, and to modify the " "desired option's value. If at any time you wish to have the default " "configuration settings restored, you can simply remove (or rename) your " "configuration directory and then run some innocuous <command>svn</command> " "command, such as <userinput>svn --version</userinput>. A new configuration " "directory with the default contents will be created." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:104 msgid "" "The per-user configuration area also contains a cache of authentication " "data. The <filename>auth</filename> directory holds a set of subdirectories " "that contain pieces of cached information used by Subversion's various " "supported authentication methods. This directory is created in such a way " "that only the user herself has permission to read its contents." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:116 msgid "Configuration and the Windows Registry" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:118 msgid "" "In addition to the usual INI-based configuration area, Subversion clients " "running on Windows platforms may also use the Windows Registry to hold the " "configuration data. The option names and their values are the same as in " "the INI files. The <quote>file/section</quote> hierarchy is preserved as " "well, though addressed in a slightly different fashion—in this schema, " "files and sections are just levels in the Registry key tree." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:127 msgid "" "Subversion looks for system-wide configuration values under the " "<literal>HKEY_LOCAL_MACHINE\\Software\\Tigris.org\\Subversion</literal> " "key. For example, the <literal>global-ignores</literal> option, which is in " "the <literal>miscellany</literal> section of the <filename>config</filename> " "file, would be found at <literal>HKEY_LOCAL_MACHINE\\Software\\Tigris.org" "\\Subversion\\Config\\Miscellany\\global-ignores</literal>. Per-user " "configuration values should be stored under <literal>HKEY_CURRENT_USER" "\\Software\\Tigris.org\\Subversion</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:138 msgid "" "Registry-based configuration options are parsed <emphasis>before</emphasis> " "their file-based counterparts, so they are overridden by values found in the " "configuration files. In other words, Subversion looks for configuration " "information in the following locations on a Windows system; lower-numbered " "locations take precedence over higher-numbered locations:" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:147 msgid "Command-line options" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:150 msgid "The per-user INI files" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:153 msgid "The per-user Registry values" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:156 msgid "The system-wide INI files" msgstr "" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:159 msgid "The system-wide Registry values" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:163 msgid "" "Also, the Windows Registry doesn't really support the notion of something " "being <quote>commented out.</quote> However, Subversion will ignore any " "option key whose name begins with a hash (<literal>#</literal>) character. " "This allows you to effectively comment out a Subversion option without " "deleting the entire key from the Registry, obviously simplifying the process " "of restoring that option." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:171 msgid "" "The <command>svn</command> command-line client never attempts to write to " "the Windows Registry and will not attempt to create a default configuration " "area there. You can create the keys you need using the <command>REGEDIT</" "command> program. Alternatively, you can create a <filename>.reg</filename> " "file (such as the one in <xref linkend=\"svn.advanced.confarea.windows-" "registry.ex-1\" />), and then double-click on that file's icon in the " "Explorer shell, which will cause the data to be merged into your Registry." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch07-customizing-svn.xml:183 msgid "Sample registration entries (.reg) file" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch07-customizing-svn.xml:185 #, no-wrap msgid "" "\n" "REGEDIT4\n" "\n" "[HKEY_LOCAL_MACHINE\\Software\\Tigris.org\\Subversion\\Servers\\groups]\n" "\n" "[HKEY_LOCAL_MACHINE\\Software\\Tigris.org\\Subversion\\Servers\\global]\n" "\"#http-proxy-host\"=\"\"\n" "\"#http-proxy-port\"=\"\"\n" "\"#http-proxy-username\"=\"\"\n" "\"#http-proxy-password\"=\"\"\n" "\"#http-proxy-exceptions\"=\"\"\n" "\"#http-timeout\"=\"0\"\n" "\"#http-compression\"=\"yes\"\n" "\"#neon-debug-mask\"=\"\"\n" "\"#ssl-authority-files\"=\"\"\n" "\"#ssl-trust-default-ca\"=\"\"\n" "\"#ssl-client-cert-file\"=\"\"\n" "\"#ssl-client-cert-password\"=\"\"\n" "\n" "[HKEY_CURRENT_USER\\Software\\Tigris.org\\Subversion\\Config\\auth]\n" "\"#store-passwords\"=\"yes\"\n" "\"#store-auth-creds\"=\"yes\"\n" "\n" "[HKEY_CURRENT_USER\\Software\\Tigris.org\\Subversion\\Config\\helpers]\n" "\"#editor-cmd\"=\"notepad\"\n" "\"#diff-cmd\"=\"\"\n" "\"#diff3-cmd\"=\"\"\n" "\"#diff3-has-program-arg\"=\"\"\n" "\n" "[HKEY_CURRENT_USER\\Software\\Tigris.org\\Subversion\\Config\\tunnels]\n" "\n" "[HKEY_CURRENT_USER\\Software\\Tigris.org\\Subversion\\Config\\miscellany]\n" "\"#global-ignores\"=\"*.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store\"\n" "\"#log-encoding\"=\"\"\n" "\"#use-commit-times\"=\"\"\n" "\"#no-unlock\"=\"\"\n" "\"#enable-auto-props\"=\"\"\n" "\n" "[HKEY_CURRENT_USER\\Software\\Tigris.org\\Subversion\\Config\\auto-props]\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:227 msgid "" "The previous example shows the contents of a <filename>.reg</filename> file, " "which contains some of the most commonly used configuration options and " "their default values. Note the presence of both system-wide (for network " "proxy-related options) and per-user settings (editor programs and password " "storage, among others). Also note that all the options are effectively " "commented out. You need only to remove the hash (<literal>#</literal>) " "character from the beginning of the option names and set the values as you " "desire." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:242 msgid "Configuration Options" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:246 msgid "" "In this section, we will discuss the specific runtime configuration options " "that Subversion currently supports." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch07-customizing-svn.xml:252 msgid "Servers" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:254 msgid "" "The <filename>servers</filename> file contains Subversion configuration " "options related to the network layers. There are two special section names " "in this file—<literal>groups</literal> and <literal>global</literal>. " "The <literal>groups</literal> section is essentially a cross-reference " "table. The keys in this section are the names of other sections in the " "file; their values are <firstterm>globs</firstterm>—textual tokens " "that possibly contain wildcard characters—that are compared against " "the hostnames of the machine to which Subversion requests are sent." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><programlisting> #: ../en/book/ch07-customizing-svn.xml:266 #, no-wrap msgid "" "\n" "[groups]\n" "beanie-babies = *.red-bean.com\n" "collabnet = svn.collab.net\n" "\n" "[beanie-babies]\n" "…\n" "\n" "[collabnet]\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:278 msgid "" "When Subversion is used over a network, it attempts to match the name of the " "server it is trying to reach with a group name under the <literal>groups</" "literal> section. If a match is made, Subversion then looks for a section " "in the <filename>servers</filename> file whose name is the matched group's " "name. From that section, it reads the actual network configuration settings." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:286 msgid "" "The <literal>global</literal> section contains the settings that are meant " "for all of the servers not matched by one of the globs under the " "<literal>groups</literal> section. The options available in this section " "are exactly the same as those that are valid for the other server sections " "in the file (except, of course, the special <literal>groups</literal> " "section), and are as follows:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:297 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-proxy-exceptions</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:299 msgid "" "This specifies a comma-separated list of patterns for repository hostnames " "that should be accessed directly, without using the proxy machine. The " "pattern syntax is the same as is used in the Unix shell for filenames. A " "repository hostname matching any of these patterns will not be proxied." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:308 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-proxy-host</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:310 msgid "" "This specifies the hostname of the proxy computer through which your HTTP-" "based Subversion requests must pass. It defaults to an empty value, which " "means that Subversion will not attempt to route HTTP requests through a " "proxy computer, and will instead attempt to contact the destination machine " "directly." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:319 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>http-proxy-port</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:321 msgid "" "This specifies the port number on the proxy host to use. It defaults to an " "empty value." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:326 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-proxy-username</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:328 msgid "" "This specifies the username to supply to the proxy machine. It defaults to " "an empty value." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:333 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-proxy-password</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:335 msgid "" "This specifies the password to supply to the proxy machine. It defaults to " "an empty value." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:340 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>http-timeout</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:342 msgid "" "This specifies the amount of time, in seconds, to wait for a server " "response. If you experience problems with a slow network connection causing " "Subversion operations to time out, you should increase the value of this " "option. The default value is <literal>0</literal>, which instructs the " "underlying HTTP library, Neon, to use its default timeout setting." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:353 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-compression</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:355 msgid "" "This specifies whether Subversion should attempt to compress network " "requests made to DAV-ready servers. The default value is <literal>yes</" "literal> (though compression will occur only if that capability is compiled " "into the network layer). Set this to <literal>no</literal> to disable " "compression, such as when debugging network transmissions." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:365 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>http-library</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:367 msgid "" "Subversion provides a pair of repository access modules that understand its " "WebDAV network protocol. The original one, which shipped with Subversion " "1.0, is <literal>libsvn_ra_neon</literal> (though back then it was called " "<literal>libsvn_ra_dav</literal>). Newer Subversion versions also provide " "<literal>libsvn_ra_serf</literal>, which uses a different underlying " "implementation and aims to support some of the newer HTTP concepts." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:377 msgid "" "At this point, <literal>libsvn_ra_serf</literal> is still considered " "experimental, though it appears to work in the common cases quite well. To " "encourage experimentation, Subversion provides the <literal>http-library</" "literal> runtime configuration option to allow users to specify (generally, " "or in a per-server-group fashion) which WebDAV access module they'd prefer " "to use—<literal>neon</literal> or <literal>serf</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:389 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>http-auth-types</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:391 msgid "" "This option is a semicolon-delimited list of authentication types supported " "by the Neon-based WebDAV repository access modules. Valid members of this " "list are <literal>basic</literal>, <literal>digest</literal>, and " "<literal>negotiate</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:400 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>neon-debug-mask</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:402 msgid "" "This is an integer mask that the underlying HTTP library, Neon, uses for " "choosing what type of debugging output to yield. The default value is " "<literal>0</literal>, which will silence all debugging output. For more " "information about how Subversion makes use of Neon, see <xref linkend=\"svn." "developer\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:411 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>ssl-authority-files</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:413 msgid "" "This is a semicolon-delimited list of paths to files containing certificates " "of the certificate authorities (or CAs) that are accepted by the Subversion " "client when accessing the repository over HTTPS." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:421 #, fuzzy #| msgid "<literal>svn+ssh://</literal>" msgid "<literal>ssl-trust-default-ca</literal>" msgstr "<literal>svn+ssh://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:423 msgid "" "Set this variable to <literal>yes</literal> if you want Subversion to " "automatically trust the set of default CAs that ship with OpenSSL." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:429 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>ssl-client-cert-file</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:431 msgid "" "If a host (or set of hosts) requires an SSL client certificate, you'll " "normally be prompted for a path to your certificate. By setting this " "variable to that same path, Subversion will be able to find your client " "certificate automatically without prompting you. There's no standard place " "to store your certificate on disk; Subversion will grab it from any path you " "specify." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:442 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>ssl-client-cert-password</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:444 msgid "" "If your SSL client certificate file is encrypted by a passphrase, Subversion " "will prompt you for the passphrase whenever the certificate is used. If you " "find this annoying (and don't mind storing the password in the " "<filename>servers</filename> file), you can set this variable to the " "certificate's passphrase. You won't be prompted anymore." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><title> #: ../en/book/ch07-customizing-svn.xml:459 msgid "Config" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:461 msgid "" "The <filename>config</filename> file contains the rest of the currently " "available Subversion runtime options—those not related to networking. " "There are only a few options in use as of this writing, but they are again " "grouped into sections in expectation of future additions." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:468 msgid "" "The <literal>auth</literal> section contains settings related to " "Subversion's authentication and authorization against the repository. It " "contains the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:474 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>store-passwords</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:476 msgid "" "This instructs Subversion to cache, or not to cache, passwords that are " "supplied by the user in response to server authentication challenges. The " "default value is <literal>yes</literal>. Set this to <literal>no</literal> " "to disable this on-disk password caching. You can override this option for " "a single instance of the <command>svn</command> command using the <option>--" "no-auth-cache</option> command-line parameter (for those subcommands that " "support it). For more information, see <xref linkend=\"svn.serverconfig." "netmodel.credcache\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:490 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>store-auth-creds</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:492 msgid "" "This setting is the same as <literal>store-passwords</literal>, except that " "it enables or disables on-disk caching of <emphasis>all</emphasis> " "authentication information: usernames, passwords, server certificates, and " "any other types of cacheable credentials." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:502 msgid "" "The <literal>helpers</literal> section controls which external applications " "Subversion uses to accomplish its tasks. Valid options in this section are:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:508 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>editor-cmd</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:510 msgid "" "This specifies the program Subversion will use to query the user for certain " "types of textual metadata or when interactively resolving conflicts. See " "<xref linkend=\"svn.advanced.externaleditors\"/> for more details on using " "external text editors with Subversion." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:519 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>diff-cmd</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:521 msgid "" "This specifies the absolute path of a differencing program, used when " "Subversion generates <quote>diff</quote> output (such as when using the " "<command>svn diff</command> command). By default, Subversion uses an " "internal differencing library—setting this option will cause it to " "perform this task using an external program. See <xref linkend=\"svn." "advanced.externaldifftools\"/> for more details on using such programs." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:533 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>diff3-cmd</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:535 msgid "" "This specifies the absolute path of a three-way differencing program. " "Subversion uses this program to merge changes made by the user with those " "received from the repository. By default, Subversion uses an internal " "differencing library—setting this option will cause it to perform this " "task using an external program. See <xref linkend=\"svn.advanced." "externaldifftools\"/> for more details on using such programs." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:547 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>diff3-has-program-arg</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:549 msgid "" "This flag should be set to <literal>true</literal> if the program specified " "by the <literal>diff3-cmd</literal> option accepts a <option>--diff-program</" "option> command-line parameter." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:557 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>merge-tool-cmd</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:559 msgid "" "This specifies the program that Subversion will use to perform three-way " "merge operations on your versioned files. See <xref linkend=\"svn.advanced." "externaldifftools\"/> for more details on using such programs." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:568 msgid "" "The <literal>tunnels</literal> section allows you to define new tunnel " "schemes for use with <command>svnserve</command> and <literal>svn://</" "literal> client connections. For more details, see <xref linkend=\"svn." "serverconfig.svnserve.sshauth\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote> #: ../en/book/ch07-customizing-svn.xml:574 msgid "" "The <literal>miscellany</literal> section is where everything that doesn't " "belong elsewhere winds up. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para><footnote><para> #: ../en/book/ch07-customizing-svn.xml:577 msgid "Anyone for potluck dinner?" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:578 msgid "</footnote> In this section, you can find:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:583 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>global-ignores</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:585 msgid "" "When running the <command>svn status</command> command, Subversion lists " "unversioned files and directories along with the versioned ones, annotating " "them with a <literal>?</literal> character (see <xref linkend=\"svn.tour." "cycle.examine.status\" />). Sometimes it can be annoying to see " "uninteresting, unversioned items—for example, object files that result " "from a program's compilation—in this display. The <literal>global-" "ignores</literal> option is a list of whitespace-delimited globs that " "describe the names of files and directories that Subversion should not " "display unless they are versioned. The default value is <literal>*.o *.lo *." "la #*# .*.rej *.rej .*~ *~ .#* .DS_Store</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:600 msgid "" "As well as <command>svn status</command>, the <command>svn add</command> and " "<command>svn import</command> commands also ignore files that match the list " "when they are scanning a directory. You can override this behavior for a " "single instance of any of these commands by explicitly specifying the " "filename, or by using the <option>--no-ignore</option> command-line flag." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:608 msgid "" "For information on finer-grained control of ignored items, see <xref linkend=" "\"svn.advanced.props.special.ignore\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:615 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>enable-auto-props</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:617 msgid "" "This instructs Subversion to automatically set properties on newly added or " "imported files. The default value is <literal>no</literal>, so set this to " "<literal>yes</literal> to enable this feature. The <literal>auto-props</" "literal> section of this file specifies which properties are to be set on " "which files." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:627 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>log-encoding</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:629 msgid "" "This variable sets the default character set encoding for commit log " "messages. It's a permanent form of the <option>--encoding</option> option " "(see <xref linkend=\"svn.ref.svn.sw\"/>). The Subversion repository stores " "log messages in UTF-8 and assumes that your log message is written using " "your operating system's native locale. You should specify a different " "encoding if your commit messages are written in any other encoding." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:642 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>use-commit-times</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:644 msgid "" "Normally your working copy files have timestamps that reflect the last time " "they were touched by any process, whether your own editor or some " "<command>svn</command> subcommand. This is generally convenient for people " "developing software, because build systems often look at timestamps as a way " "of deciding which files need to be recompiled." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:652 msgid "" "In other situations, however, it's sometimes nice for the working copy files " "to have timestamps that reflect the last time they were changed in the " "repository. The <command>svn export</command> command always places these " "<quote>last-commit timestamps</quote> on trees that it produces. By setting " "this config variable to <literal>yes</literal>, the <command>svn checkout</" "command>, <command>svn update</command>, <command>svn switch</command>, and " "<command>svn revert</command> commands will also set last-commit timestamps " "on files that they touch." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:668 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>mime-types-file</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:670 msgid "" "This option, new to Subversion 1.5, specifies the path of a MIME types " "mapping file, such as the <filename>mime.types</filename> file provided by " "the Apache HTTP Server. Subversion uses this file to assign MIME types to " "newly added or imported files. See <xref linkend=\"svn.advanced.props.auto" "\" /> and <xref linkend=\"svn.advanced.props.special.mime-type\" /> for more " "about Subversion's detection and use of file content types." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:683 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>preserved-conflict-file-exts</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:685 msgid "" "The value of this option is a space-delimited list of file extensions that " "Subversion should preserve when generating conflict filenames. By default, " "the list is empty. This option is new to Subversion 1.5." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:691 msgid "" "When Subversion detects conflicting file content changes, it defers " "resolution of those conflicts to the user. To assist in the resolution, " "Subversion keeps pristine copies of the various competing versions of the " "file in the working copy. By default, those conflict files have names " "constructed by appending to the original filename a custom extension such as " "<filename>.mine</filename> or <filename>.<replaceable>REV</replaceable></" "filename> (where <replaceable>REV</replaceable> is a revision number). A " "mild annoyance with this naming scheme is that on operating systems where a " "file's extension determines the default application used to open and edit " "that file, appending a custom extension prevents the file from being easily " "opened by its native application. For example, if the file " "<filename>ReleaseNotes.pdf</filename> was conflicted, the conflict files " "might be named <filename>ReleaseNotes.pdf.mine</filename> or " "<filename>ReleaseNotes.pdf.r4231</filename>. While your system might be " "configured to use Adobe's Acrobat Reader to open files whose extensions are " "<filename>.pdf</filename>, there probably isn't an application configured on " "your system to open all files whose extensions are <filename>.r4231</" "filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:718 msgid "" "You can fix this annoyance by using this configuration option, though. For " "files with one of the specified extensions, Subversion will append to the " "conflict file names the custom extension just as before, but then also " "reappend the file's original extension. Using the previous example, and " "assuming that <literal>pdf</literal> is one of the extensions configured in " "this list thereof, the conflict files generated for <filename>ReleaseNotes." "pdf</filename> would instead be named <filename>ReleaseNotes.pdf.mine.pdf</" "filename> and <filename>ReleaseNotes.pdf.r4231.pdf</filename>. Because each " "file ends in <filename>.pdf</filename>, the correct default application will " "be used to view them." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:737 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>interactive-conflicts</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:739 msgid "" "This is a Boolean option that specifies whether Subversion should try to " "resolve conflicts interactively. If its value is <literal>yes</literal> " "(which is the default value), Subversion will prompt the user for how to " "handle conflicts in the manner demonstrated in <xref linkend=\"svn.tour." "cycle.resolve\" />. Otherwise, it will simply flag the conflict and " "continue its operation, postponing resolution to a later time." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch07-customizing-svn.xml:752 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>no-unlock</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch07-customizing-svn.xml:754 msgid "" "This Boolean option corresponds to <command>svn commit</command>'s <option>--" "no-unlock</option> option, which tells Subversion not to release locks on " "files you've just committed. If this runtime option is set to <literal>yes</" "literal>, Subversion will never release locks automatically, leaving you to " "run <command>svn unlock</command> explicitly. It defaults to <literal>no</" "literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><para> #: ../en/book/ch07-customizing-svn.xml:768 msgid "" "The <literal>auto-props</literal> section controls the Subversion client's " "ability to automatically set properties on files when they are added or " "imported. It contains any number of key-value pairs in the format " "<literal>PATTERN = PROPNAME=PROPVALUE</literal>, where <literal>PATTERN</" "literal> is a file pattern that matches a set of filenames and the rest of " "the line is the property and its value. Multiple matches on a file will " "result in multiple propsets for that file; however, there is no guarantee " "that auto-props will be applied in the order in which they are listed in the " "config file, so you can't have one rule <quote>override</quote> another. " "You can find several examples of auto-props usage in the <filename>config</" "filename> file. Lastly, don't forget to set <literal>enable-auto-props</" "literal> to <literal>yes</literal> in the <literal>miscellany</literal> " "section if you want to enable auto-props." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch07-customizing-svn.xml:796 msgid "Localization" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:798 msgid "" "<firstterm>Localization</firstterm> is the act of making programs behave in " "a region-specific way. When a program formats numbers or dates in a way " "specific to your part of the world or prints messages (or accepts input) in " "your native language, the program is said to be <firstterm>localized</" "firstterm>. This section describes steps Subversion has made toward " "localization." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:808 msgid "Understanding Locales" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:810 msgid "" "Most modern operating systems have a notion of the <quote>current locale</" "quote>—that is, the region or country whose localization conventions " "are honored. These conventions—typically chosen by some runtime " "configuration mechanism on the computer—affect the way in which " "programs present data to the user, as well as the way in which they accept " "user input." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:818 msgid "" "On most Unix-like systems, you can check the values of the locale-related " "runtime configuration options by running the <command>locale</command> " "command:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch07-customizing-svn.xml:822 #, no-wrap msgid "" "\n" "$ locale\n" "LANG=\n" "LC_COLLATE=\"C\"\n" "LC_CTYPE=\"C\"\n" "LC_MESSAGES=\"C\"\n" "LC_MONETARY=\"C\"\n" "LC_NUMERIC=\"C\"\n" "LC_TIME=\"C\"\n" "LC_ALL=\"C\"\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:835 msgid "" "The output is a list of locale-related environment variables and their " "current values. In this example, the variables are all set to the default " "<literal>C</literal> locale, but users can set these variables to specific " "country/language code combinations. For example, if one were to set the " "<literal>LC_TIME</literal> variable to <literal>fr_CA</literal>, programs " "would know to present time and date information formatted according to a " "French-speaking Canadian's expectations. And if one were to set the " "<literal>LC_MESSAGES</literal> variable to <literal>zh_TW</literal>, " "programs would know to present human-readable messages in Traditional " "Chinese. Setting the <literal>LC_ALL</literal> variable has the effect of " "changing every locale variable to the same value. The value of " "<literal>LANG</literal> is used as a default value for any locale variable " "that is unset. To see the list of available locales on a Unix system, run " "the command <userinput>locale -a</userinput>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:854 msgid "" "On Windows, locale configuration is done via the <quote>Regional and " "Language Options</quote> control panel item. There you can view and select " "the values of individual settings from the available locales, and even " "customize (at a sickening level of detail) several of the display formatting " "conventions." msgstr "" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:865 #, fuzzy #| msgid "Subversion's Components" msgid "Subversion's Use of Locales" msgstr "Die Komponenten von Subversion" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:867 msgid "" "The Subversion client, <command>svn</command>, honors the current locale " "configuration in two ways. First, it notices the value of the " "<literal>LC_MESSAGES</literal> variable and attempts to print all messages " "in the specified language. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch07-customizing-svn.xml:873 #, no-wrap msgid "" "\n" "$ export LC_MESSAGES=de_DE\n" "$ svn help cat\n" "cat: Gibt den Inhalt der angegebenen Dateien oder URLs aus.\n" "Aufruf: cat ZIEL[@REV]...\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:881 msgid "" "This behavior works identically on both Unix and Windows systems. Note, " "though, that while your operating system might have support for a certain " "locale, the Subversion client still may not be able to speak the particular " "language. In order to produce localized messages, human volunteers must " "provide translations for each language. The translations are written using " "the GNU gettext package, which results in translation modules that end with " "the <filename>.mo</filename> filename extension. For example, the German " "translation file is named <filename>de.mo</filename>. These translation " "files are installed somewhere on your system. On Unix, they typically live " "in <filename>/usr/share/locale/</filename>, while on Windows they're often " "found in the <filename>\\share\\locale\\</filename> folder in Subversion's " "installation area. Once installed, a module is named after the program for " "which it provides translations. For example, the <filename>de.mo</filename> " "file may ultimately end up installed as <filename>/usr/share/locale/de/" "LC_MESSAGES/subversion.mo</filename>. By browsing the installed <filename>." "mo</filename> files, you can see which languages the Subversion client is " "able to speak." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:904 msgid "" "The second way in which the locale is honored involves how <command>svn</" "command> interprets your input. The repository stores all paths, filenames, " "and log messages in Unicode, encoded as UTF-8. In that sense, the " "repository is <firstterm>internationalized</firstterm>—that is, the " "repository is ready to accept input in any human language. This means, " "however, that the Subversion client is responsible for sending only UTF-8 " "filenames and log messages into the repository. To do this, it must convert " "the data from the native locale into UTF-8." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:915 msgid "" "For example, suppose you create a file named <filename>caffè.txt</filename>, " "and then when committing the file, you write the log message as " "<quote>Adesso il caffè è più forte.</quote> Both the filename and the log " "message contain non-ASCII characters, but because your locale is set to " "<literal>it_IT</literal>, the Subversion client knows to interpret them as " "Italian. It uses an Italian character set to convert the data to UTF-8 " "before sending it off to the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:925 msgid "" "Note that while the repository demands UTF-8 filenames and log messages, it " "<emphasis>does not</emphasis> pay attention to file contents. Subversion " "treats file contents as opaque strings of bytes, and neither client nor " "server makes an attempt to understand the character set or encoding of the " "contents." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch07-customizing-svn.xml:933 msgid "Character Set Conversion Errors" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch07-customizing-svn.xml:935 msgid "" "While using Subversion, you might get hit with an error related to character " "set conversions:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><screen> #: ../en/book/ch07-customizing-svn.xml:938 #, no-wrap msgid "" "\n" "svn: Can't convert string from native encoding to 'UTF-8':\n" "…\n" "svn: Can't convert string from 'UTF-8' to native encoding:\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch07-customizing-svn.xml:945 msgid "" "Errors such as this typically occur when the Subversion client has received " "a UTF-8 string from the repository, but not all of the characters in that " "string can be represented using the encoding of the current locale. For " "example, if your locale is <literal>en_US</literal> but a collaborator has " "committed a Japanese filename, you're likely to see this error when you " "receive the file during an <command>svn update</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch07-customizing-svn.xml:954 msgid "" "The solution is either to set your locale to something that <emphasis>can</" "emphasis> represent the incoming UTF-8 data, or to change the filename or " "log message in the repository. (And don't forget to slap your " "collaborator's hand—projects should decide on common languages ahead " "of time so that all participants are using the same locale.)" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch07-customizing-svn.xml:971 msgid "Using External Editors" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:973 msgid "" "The most obvious way to get data into Subversion is through the addition of " "files to version control, committing changes to those files, and so on. But " "other pieces of information besides merely versioned file data live in your " "Subversion repository. Some of these bits of information—commit log " "messages, lock comments, and some property values—tend to be textual " "in nature and are provided explicitly by users. Most of this information " "can be provided to the Subversion command-line client using the <option>--" "message</option> (<option>-m</option>) and <option>--file</option> (<option>-" "F</option>) options with the appropriate subcommands." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:986 msgid "" "Each of these options has its pros and cons. For example, when performing a " "commit, <option>--file</option> (<option>-F</option>) works well if you've " "already prepared a text file that holds your commit log message. If you " "didn't, though, you can use <option>--message</option> (<option>-m</option>) " "to provide a log message on the command line. Unfortunately, it can be " "tricky to compose anything more than a simple one-line message on the " "command line. Users want more flexibility—multiline, free-form log " "message editing on demand." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:997 msgid "" "Subversion supports this by allowing you to specify an external text editor " "that it will launch as necessary to give you a more powerful input mechanism " "for this textual metadata. There are several ways to tell Subversion which " "editor you'd like use. Subversion checks the following things, in the order " "specified, when it wants to launch such an editor:" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1007 msgid "<literal>--editor-cmd</literal> command-line option" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1010 msgid "<literal>SVN_EDITOR</literal> environment variable" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1013 msgid "<literal>editor-cmd</literal> runtime configuration option" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1016 msgid "<literal>VISUAL</literal> environment variable" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1019 msgid "<literal>EDITOR</literal> environment variable" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch07-customizing-svn.xml:1022 msgid "" "Possibly, a fallback value built into the Subversion libraries (not present " "in the official builds)" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1027 msgid "" "The value of any of these options or variables is the beginning of a command " "line to be executed by the shell. Subversion appends to that command line a " "space and the pathname of a temporary file to be edited. So, to be used " "with Subversion, the configured or specified editor needs to support an " "invocation in which its last command-line parameter is a file to be edited, " "and it should be able to save the file in place and return a zero exit code " "to indicate success." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1036 msgid "" "As noted, external editors can be used to provide commit log messages to any " "of the committing subcommands (such as <command>svn commit</command> or " "<command>import</command>, <command>svn mkdir</command> or <command>delete</" "command> when provided a URL target, etc.), and Subversion will try to " "launch the editor automatically if you don't specify either of the <option>--" "message</option> (<option>-m</option>) or <option>--file</option> (<option>-" "F</option>) options. The <command>svn propedit</command> command is built " "almost entirely around the use of an external editor. And beginning in " "version 1.5, Subversion will also use the configured external text editor " "when the user asks it to launch an editor during interactive conflict " "resolution. Oddly, there doesn't appear to be a way to use external editors " "to interactively provide lock comments." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch07-customizing-svn.xml:1058 msgid "Using External Differencing and Merge Tools" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1060 msgid "" "The interface between Subversion and external two- and three-way " "differencing tools harkens back to a time when Subversion's only contextual " "differencing capabilities were built around invocations of the GNU diffutils " "toolchain, specifically the <command>diff</command> and <command>diff3</" "command> utilities. To get the kind of behavior Subversion needed, it " "called these utilities with more than a handful of options and parameters, " "most of which were quite specific to the utilities. Some time later, " "Subversion grew its own internal differencing library, and as a failover " "mechanism, the <option>--diff-cmd</option> and <option>--diff3-cmd</option> " "options were added to the Subversion command-line client so that users could " "more easily indicate that they preferred to use the GNU diff and diff3 " "utilities instead of the newfangled internal diff library. If those options " "were used, Subversion would simply ignore the internal diff library, and " "fall back to running those external programs, lengthy argument lists and " "all. And that's where things remain today." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1079 msgid "" "It didn't take long for folks to realize that having such easy configuration " "mechanisms for specifying that Subversion should use the external GNU diff " "and diff3 utilities located at a particular place on the system could be " "applied toward the use of other differencing tools, too. After all, " "Subversion didn't actually verify that the things it was being told to run " "were members of the GNU diffutils toolchain. But the only configurable " "aspect of using those external tools is their location on the system—" "not the option set, parameter order, and so on. Subversion continues to " "throw all those GNU utility options at your external diff tool regardless of " "whether that program can understand those options. And that's where things " "get unintuitive for most users." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1093 msgid "" "The key to using external two- and three-way differencing tools (other than " "GNU diff and diff3, of course) with Subversion is to use wrapper scripts, " "which convert the input from Subversion into something that your " "differencing tool can understand, and then to convert the output of your " "tool back into a format that Subversion expects—the format that the " "GNU tools would have used. The following sections cover the specifics of " "those expectations." msgstr "" # type: Content of: <chapter><sect1><note><para> #: ../en/book/ch07-customizing-svn.xml:1103 msgid "" "The decision on when to fire off a contextual two- or three-way diff as part " "of a larger Subversion operation is made entirely by Subversion and is " "affected by, among other things, whether the files being operated on are " "human-readable as determined by their <literal>svn:mime-type</literal> " "property. This means, for example, that even if you had the niftiest " "Microsoft Word-aware differencing or merging tool in the universe, it would " "never be invoked by Subversion as long as your versioned Word documents had " "a configured MIME type that denoted that they were not human-readable (such " "as <literal>application/msword</literal>). For more about MIME type " "settings, see <xref linkend=\"svn.advanced.props.special.mime-type\"/>" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1118 msgid "" "Subversion 1.5 introduces interactive resolution of conflicts (described in " "<xref linkend=\"svn.tour.cycle.resolve\" />), and one of the options " "provided to users is the ability to launch a third-party merge tool. If " "this action is taken, Subversion will consult the <literal>merge-tool-cmd</" "literal> runtime configuration option to find the name of an external merge " "tool and, upon finding one, will launch that tool with the appropriate input " "files. This differs from the configurable three-way differencing tool in a " "couple of ways. First, the differencing tool is always used to handle three-" "way differences, whereas the merge tool is employed only when three-way " "difference application has detected a conflict. Second, the interface is " "much cleaner—your configured merge tool need only accept as command-" "line parameters four path specifications: the base file, the <quote>theirs</" "quote> file (which contains upstream changes), the <quote>mine</quote> file " "(which contains local modifications), and the path of the file where the " "final resolved contents should be stored." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:1139 msgid "External diff" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch07-customizing-svn.xml:1141 msgid "" "Subversion calls external diff programs with parameters suitable for the GNU " "diff utility, and expects only that the external program will return with a " "successful error code. For most alternative diff programs, only the sixth " "and seventh arguments—the paths of the files that represent the left " "and right sides of the diff, respectively—are of interest. Note that " "Subversion runs the diff program once per modified file covered by the " "Subversion operation, so if your program runs in an asynchronous fashion (or " "is <quote>backgrounded</quote>), you might have several instances of it all " "running simultaneously. Finally, Subversion expects that your program " "return an error code of 1 if your program detected differences, or 0 if it " "did not—any other error code is considered a fatal error. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch07-customizing-svn.xml:1156 msgid "" "The GNU diff manual page puts it this way: <quote>An exit status of 0 means " "no differences were found, 1 means some differences were found, and 2 means " "trouble.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:1162 msgid "" "<xref linkend=\"svn.advanced.externaldifftools.diff.ex-1\"/> and <xref " "linkend=\"svn.advanced.externaldifftools.diff.ex-2\"/> are templates for " "external diff tool wrappers in the Python and Windows batch scripting " "languages, respectively." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch07-customizing-svn.xml:1168 msgid "diffwrap.py" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch07-customizing-svn.xml:1169 #, no-wrap msgid "" "\n" "#!/usr/bin/env python\n" "import sys\n" "import os\n" "\n" "# Configure your favorite diff program here.\n" "DIFF = \"/usr/local/bin/my-diff-tool\"\n" "\n" "# Subversion provides the paths we need as the last two parameters.\n" "LEFT = sys.argv[-2]\n" "RIGHT = sys.argv[-1]\n" "\n" "# Call the diff command (change the following line to make sense for\n" "# your diff program).\n" "cmd = [DIFF, '--left', LEFT, '--right', RIGHT]\n" "os.execv(cmd[0], cmd)\n" "\n" "# Return an errorcode of 0 if no differences were detected, 1 if some were.\n" "# Any other errorcode will be treated as fatal.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch07-customizing-svn.xml:1192 msgid "diffwrap.bat" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch07-customizing-svn.xml:1193 #, no-wrap msgid "" "\n" "@ECHO OFF\n" "\n" "REM Configure your favorite diff program here.\n" "SET DIFF=\"C:\\Program Files\\Funky Stuff\\My Diff Tool.exe\"\n" "\n" "REM Subversion provides the paths we need as the last two parameters.\n" "REM These are parameters 6 and 7 (unless you use svn diff -x, in\n" "REM which case, all bets are off).\n" "SET LEFT=%6\n" "SET RIGHT=%7\n" "\n" "REM Call the diff command (change the following line to make sense for\n" "REM your diff program).\n" "%DIFF% --left %LEFT% --right %RIGHT%\n" "\n" "REM Return an errorcode of 0 if no differences were detected, 1 if some were.\n" "REM Any other errorcode will be treated as fatal.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch07-customizing-svn.xml:1217 msgid "External diff3" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:1219 msgid "" "Subversion calls external merge programs with parameters suitable for the " "GNU diff3 utility, expecting that the external program will return with a " "successful error code and that the full file contents that result from the " "completed merge operation are printed on the standard output stream (so that " "Subversion can redirect them into the appropriate version-controlled file). " "For most alternative merge programs, only the ninth, tenth, and eleventh " "arguments, the paths of the files which represent the <quote>mine,</quote> " "<quote>older,</quote> and <quote>yours</quote> inputs, respectively, are of " "interest. Note that because Subversion depends on the output of your merge " "program, your wrapper script must not exit before that output has been " "delivered to Subversion. When it finally does exit, it should return an " "error code of 0 if the merge was successful, or 1 if unresolved conflicts " "remain in the output—any other error code is considered a fatal error." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch07-customizing-svn.xml:1237 msgid "" "<xref linkend=\"svn.advanced.externaldifftools.diff3.ex-1\"/> and <xref " "linkend=\"svn.advanced.externaldifftools.diff3.ex-2\"/> are templates for " "external merge tool wrappers in the Python and Windows batch scripting " "languages, respectively." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch07-customizing-svn.xml:1243 msgid "diff3wrap.py" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch07-customizing-svn.xml:1244 #, no-wrap msgid "" "\n" "#!/usr/bin/env python\n" "import sys\n" "import os\n" "\n" "# Configure your favorite diff program here.\n" "DIFF3 = \"/usr/local/bin/my-merge-tool\"\n" "\n" "# Subversion provides the paths we need as the last three parameters.\n" "MINE = sys.argv[-3]\n" "OLDER = sys.argv[-2]\n" "YOURS = sys.argv[-1]\n" "\n" "# Call the merge command (change the following line to make sense for\n" "# your merge program).\n" "cmd = [DIFF3, '--older', OLDER, '--mine', MINE, '--yours', YOURS]\n" "os.execv(cmd[0], cmd)\n" "\n" "# After performing the merge, this script needs to print the contents\n" "# of the merged file to stdout. Do that in whatever way you see fit.\n" "# Return an errorcode of 0 on successful merge, 1 if unresolved conflicts\n" "# remain in the result. Any other errorcode will be treated as fatal.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch07-customizing-svn.xml:1270 msgid "diff3wrap.bat" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch07-customizing-svn.xml:1271 #, no-wrap msgid "" "\n" "@ECHO OFF\n" "\n" "REM Configure your favorite diff3/merge program here.\n" "SET DIFF3=\"C:\\Program Files\\Funky Stuff\\My Merge Tool.exe\"\n" "\n" "REM Subversion provides the paths we need as the last three parameters.\n" "REM These are parameters 9, 10, and 11. But we have access to only\n" "REM nine parameters at a time, so we shift our nine-parameter window\n" "REM twice to let us get to what we need.\n" "SHIFT\n" "SHIFT\n" "SET MINE=%7\n" "SET OLDER=%8\n" "SET YOURS=%9\n" "\n" "REM Call the merge command (change the following line to make sense for\n" "REM your merge program).\n" "%DIFF3% --older %OLDER% --mine %MINE% --yours %YOURS%\n" "\n" "REM After performing the merge, this script needs to print the contents\n" "REM of the merged file to stdout. Do that in whatever way you see fit.\n" "REM Return an errorcode of 0 on successful merge, 1 if unresolved conflicts\n" "REM remain in the result. Any other errorcode will be treated as fatal.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1307 msgid "" "Sometimes there's a single right way to do things; sometimes there are " "many. Subversion's developers understand that while the majority of its " "exact behaviors are acceptable to most of its users, there are some corners " "of its functionality where such a universally pleasing approach doesn't " "exist. In those places, Subversion offers users the opportunity to tell it " "how <emphasis>they</emphasis> want it to behave." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch07-customizing-svn.xml:1315 msgid "" "In this chapter, we explored Subversion's runtime configuration system and " "other mechanisms by which users can control those configurable behaviors. " "If you are a developer, though, the next chapter will take you one step " "further. It describes how you can further customize your Subversion " "experience by writing your own software against Subversion's libraries." msgstr "" # type: Content of: <preface><sect1><sect2><para><indexterm><primary> #: ../en/book/ch08-embedding-svn.xml:2 #, fuzzy #| msgid "Subversion" msgid "Embedding Subversion" msgstr "Subversion" # type: Content of: <chapter><para> #: ../en/book/ch08-embedding-svn.xml:4 msgid "" "Subversion has a modular design: it's implemented as a collection of " "libraries written in C. Each library has a well-defined purpose and " "application programming interface (API), and that interface is available not " "only for Subversion itself to use, but for any software that wishes to embed " "or otherwise programmatically control Subversion. Additionally, " "Subversion's API is available not only to other C programs, but also to " "programs written in higher-level languages such as Python, Perl, Java, and " "Ruby." msgstr "" # type: Content of: <chapter><para> #: ../en/book/ch08-embedding-svn.xml:14 msgid "" "This chapter is for those who wish to interact with Subversion through its " "public API or its various language bindings. If you wish to write robust " "wrapper scripts around Subversion functionality to simplify your own life, " "are trying to develop more complex integrations between Subversion and other " "pieces of software, or just have an interest in Subversion's various library " "modules and what they offer, this chapter is for you. If, however, you " "don't foresee yourself participating with Subversion at such a level, feel " "free to skip this chapter with the confidence that your experience as a " "Subversion user will not be affected." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch08-embedding-svn.xml:30 msgid "Layered Library Design" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:32 msgid "" "Each of Subversion's core libraries can be said to exist in one of three " "main layers—the Repository layer, the Repository Access (RA) layer, or " "the Client layer (see <xref linkend=\"svn.intro.architecture.dia-1\" /> in " "the Preface). We will examine these layers shortly, but first, let's " "briefly summarize Subversion's various libraries. For the sake of " "consistency, we will refer to the libraries by their extensionless Unix " "library names (<filename>libsvn_fs</filename>, <filename>libsvn_wc</" "filename>, <filename>mod_dav_svn</filename>, etc.)." msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:44 msgid "libsvn_client" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:45 msgid "Primary interface for client programs" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:49 msgid "libsvn_delta" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:50 msgid "Tree and byte-stream differencing routines" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:54 msgid "libsvn_diff" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:55 msgid "Contextual differencing and merging routines" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:59 msgid "libsvn_fs" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:60 msgid "Filesystem commons and module loader" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:64 msgid "libsvn_fs_base" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:65 msgid "The Berkeley DB filesystem backend" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:69 msgid "libsvn_fs_fs" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:70 msgid "The native filesystem (FSFS) backend" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:74 msgid "libsvn_ra" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:75 msgid "Repository Access commons and module loader" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:79 msgid "libsvn_ra_local" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><title> #: ../en/book/ch08-embedding-svn.xml:80 #, fuzzy #| msgid "Repository access URLs" msgid "The local Repository Access module" msgstr "Repository-Zugriffs-URLs" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:84 msgid "libsvn_ra_neon" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:85 msgid "The WebDAV Repository Access module" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:89 msgid "libsvn_ra_serf" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:90 msgid "Another (experimental) WebDAV Repository Access module" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:94 msgid "libsvn_ra_svn" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:95 msgid "The custom protocol Repository Access module" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:99 msgid "libsvn_repos" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><title> #: ../en/book/ch08-embedding-svn.xml:100 #, fuzzy #| msgid "Repository access URLs" msgid "Repository interface" msgstr "Repository-Zugriffs-URLs" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:103 msgid "libsvn_subr" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:104 msgid "Miscellaneous helpful subroutines" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:108 msgid "libsvn_wc" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:109 msgid "The working copy management library" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch08-embedding-svn.xml:113 ../en/book/ch09-reference.xml:9009 #, fuzzy #| msgid "mod_dav_svn" msgid "mod_authz_svn" msgstr "mod_dav_svn" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:114 msgid "" "Apache authorization module for Subversion repositories access via WebDAV" msgstr "" # type: Content of: <chapter><sect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch08-embedding-svn.xml:119 msgid "Apache module for mapping WebDAV operations to Subversion ones" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:124 msgid "" "The fact that the word <quote>miscellaneous</quote> appears only once in the " "previous list is a good sign. The Subversion development team is serious " "about making sure that functionality lives in the right layer and " "libraries. Perhaps the greatest advantage of the modular design is its lack " "of complexity from a developer's point of view. As a developer, you can " "quickly formulate that kind of <quote>big picture</quote> that allows you to " "pinpoint the location of certain pieces of functionality with relative ease." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:134 msgid "" "Another benefit of modularity is the ability to replace a given module with " "a whole new library that implements the same API without affecting the rest " "of the code base. In some sense, this happens within Subversion already. " "The <filename>libsvn_ra_local</filename>, <filename>libsvn_ra_neon</" "filename>, <filename>libsvn_ra_serf</filename>, and <filename>libsvn_ra_svn</" "filename> libraries each implement the same interface, all working as plug-" "ins to <filename>libsvn_ra</filename>. And all four communicate with the " "Repository layer—<filename>libsvn_ra_local</filename> connects to the " "repository directly; the other three do so over a network. The " "<filename>libsvn_fs_base</filename> and <filename>libsvn_fs_fs</filename> " "libraries are another pair of libraries that implement the same " "functionality in different ways—both are plug-ins to the common " "<filename>libsvn_fs</filename> library." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:152 msgid "" "The client itself also highlights the benefits of modularity in the " "Subversion design. Subversion's <filename>libsvn_client</filename> library " "is a one-stop shop for most of the functionality necessary for designing a " "working Subversion client (see <xref linkend=\"svn.developer.layerlib.client" "\"/>). So while the Subversion distribution provides only the <command>svn</" "command> command-line client program, several third-party programs provide " "various forms of graphical client UIs. These GUIs use the same APIs that " "the stock command-line client does. This type of modularity has played a " "large role in the proliferation of available Subversion clients and IDE " "integrations and, by extension, to the tremendous adoption rate of " "Subversion itself." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch08-embedding-svn.xml:169 #, fuzzy #| msgid "Repository URLs" msgid "Repository Layer" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:171 msgid "" "When referring to Subversion's Repository layer, we're generally talking " "about two basic concepts—the versioned filesystem implementation " "(accessed via <filename>libsvn_fs</filename>, and supported by its " "<filename>libsvn_fs_base</filename> and <filename>libsvn_fs_fs</filename> " "plug-ins), and the repository logic that wraps it (as implemented in " "<filename>libsvn_repos</filename>). These libraries provide the storage and " "reporting mechanisms for the various revisions of your version-controlled " "data. This layer is connected to the Client layer via the Repository Access " "layer, and is, from the perspective of the Subversion user, the stuff at the " "<quote>other end of the line.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:185 msgid "" "The Subversion filesystem is not a kernel-level filesystem that one would " "install in an operating system (such as the Linux ext2 or NTFS), but instead " "is a virtual filesystem. Rather than storing <quote>files</quote> and " "<quote>directories</quote> as real files and directories (the kind you can " "navigate through using your favorite shell program), it uses one of two " "available abstract storage backends—either a Berkeley DB database " "environment or a flat-file representation. (To learn more about the two " "repository backends, see <xref linkend=\"svn.reposadmin.basics.backends\"/" ">.) There has even been considerable interest by the development community " "in giving future releases of Subversion the ability to use other backend " "database systems, perhaps through a mechanism such as Open Database " "Connectivity (ODBC). In fact, Google did something similar to this before " "launching the Google Code Project Hosting service: they announced in mid-" "2006 that members of its open source team had written a new proprietary " "Subversion filesystem plug-in that used Google's ultra-scalable Bigtable " "database for its storage." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:206 msgid "" "The filesystem API exported by <filename>libsvn_fs</filename> contains the " "kinds of functionality you would expect from any other filesystem API—" "you can create and remove files and directories, copy and move them around, " "modify file contents, and so on. It also has features that are not quite as " "common, such as the ability to add, modify, and remove metadata " "(<quote>properties</quote>) on each file or directory. Furthermore, the " "Subversion filesystem is a versioning filesystem, which means that as you " "make changes to your directory tree, Subversion remembers what your tree " "looked like before those changes. And before the previous changes. And the " "previous ones. And so on, all the way back through versioning time to (and " "just beyond) the moment you first started adding things to the filesystem." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:222 msgid "" "All the modifications you make to your tree are done within the context of a " "Subversion commit transaction. The following is a simplified general " "routine for modifying your filesystem:" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch08-embedding-svn.xml:229 #, fuzzy #| msgid "Subversion in Action" msgid "Begin a Subversion commit transaction." msgstr "Subversion in Action" # type: Content of: <chapter><sect1><sect2><orderedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:232 msgid "Make your changes (adds, deletes, property modifications, etc.)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:236 #, fuzzy #| msgid "Commit your changes." msgid "Commit your transaction." msgstr "Bringen Sie Ihre Änderungen ins Repository." # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:240 msgid "" "Once you have committed your transaction, your filesystem modifications are " "permanently stored as historical artifacts. Each of these cycles generates " "a single new revision of your tree, and each revision is forever accessible " "as an immutable snapshot of <quote>the way things were.</quote>" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch08-embedding-svn.xml:247 msgid "The Transaction Distraction" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:249 msgid "" "The notion of a Subversion transaction can become easily confused with the " "transaction support provided by the underlying database itself, especially " "given the former's close proximity to the Berkeley DB database code in " "<filename>libsvn_fs_base</filename>. Both types of transaction exist to " "provide atomicity and isolation. In other words, transactions give you the " "ability to perform a set of actions in an all-or-nothing fashion—" "either all the actions in the set complete with success, or they all get " "treated as though <emphasis>none</emphasis> of them ever happened—and " "in a way that does not interfere with other processes acting on the data." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:262 msgid "" "Database transactions generally encompass small operations related " "specifically to the modification of data in the database itself (such as " "changing the contents of a table row). Subversion transactions are larger " "in scope, encompassing higher-level operations such as making modifications " "to a set of files and directories that are intended to be stored as the next " "revision of the filesystem tree. If that isn't confusing enough, consider " "the fact that Subversion uses a database transaction during the creation of " "a Subversion transaction (so that if the creation of a Subversion " "transaction fails, the database will look as though we had never attempted " "that creation in the first place)!" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:276 msgid "" "Fortunately for users of the filesystem API, the transaction support " "provided by the database system itself is hidden almost entirely from view " "(as should be expected from a properly modularized library scheme). It is " "only when you start digging into the implementation of the filesystem itself " "that such things become visible (or interesting)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:286 msgid "" "Most of the functionality the filesystem interface provides deals with " "actions that occur on individual filesystem paths. That is, from outside " "the filesystem, the primary mechanism for describing and accessing the " "individual revisions of files and directories comes through the use of path " "strings such as <filename>/foo/bar</filename>, just as though you were " "addressing files and directories through your favorite shell program. You " "add new files and directories by passing their paths-to-be to the right API " "functions. You query for information about them by the same mechanism." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:297 msgid "" "Unlike most filesystems, though, a path alone is not enough information to " "identify a file or directory in Subversion. Think of a directory tree as a " "two-dimensional system, where a node's siblings represent a sort of left-and-" "right motion, and navigating into the node's subdirectories represents a " "downward motion. <xref linkend=\"svn.developer.layerlib.repos.dia-1\"/> " "shows a typical representation of a tree as exactly that." msgstr "" # type: Content of: <chapter><sect1><sect2><figure><title> #: ../en/book/ch08-embedding-svn.xml:307 msgid "Files and directories in two dimensions" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch08-embedding-svn.xml:311 msgid "" "The difference here is that the Subversion filesystem has a nifty third " "dimension that most filesystems do not have—Time! <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch08-embedding-svn.xml:315 msgid "" "We understand that this may come as a shock to sci-fi fans who have long " "been under the impression that Time was actually the <emphasis>fourth</" "emphasis> dimension, and we apologize for any emotional trauma induced by " "our assertion of a different theory." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:320 msgid "" "</footnote> In the filesystem interface, nearly every function that has a " "<parameter>path</parameter> argument also expects a <parameter>root</" "parameter> argument. This <literal>svn_fs_root_t</literal> argument " "describes either a revision or a Subversion transaction (which is simply a " "revision in the making) and provides that third dimension of context needed " "to understand the difference between <filename>/foo/bar</filename> in " "revision 32, and the same path as it exists in revision 98. <xref linkend=" "\"svn.developer.layerlib.repos.dia-2\"/> shows revision history as an added " "dimension to the Subversion filesystem universe." msgstr "" # type: Content of: <chapter><sect1><sect2><figure><title> #: ../en/book/ch08-embedding-svn.xml:335 msgid "Versioning time—the third dimension!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:339 msgid "" "As we mentioned earlier, the <filename>libsvn_fs</filename> API looks and " "feels like any other filesystem, except that it has this wonderful " "versioning capability. It was designed to be usable by any program " "interested in a versioning filesystem. Not coincidentally, Subversion " "itself is interested in that functionality. But while the filesystem API " "should be sufficient for basic file and directory versioning support, " "Subversion wants more—and that is where <filename>libsvn_repos</" "filename> comes in." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:350 msgid "" "The Subversion repository library (<filename>libsvn_repos</filename>) sits " "(logically speaking) atop the <filename>libsvn_fs</filename> API, providing " "additional functionality beyond that of the underlying versioned filesystem " "logic. It does not completely wrap each and every filesystem function—" "only certain major steps in the general cycle of filesystem activity are " "wrapped by the repository interface. Some of these include the creation and " "commit of Subversion transactions and the modification of revision " "properties. These particular events are wrapped by the repository layer " "because they have hooks associated with them. A repository hook system is " "not strictly related to implementing a versioning filesystem, so it lives in " "the repository wrapper library." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:365 msgid "" "The hooks mechanism is but one of the reasons for the abstraction of a " "separate repository library from the rest of the filesystem code. The " "<filename>libsvn_repos</filename> API provides several other important " "utilities to Subversion. These include the abilities to:" msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:373 msgid "" "Create, open, destroy, and perform recovery steps on a Subversion repository " "and the filesystem included in that repository." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:378 msgid "Describe the differences between two filesystem trees." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:382 msgid "" "Query for the commit log messages associated with all (or some) of the " "revisions in which a set of files was modified in the filesystem." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:387 msgid "" "Generate a human-readable <quote>dump</quote> of the filesystem—a " "complete representation of the revisions in the filesystem." msgstr "" # type: Content of: <chapter><sect1><sect2><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:392 msgid "" "Parse that dump format, loading the dumped revisions into a different " "Subversion repository." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:397 msgid "" "As Subversion continues to evolve, the repository library will grow with the " "filesystem library to offer increased functionality and configurable option " "support." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><title> #: ../en/book/ch08-embedding-svn.xml:405 #, fuzzy #| msgid "Repository access URLs" msgid "Repository Access Layer" msgstr "Repository-Zugriffs-URLs" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:407 msgid "" "If the Subversion Repository layer is at <quote>the other end of the line,</" "quote> the Repository Access (RA) layer is the line itself. Charged with " "marshaling data between the client libraries and the repository, this layer " "includes the <filename>libsvn_ra</filename> module loader library, the RA " "modules themselves (which currently includes <filename>libsvn_ra_neon</" "filename>, <filename>libsvn_ra_local</filename>, <filename>libsvn_ra_serf</" "filename>, and <filename>libsvn_ra_svn</filename>), and any additional " "libraries needed by one or more of those RA modules (such as the " "<filename>mod_dav_svn</filename> Apache module or <filename>libsvn_ra_svn</" "filename>'s server, <command>svnserve</command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:422 msgid "" "Since Subversion uses URLs to identify its repository resources, the " "protocol portion of the URL scheme (usually <literal>file://</literal>, " "<literal>http://</literal>, <literal>https://</literal>, <literal>svn://</" "literal>, or <literal>svn+ssh://</literal>) is used to determine which RA " "module will handle the communications. Each module registers a list of the " "protocols it knows how to <quote>speak</quote> so that the RA loader can, at " "runtime, determine which module to use for the task at hand. You can " "determine which RA modules are available to the Subversion command-line " "client, and what protocols they claim to support, by running <userinput>svn " "--version</userinput>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch08-embedding-svn.xml:435 #, no-wrap msgid "" "\n" "$ svn --version\n" "svn, version 1.5.0 (r31699)\n" " compiled Jun 18 2008, 09:57:36\n" "\n" "Copyright (C) 2000-2008 CollabNet.\n" "Subversion is open source software, see http://subversion.tigris.org/\n" "This product includes software developed by CollabNet (http://www.Collab.Net/).\n" "\n" "The following repository access (RA) modules are available:\n" "\n" "* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.\n" " - handles 'http' scheme\n" " - handles 'https' scheme\n" "* ra_svn : Module for accessing a repository using the svn network protocol.\n" " - handles 'svn' scheme\n" "* ra_local : Module for accessing a repository on local disk.\n" " - handles 'file' scheme\n" "* ra_serf : Module for accessing a repository via WebDAV protocol using serf.\n" " - handles 'http' scheme\n" " - handles 'https' scheme\n" "\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:460 msgid "" "The public API exported by the RA layer contains functionality necessary for " "sending and receiving versioned data to and from the repository. And each " "of the available RA plug-ins is able to perform that task using a specific " "protocol—<filename>libsvn_ra_dav</filename> speaks HTTP/WebDAV " "(optionally using SSL encryption) with an Apache HTTP Server that is running " "the <filename>mod_dav_svn</filename> Subversion server module; " "<filename>libsvn_ra_svn</filename> speaks a custom network protocol with the " "<command>svnserve</command> program; and so on." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:472 msgid "" "For those who wish to access a Subversion repository using still another " "protocol, that is precisely why the Repository Access layer is modularized! " "Developers can simply write a new library that implements the RA interface " "on one side and communicates with the repository on the other. Your new " "library can use existing network protocols or you can invent your own. You " "could use interprocess communication (IPC) calls, or—let's get crazy, " "shall we?—you could even implement an email-based protocol. " "Subversion supplies the APIs; you supply the creativity." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:487 msgid "Client Layer" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:489 msgid "" "On the client side, the Subversion working copy is where all the action " "takes place. The bulk of functionality implemented by the client-side " "libraries exists for the sole purpose of managing working copies—" "directories full of files and other subdirectories that serve as a sort of " "local, editable <quote>reflection</quote> of one or more repository " "locations—and propagating changes to and from the Repository Access " "layer." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:498 msgid "" "Subversion's working copy library, <filename>libsvn_wc</filename>, is " "directly responsible for managing the data in the working copies. To " "accomplish this, the library stores administrative information about each " "working copy directory within a special subdirectory. This subdirectory, " "named <filename>.svn</filename>, is present in each working copy directory " "and contains various other files and directories that record state and " "provide a private workspace for administrative action. For those familiar " "with CVS, this <filename>.svn</filename> subdirectory is similar in purpose " "to the <filename>CVS</filename> administrative directories found in CVS " "working copies. For more information about the <filename>.svn</filename> " "administrative area, see <xref linkend=\"svn.developer.insidewc\"/> later in " "this chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:514 msgid "" "The Subversion client library, <filename>libsvn_client</filename>, has the " "broadest responsibility; its job is to mingle the functionality of the " "working copy library with that of the Repository Access layer, and then to " "provide the highest-level API to any application that wishes to perform " "general revision control actions. For example, the function " "<function>svn_client_checkout()</function> takes a URL as an argument. It " "passes this URL to the RA layer and opens an authenticated session with a " "particular repository. It then asks the repository for a certain tree, and " "sends this tree into the working copy library, which then writes a full " "working copy to disk (<filename>.svn</filename> directories and all)." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:529 msgid "" "The client library is designed to be used by any application. While the " "Subversion source code includes a standard command-line client, it should be " "very easy to write any number of GUI clients on top of the client library. " "New GUIs (or any new client, really) for Subversion need not be clunky " "wrappers around the included command-line client—they have full access " "via the <filename>libsvn_client</filename> API to the same functionality, " "data, and callback mechanisms that the command-line client uses. In fact, " "the Subversion source code tree contains a small C program (which you can " "find at <filename>tools/examples/minimal_client.c</filename>) that " "exemplifies how to wield the Subversion API to create a simple client " "program." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch08-embedding-svn.xml:545 msgid "Binding Directly—A Word About Correctness" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:547 msgid "" "Why should your GUI program bind directly with a <filename>libsvn_client</" "filename> instead of acting as a wrapper around a command-line program? " "Besides simply being more efficient, it can be more correct as well. A " "command-line program (such as the one supplied with Subversion) that binds " "to the client library needs to effectively translate feedback and requested " "data bits from C types to some form of human-readable output. This type of " "translation can be lossy. That is, the program may not display all of the " "information harvested from the API or may combine bits of information for " "compact representation." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:560 msgid "" "If you wrap such a command-line program with yet another program, the second " "program has access only to already interpreted (and as we mentioned, likely " "incomplete) information, which it must <emphasis>again</emphasis> translate " "into <emphasis>its</emphasis> representation format. With each layer of " "wrapping, the integrity of the original data is potentially tainted more and " "more, much like the result of making a copy of a copy (of a copy…) " "of a favorite audio or video cassette." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:570 msgid "" "But the most compelling argument for binding directly to the APIs instead of " "wrapping other programs is that the Subversion project makes compatibility " "promises regarding its APIs. Across minor versions of those APIs (such as " "between 1.3 and 1.4), no function's prototype will change. In other words, " "you aren't forced to update your program's source code simply because you've " "upgraded to a new version of Subversion. Certain functions might be " "deprecated, but they still work, and this gives you a buffer of time to " "eventually embrace the newer APIs. These kinds of compatibility promises do " "not exist for Subversion command-line program output, which is subject to " "change from release to release." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch08-embedding-svn.xml:593 msgid "Inside the Working Copy Administration Area" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:595 msgid "" "As we mentioned earlier, each directory of a Subversion working copy " "contains a special subdirectory called <filename>.svn</filename> that houses " "administrative data about that working copy directory. Subversion uses the " "information in <filename>.svn</filename> to keep track of things such as:" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:603 msgid "" "Which repository location(s) are represented by the files and subdirectories " "in the working copy directory" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:608 msgid "" "What revision of each of those files and directories is currently present in " "the working copy" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:612 msgid "" "Any user-defined properties that might be attached to those files and " "directories" msgstr "" # type: Content of: <chapter><sect1><itemizedlist><listitem><para> #: ../en/book/ch08-embedding-svn.xml:616 msgid "Pristine (unedited) copies of the working copy files" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:621 msgid "" "The Subversion working copy administration area's layout and contents are " "considered implementation details not really intended for human " "consumption. Developers are encouraged to use Subversion's public APIs, or " "the tools that Subversion provides, to access and manipulate the working " "copy data, instead of directly reading or modifying those files. The file " "formats employed by the working copy library for its administrative data do " "change from time to time—a fact that the public APIs do a great job of " "hiding from the average user. In this section, we expose some of these " "implementation details sheerly to appease your overwhelming curiosity." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:635 msgid "The Entries File" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:637 msgid "" "Perhaps the single most important file in the <filename>.svn</filename> " "directory is the <filename>entries</filename> file. It contains the bulk of " "the administrative information about the versioned items in a working copy " "directory. This one file tracks the repository URLs, pristine revision, " "file checksums, pristine text and property timestamps, scheduling and " "conflict state information, last-known commit information (author, revision, " "timestamp), local copy history—practically everything that a " "Subversion client is interested in knowing about a versioned (or to-be-" "versioned) resource!" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:650 msgid "" "Folks familiar with CVS's administrative directories will have recognized at " "this point that Subversion's <filename>.svn/entries</filename> file serves " "the purposes of, among other things, CVS's <filename>CVS/Entries</filename>, " "<filename>CVS/Root</filename>, and <filename>CVS/Repository</filename> files " "combined." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:657 msgid "" "The format of the <filename>.svn/entries</filename> file has changed over " "time. Originally an XML file, it now uses a custom—though still human-" "readable—file format. While XML was a great choice for early " "developers of Subversion who were frequently debugging the file's contents " "(and Subversion's behavior in light of them), the need for easy developer " "debugging has diminished as Subversion has matured and has been replaced by " "the user's need for snappier performance. Be aware that Subversion's " "working copy library automatically upgrades working copies from one format " "to another—it reads the old formats and writes the new—which " "saves you the hassle of checking out a new working copy, but can also " "complicate situations where different versions of Subversion might be trying " "to use the same working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:677 msgid "Pristine Copies and Property Files" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:679 msgid "" "As mentioned before, the <filename>.svn</filename> directory also holds the " "pristine <quote>text-base</quote> versions of files. You can find those in " "<filename>.svn/text-base</filename>. The benefits of these pristine copies " "are multiple—network-free checks for local modifications and " "difference reporting, network-free reversion of modified or missing files, " "more efficient transmission of changes to the server—but they come at " "the cost of having each versioned file stored at least twice on disk. These " "days, this seems to be a negligible penalty for most files. However, the " "situation gets uglier as the size of your versioned files grows. Some " "attention is being given to making the presence of the <quote>text-base</" "quote> an option. Ironically, though, it is as your versioned files' sizes " "get larger that the existence of the <quote>text-base</quote> becomes more " "crucial—who wants to transmit a huge file across a network just " "because she wants to commit a tiny change to it?" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:698 msgid "" "Similar in purpose to the <quote>text-base</quote> files are the property " "files and their pristine <quote>prop-base</quote> copies, located in " "<filename>.svn/props</filename> and <filename>.svn/prop-base</filename>, " "respectively. Since directories can have properties too, there are also " "<filename>.svn/dir-props</filename> and <filename>.svn/dir-prop-base</" "filename> files." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch08-embedding-svn.xml:715 msgid "Using the APIs" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:717 msgid "" "Developing applications against the Subversion library APIs is fairly " "straightforward. Subversion is primarily a set of C libraries, with header " "(<filename>.h</filename>) files that live in the <filename>subversion/" "include</filename> directory of the source tree. These headers are copied " "into your system locations (e.g., <filename>/usr/local/include</filename>) " "when you build and install Subversion itself from source. These headers " "represent the entirety of the functions and types meant to be accessible by " "users of the Subversion libraries. The Subversion developer community is " "meticulous about ensuring that the public API is well documented—refer " "directly to the header files for that documentation." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:730 msgid "" "When examining the public header files, the first thing you might notice is " "that Subversion's datatypes and functions are namespace-protected. That is, " "every public Subversion symbol name begins with <literal>svn_</literal>, " "followed by a short code for the library in which the symbol is defined " "(such as <literal>wc</literal>, <literal>client</literal>, <literal>fs</" "literal>, etc.), followed by a single underscore (<literal>_</literal>), and " "then the rest of the symbol name. Semipublic functions (used among source " "files of a given library but not by code outside that library, and found " "inside the library directories themselves) differ from this naming scheme in " "that instead of a single underscore after the library code, they use a " "double underscore (<literal>_ _</literal>). Functions that are " "private to a given source file have no special prefixing and are declared " "<literal>static</literal>. Of course, a compiler isn't interested in these " "naming conventions, but they help to clarify the scope of a given function " "or datatype." msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch08-embedding-svn.xml:749 msgid "" "Another good source of information about programming against the Subversion " "APIs is the project's own hacking guidelines, which you can find at <ulink " "url=\"http://subversion.tigris.org/hacking.html\" />. This document " "contains useful information, which, while aimed at developers and would-be " "developers of Subversion itself, is equally applicable to folks developing " "against Subversion as a set of third-party libraries. <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch08-embedding-svn.xml:758 msgid "After all, Subversion uses Subversion's APIs, too." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:765 msgid "The Apache Portable Runtime Library" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:767 msgid "" "Along with Subversion's own datatypes, you will see many references to " "datatypes that begin with <literal>apr_</literal>—symbols from the " "Apache Portable Runtime (APR) library. APR is Apache's portability library, " "originally carved out of its server code as an attempt to separate the OS-" "specific bits from the OS-independent portions of the code. The result was " "a library that provides a generic API for performing operations that differ " "mildly—or wildly—from OS to OS. While the Apache HTTP Server " "was obviously the first user of the APR library, the Subversion developers " "immediately recognized the value of using APR as well. This means that " "there is practically no OS-specific code in Subversion itself. Also, it " "means that the Subversion client compiles and runs anywhere that the Apache " "HTTP Server does. Currently, this list includes all flavors of Unix, Win32, " "BeOS, OS/2, and Mac OS X." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch08-embedding-svn.xml:784 msgid "" "In addition to providing consistent implementations of system calls that " "differ across operating systems, <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch08-embedding-svn.xml:787 msgid "Subversion uses ANSI system calls and datatypes as much as possible." msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote> #: ../en/book/ch08-embedding-svn.xml:789 msgid "" "</footnote> APR gives Subversion immediate access to many custom datatypes, " "such as dynamic arrays and hash tables. Subversion uses these types " "extensively. But perhaps the most pervasive APR datatype, found in nearly " "every Subversion API prototype, is the <literal>apr_pool_t</literal>—" "the APR memory pool. Subversion uses pools internally for all its memory " "allocation needs (unless an external library requires a different memory " "management mechanism for data passed through its API), <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><para><footnote><para> #: ../en/book/ch08-embedding-svn.xml:800 msgid "Neon and Berkeley DB are examples of such libraries." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:801 msgid "" "</footnote> and while a person coding against the Subversion APIs is not " "required to do the same, she <emphasis>is</emphasis> required to provide " "pools to the API functions that need them. This means that users of the " "Subversion API must also link against APR, must call <function>apr_initialize" "()</function> to initialize the APR subsystem, and then must create and " "manage pools for use with Subversion API calls, typically by using " "<function>svn_pool_create()</function>, <function>svn_pool_clear()</" "function>, and <function>svn_pool_destroy()</function>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch08-embedding-svn.xml:814 msgid "Programming with Memory Pools" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:816 msgid "" "Almost every developer who has used the C programming language has at some " "point sighed at the daunting task of managing memory usage. Allocating " "enough memory to use, keeping track of those allocations, freeing the memory " "when you no longer need it—these tasks can be quite complex. And of " "course, failure to do those things properly can result in a program that " "crashes itself, or worse, crashes the computer." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:825 msgid "" "Higher-level languages, on the other hand, either take the job of memory " "management away from you completely or make it something you toy with only " "when doing extremely tight program optimization. Languages such as Java and " "Python use <firstterm>garbage collection</firstterm>, allocating memory for " "objects when needed, and automatically freeing that memory when the object " "is no longer in use." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:834 msgid "" "APR provides a middle-ground approach called <firstterm>pool-based memory " "management</firstterm>. It allows the developer to control memory usage at " "a lower resolution—per chunk (or <quote>pool</quote>) of memory, " "instead of per allocated object. Rather than using <function>malloc()</" "function> and friends to allocate enough memory for a given object, you ask " "APR to allocate the memory from a memory pool. When you're finished using " "the objects you've created in the pool, you destroy the entire pool, " "effectively de-allocating the memory consumed by <emphasis>all</emphasis> " "the objects you allocated from it. Thus, rather than keeping track of " "individual objects that need to be de-allocated, your program simply " "considers the general lifetimes of those objects and allocates the objects " "in a pool whose lifetime (the time between the pool's creation and its " "deletion) matches the object's needs." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:857 msgid "URL and Path Requirements" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:859 msgid "" "With remote version control operation as the whole point of Subversion's " "existence, it makes sense that some attention has been paid to " "internationalization (i18n) support. After all, while <quote>remote</quote> " "might mean <quote>across the office,</quote> it could just as well mean " "<quote>across the globe.</quote> To facilitate this, all of Subversion's " "public interfaces that accept path arguments expect those paths to be " "canonicalized—which is most easily accomplished by passing them " "through the <function>svn_path_canonicalize()</function> function—and " "encoded in UTF-8. This means, for example, that any new client binary that " "drives the <filename>libsvn_client</filename> interface needs to first " "convert paths from the locale-specific encoding to UTF-8 before passing " "those paths to the Subversion libraries, and then reconvert any resultant " "output paths from Subversion back into the locale's encoding before using " "those paths for non-Subversion purposes. Fortunately, Subversion provides a " "suite of functions (see <filename>subversion/include/svn_utf.h</filename>) " "that any program can use to do these conversions." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:880 msgid "" "Also, Subversion APIs require all URL parameters to be properly URI-" "encoded. So, instead of passing" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:882 msgid "" "as the URL of a file named <filename>My File.txt</filename>, you need to pass" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:884 msgid "" ". Again, Subversion supplies helper functions that your application can " "use—<function>svn_path_uri_encode()</function> and " "<function>svn_path_uri_decode()</function>, for URI encoding and decoding, " "respectively." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:892 msgid "Using Languages Other Than C and C++" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:894 msgid "" "If you are interested in using the Subversion libraries in conjunction with " "something other than a C program—say, a Python or Perl script—" "Subversion has some support for this via the Simplified Wrapper and " "Interface Generator (SWIG). The SWIG bindings for Subversion are located in " "<filename>subversion/bindings/swig</filename>. They are still maturing, but " "they are usable. These bindings allow you to call Subversion API functions " "indirectly, using wrappers that translate the datatypes native to your " "scripting language into the datatypes needed by Subversion's C libraries." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:905 msgid "" "Significant efforts have been made toward creating functional SWIG-generated " "bindings for Python, Perl, and Ruby. To some extent, the work done " "preparing the SWIG interface files for these languages is reusable in " "efforts to generate bindings for other languages supported by SWIG (which " "include versions of C#, Guile, Java, MzScheme, OCaml, PHP, and Tcl, among " "others). However, some extra programming is required to compensate for " "complex APIs that SWIG needs some help translating between languages. For " "more information on SWIG itself, see the project's web site at <ulink url=" "\"http://www.swig.org/\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:917 msgid "" "Subversion also has language bindings for Java. The javahl bindings " "(located in <filename>subversion/bindings/java</filename> in the Subversion " "source tree) aren't SWIG-based, but are instead a mixture of Java and hand-" "coded JNI. Javahl covers most Subversion client-side APIs and is " "specifically targeted at implementors of Java-based Subversion clients and " "IDE integrations." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:926 msgid "" "Subversion's language bindings tend to lack the level of developer attention " "given to the core Subversion modules, but can generally be trusted as " "production-ready. A number of scripts and applications, alternative " "Subversion GUI clients, and other third-party tools are successfully using " "Subversion's language bindings today to accomplish their Subversion " "integrations." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:934 msgid "" "It's worth noting here that there are other options for interfacing with " "Subversion using other languages: alternative bindings for Subversion that " "aren't provided by the Subversion development community at all. You can " "find links to these alternative bindings on the Subversion project's links " "page (at <ulink url=\"http://subversion.tigris.org/links.html\" />), but " "there are a couple of popular ones we feel are especially noteworthy. " "First, Barry Scott's PySVN bindings (<ulink url=\"http://pysvn.tigris.org/" "\" />) are a popular option for binding with Python. PySVN boasts of a more " "Pythonic interface than the more C-like APIs provided by Subversion's own " "Python bindings. And if you're looking for a pure Java implementation of " "Subversion, check out SVNKit (<ulink url=\"http://svnkit.com/\" />), which " "is Subversion rewritten from the ground up in Java." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch08-embedding-svn.xml:952 msgid "SVNKit Versus javahl" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:954 msgid "" "In 2005, a small company called TMate announced the 1.0.0 release of " "JavaSVN—a pure Java implementation of Subversion. Since then, the " "project has been renamed to SVNKit (available at <ulink url=\"http://svnkit." "com/\" />) and has seen great success as a provider of Subversion " "functionality to various Subversion clients, IDE integrations, and other " "third-party tools." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:962 msgid "" "The SVNKit library is interesting in that, unlike the javahl library, it is " "not merely a wrapper around the official Subversion core libraries. In " "fact, it shares no code with Subversion at all. But while it is easy to " "confuse SVNKit with javahl, and easier still to not even realize which of " "these libraries you are using, folks should be aware that SVNKit differs " "from javahl in some significant ways. First, SVNKit is not developed as " "open source software and seems to have at any given time only a few " "developers working on it. Also, SVNKit's license is more restrictive than " "that of Subversion. Finally, by aiming to be a pure Java Subversion " "library, SVNKit is limited in which portions of Subversion can be reasonably " "cloned while still keeping up with Subversion's releases. This has already " "happened once—SVNKit cannot access BDB-backed Subversion repositories " "via the <literal>file://</literal> protocol because there's no pure Java " "implementation of Berkeley DB that is file-format-compatible with the native " "implementation of that library." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><para> #: ../en/book/ch08-embedding-svn.xml:982 msgid "" "That said, SVNKit has a well-established track record of reliability. And a " "pure Java solution is much more robust in the face of programming " "errors—a bug in SVNKit might raise a catchable Java Exception, but a " "bug in the Subversion core libraries as accessed via javahl can bring down " "your entire Java Runtime Environment. So, weigh the costs when choosing a " "Java-based Subversion implementation." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch08-embedding-svn.xml:996 msgid "Code Samples" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:998 msgid "" "<xref linkend=\"svn.developer.layerlib.repos.ex-1\" /> contains a code " "segment (written in C) that illustrates some of the concepts we've been " "discussing. It uses both the repository and filesystem interfaces (as can " "be determined by the prefixes <literal>svn_repos_</literal> and " "<literal>svn_fs_</literal> of the function names, respectively) to create a " "new revision in which a directory is added. You can see the use of an APR " "pool, which is passed around for memory allocation purposes. Also, the code " "reveals a somewhat obscure fact about Subversion error handling—all " "Subversion errors must be explicitly handled to avoid memory leakage (and in " "some cases, application failure)." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch08-embedding-svn.xml:1013 #, fuzzy #| msgid "The Repository" msgid "Using the Repository Layer" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch08-embedding-svn.xml:1015 #, no-wrap msgid "" "\n" "/* Convert a Subversion error into a simple boolean error code.\n" " *\n" " * NOTE: Subversion errors must be cleared (using svn_error_clear())\n" " * because they are allocated from the global pool, else memory\n" " * leaking occurs.\n" " */\n" "#define INT_ERR(expr) \\\n" " do { \\\n" " svn_error_t *__temperr = (expr); \\\n" " if (__temperr) \\\n" " { \\\n" " svn_error_clear(__temperr); \\\n" " return 1; \\\n" " } \\\n" " return 0; \\\n" " } while (0)\n" "\n" "/* Create a new directory at the path NEW_DIRECTORY in the Subversion\n" " * repository located at REPOS_PATH. Perform all memory allocation in\n" " * POOL. This function will create a new revision for the addition of\n" " * NEW_DIRECTORY. Return zero if the operation completes\n" " * successfully, nonzero otherwise.\n" " */\n" "static int\n" "make_new_directory(const char *repos_path,\n" " const char *new_directory,\n" " apr_pool_t *pool)\n" "{\n" " svn_error_t *err;\n" " svn_repos_t *repos;\n" " svn_fs_t *fs;\n" " svn_revnum_t youngest_rev;\n" " svn_fs_txn_t *txn;\n" " svn_fs_root_t *txn_root;\n" " const char *conflict_str;\n" "\n" " /* Open the repository located at REPOS_PATH. \n" " */\n" " INT_ERR(svn_repos_open(&repos, repos_path, pool));\n" "\n" " /* Get a pointer to the filesystem object that is stored in REPOS. \n" " */\n" " fs = svn_repos_fs(repos);\n" "\n" " /* Ask the filesystem to tell us the youngest revision that\n" " * currently exists. \n" " */\n" " INT_ERR(svn_fs_youngest_rev(&youngest_rev, fs, pool));\n" "\n" " /* Begin a new transaction that is based on YOUNGEST_REV. We are\n" " * less likely to have our later commit rejected as conflicting if we\n" " * always try to make our changes against a copy of the latest snapshot\n" " * of the filesystem tree. \n" " */\n" " INT_ERR(svn_repos_fs_begin_txn_for_commit2(&txn, repos, youngest_rev,\n" " apr_hash_make(pool), pool));\n" "\n" " /* Now that we have started a new Subversion transaction, get a root\n" " * object that represents that transaction. \n" " */\n" " INT_ERR(svn_fs_txn_root(&txn_root, txn, pool));\n" " \n" " /* Create our new directory under the transaction root, at the path\n" " * NEW_DIRECTORY. \n" " */\n" " INT_ERR(svn_fs_make_dir(txn_root, new_directory, pool));\n" "\n" " /* Commit the transaction, creating a new revision of the filesystem\n" " * which includes our added directory path.\n" " */\n" " err = svn_repos_fs_commit_txn(&conflict_str, repos, \n" " &youngest_rev, txn, pool);\n" " if (! err)\n" " {\n" " /* No error? Excellent! Print a brief report of our success.\n" " */\n" " printf(\"Directory '%s' was successfully added as new revision \"\n" " \"'%ld'.\\n\", new_directory, youngest_rev);\n" " }\n" " else if (err->apr_err == SVN_ERR_FS_CONFLICT)\n" " {\n" " /* Uh-oh. Our commit failed as the result of a conflict\n" " * (someone else seems to have made changes to the same area \n" " * of the filesystem that we tried to modify). Print an error\n" " * message.\n" " */\n" " printf(\"A conflict occurred at path '%s' while attempting \"\n" " \"to add directory '%s' to the repository at '%s'.\\n\", \n" " conflict_str, new_directory, repos_path);\n" " }\n" " else\n" " {\n" " /* Some other error has occurred. Print an error message.\n" " */\n" " printf(\"An error occurred while attempting to add directory '%s' \"\n" " \"to the repository at '%s'.\\n\", \n" " new_directory, repos_path);\n" " }\n" "\n" " INT_ERR(err);\n" "} \n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:1120 msgid "" "Note that in <xref linkend=\"svn.developer.layerlib.repos.ex-1\" />, the " "code could just as easily have committed the transaction using " "<function>svn_fs_commit_txn()</function>. But the filesystem API knows " "nothing about the repository library's hook mechanism. If you want your " "Subversion repository to automatically perform some set of non-Subversion " "tasks every time you commit a transaction (e.g., sending an email that " "describes all the changes made in that transaction to your developer mailing " "list), you need to use the <filename>libsvn_repos</filename>-wrapped version " "of that function, which adds the hook triggering functionality—in this " "case, <function>svn_repos_fs_commit_txn()</function>. (For more information " "regarding Subversion's repository hooks, see <xref linkend=\"svn.reposadmin." "create.hooks\" />.)" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:1137 msgid "" "Now let's switch languages. <xref linkend=\"svn.developer.usingapi." "otherlangs.ex-1\" /> is a sample program that uses Subversion's SWIG Python " "bindings to recursively crawl the youngest repository revision, and to print " "the various paths reached during the crawl." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch08-embedding-svn.xml:1144 msgid "Using the Repository layer with Python" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch08-embedding-svn.xml:1146 #, no-wrap msgid "" "\n" "#!/usr/bin/python\n" "\n" "\"\"\"Crawl a repository, printing versioned object path names.\"\"\"\n" "\n" "import sys\n" "import os.path\n" "import svn.fs, svn.core, svn.repos\n" "\n" "def crawl_filesystem_dir(root, directory):\n" " \"\"\"Recursively crawl DIRECTORY under ROOT in the filesystem, and return\n" " a list of all the paths at or below DIRECTORY.\"\"\"\n" "\n" " # Print the name of this path.\n" " print directory + \"/\"\n" " \n" " # Get the directory entries for DIRECTORY.\n" " entries = svn.fs.svn_fs_dir_entries(root, directory)\n" "\n" " # Loop over the entries.\n" " names = entries.keys()\n" " for name in names:\n" " # Calculate the entry's full path.\n" " full_path = directory + '/' + name\n" "\n" " # If the entry is a directory, recurse. The recursion will return\n" " # a list with the entry and all its children, which we will add to\n" " # our running list of paths.\n" " if svn.fs.svn_fs_is_dir(root, full_path):\n" " crawl_filesystem_dir(root, full_path)\n" " else:\n" " # Else it's a file, so print its path here.\n" " print full_path\n" "\n" "def crawl_youngest(repos_path):\n" " \"\"\"Open the repository at REPOS_PATH, and recursively crawl its\n" " youngest revision.\"\"\"\n" " \n" " # Open the repository at REPOS_PATH, and get a reference to its\n" " # versioning filesystem.\n" " repos_obj = svn.repos.svn_repos_open(repos_path)\n" " fs_obj = svn.repos.svn_repos_fs(repos_obj)\n" "\n" " # Query the current youngest revision.\n" " youngest_rev = svn.fs.svn_fs_youngest_rev(fs_obj)\n" " \n" " # Open a root object representing the youngest (HEAD) revision.\n" " root_obj = svn.fs.svn_fs_revision_root(fs_obj, youngest_rev)\n" "\n" " # Do the recursive crawl.\n" " crawl_filesystem_dir(root_obj, \"\")\n" " \n" "if __name__ == \"__main__\":\n" " # Check for sane usage.\n" " if len(sys.argv) != 2:\n" " sys.stderr.write(\"Usage: %s REPOS_PATH\\n\"\n" " % (os.path.basename(sys.argv[0])))\n" " sys.exit(1)\n" "\n" " # Canonicalize the repository path.\n" " repos_path = svn.core.svn_path_canonicalize(sys.argv[1])\n" "\n" " # Do the real work.\n" " crawl_youngest(repos_path)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:1213 msgid "" "This same program in C would need to deal with APR's memory pool system. " "But Python handles memory usage automatically, and Subversion's Python " "bindings adhere to that convention. In C, you'd be working with custom " "datatypes (such as those provided by the APR library) for representing the " "hash of entries and the list of paths, but Python has hashes (called " "<quote>dictionaries</quote>) and lists as built-in datatypes, and it " "provides a rich collection of functions for operating on those types. So " "SWIG (with the help of some customizations in Subversion's language bindings " "layer) takes care of mapping those custom datatypes into the native " "datatypes of the target language. This provides a more intuitive interface " "for users of that language." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:1227 msgid "" "The Subversion Python bindings can be used for working copy operations, " "too. In the previous section of this chapter, we mentioned the " "<filename>libsvn_client</filename> interface and how it exists for the sole " "purpose of simplifying the process of writing a Subversion client. <xref " "linkend=\"svn.developer.usingapi.otherlangs.ex-2\" /> is a brief example of " "how that library can be accessed via the SWIG Python bindings to re-create a " "scaled-down version of the <command>svn status</command> command." msgstr "" # type: Content of: <chapter><sect1><sect2><example><title> #: ../en/book/ch08-embedding-svn.xml:1238 msgid "A Python status crawler" msgstr "" # type: Content of: <chapter><sect1><sect2><example><programlisting> #: ../en/book/ch08-embedding-svn.xml:1240 #, no-wrap msgid "" "\n" "#!/usr/bin/env python\n" "\n" "\"\"\"Crawl a working copy directory, printing status information.\"\"\"\n" "\n" "import sys\n" "import os.path\n" "import getopt\n" "import svn.core, svn.client, svn.wc\n" "\n" "def generate_status_code(status):\n" " \"\"\"Translate a status value into a single-character status code,\n" " using the same logic as the Subversion command-line client.\"\"\"\n" " code_map = { svn.wc.svn_wc_status_none : ' ',\n" " svn.wc.svn_wc_status_normal : ' ',\n" " svn.wc.svn_wc_status_added : 'A',\n" " svn.wc.svn_wc_status_missing : '!',\n" " svn.wc.svn_wc_status_incomplete : '!',\n" " svn.wc.svn_wc_status_deleted : 'D',\n" " svn.wc.svn_wc_status_replaced : 'R',\n" " svn.wc.svn_wc_status_modified : 'M',\n" " svn.wc.svn_wc_status_merged : 'G',\n" " svn.wc.svn_wc_status_conflicted : 'C',\n" " svn.wc.svn_wc_status_obstructed : '~',\n" " svn.wc.svn_wc_status_ignored : 'I',\n" " svn.wc.svn_wc_status_external : 'X',\n" " svn.wc.svn_wc_status_unversioned : '?',\n" " }\n" " return code_map.get(status, '?')\n" "\n" "def do_status(wc_path, verbose):\n" " # Build a client context baton.\n" " ctx = svn.client.svn_client_ctx_t()\n" "\n" " def _status_callback(path, status):\n" " \"\"\"A callback function for svn_client_status.\"\"\"\n" "\n" " # Print the path, minus the bit that overlaps with the root of\n" " # the status crawl\n" " text_status = generate_status_code(status.text_status)\n" " prop_status = generate_status_code(status.prop_status)\n" " print '%s%s %s' % (text_status, prop_status, path)\n" " \n" " # Do the status crawl, using _status_callback() as our callback function.\n" " revision = svn.core.svn_opt_revision_t()\n" " revision.type = svn.core.svn_opt_revision_head\n" " svn.client.svn_client_status2(wc_path, revision, _status_callback,\n" " svn.core.svn_depth_infinity, verbose,\n" " 0, 0, 1, ctx)\n" "\n" "def usage_and_exit(errorcode):\n" " \"\"\"Print usage message, and exit with ERRORCODE.\"\"\"\n" " stream = errorcode and sys.stderr or sys.stdout\n" " stream.write(\"\"\"Usage: %s OPTIONS WC-PATH\n" "Options:\n" " --help, -h : Show this usage message\n" " --verbose, -v : Show all statuses, even uninteresting ones\n" "\"\"\" % (os.path.basename(sys.argv[0])))\n" " sys.exit(errorcode)\n" " \n" "if __name__ == '__main__':\n" " # Parse command-line options.\n" " try:\n" " opts, args = getopt.getopt(sys.argv[1:], \"hv\", [\"help\", \"verbose\"])\n" " except getopt.GetoptError:\n" " usage_and_exit(1)\n" " verbose = 0\n" " for opt, arg in opts:\n" " if opt in (\"-h\", \"--help\"):\n" " usage_and_exit(0)\n" " if opt in (\"-v\", \"--verbose\"):\n" " verbose = 1\n" " if len(args) != 1:\n" " usage_and_exit(2)\n" " \n" " # Canonicalize the repository path.\n" " wc_path = svn.core.svn_path_canonicalize(args[0])\n" "\n" " # Do the real work.\n" " try:\n" " do_status(wc_path, verbose)\n" " except svn.core.SubversionException, e:\n" " sys.stderr.write(\"Error (%d): %s\\n\" % (e.apr_err, e.message))\n" " sys.exit(1)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch08-embedding-svn.xml:1327 msgid "" "As was the case in <xref linkend=\"svn.developer.usingapi.otherlangs.ex-1\" /" ">, this program is pool-free and uses, for the most part, normal Python " "datatypes. The call to <function>svn_client_ctx_t()</function> is deceiving " "because the public Subversion API has no such function—this just " "happens to be a case where SWIG's automatic language generation bleeds " "through a little bit (the function is a sort of factory function for " "Python's version of the corresponding complex C structure). Also note that " "the path passed to this program (like the last one) gets run through " "<function>svn_path_canonicalize()</function>, because to <emphasis>not</" "emphasis> do so runs the risk of triggering the underlying Subversion C " "library's assertions about such things, which translates into rather " "immediate and unceremonious program abortion." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:1353 msgid "" "One of Subversion's greatest features isn't something you get from running " "its command-line client or other tools. It's the fact that Subversion was " "designed modularly and provides a stable, public API so that others—" "like yourself, perhaps—can write custom software that drives " "Subversion's core logic." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch08-embedding-svn.xml:1360 msgid "" "In this chapter, we took a closer look at Subversion's architecture, " "examining its logical layers and describing that public API, the very same " "API that Subversion's own layers use to communicate with each other. Many " "developers have found interesting uses for the Subversion API, from simple " "repository hook scripts, to integrations between Subversion and some other " "application, to completely different version control systems. What unique " "itch will <emphasis>you</emphasis> scratch with it?" msgstr "" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2 #, fuzzy #| msgid "Subversion's Components" msgid "Subversion Complete Reference" msgstr "Die Komponenten von Subversion" # type: Content of: <chapter><para> #: ../en/book/ch09-reference.xml:4 msgid "" "This chapter is intended to be a complete reference to using Subversion. " "This includes the command-line client (<command>svn</command>) and all its " "subcommands, as well as the repository administration programs " "(<command>svnadmin</command> and <command>svnlook</command>) and their " "respective subcommands." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:16 msgid "The Subversion Command-Line Client: <command>svn</command>" msgstr "" # type: Content of: <chapter><sect1><para><footnote> #: ../en/book/ch09-reference.xml:18 msgid "" "To use the command-line client, type <command>svn</command>, the subcommand " "you wish to use, <footnote>" msgstr "" # type: Content of: <chapter><sect1><para><footnote><para> #: ../en/book/ch09-reference.xml:21 msgid "" "Well, you don't need a subcommand to use the <option>--version</option> " "option, but we'll get to that in just a minute." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:24 msgid "" "</footnote> and any options or targets that you wish to operate on—the " "subcommand and the options need not appear in a specific order. For " "example, all of the following are valid ways to use <command>svn status</" "command>:" msgstr "" # type: Content of: <chapter><sect1><screen> #: ../en/book/ch09-reference.xml:30 #, no-wrap msgid "" "\n" "$ svn -v status\n" "$ svn status -v \n" "$ svn status -v myfile\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:36 msgid "" "You can find many more examples of how to use most client commands in <xref " "linkend=\"svn.tour\"/> and commands for managing properties in <xref linkend=" "\"svn.advanced.props\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:42 msgid "svn Options" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:44 msgid "" "While Subversion has different options for its subcommands, all options " "exist in a single namespace—that is, each option is guaranteed to mean " "the same thing regardless of the subcommand you use it with. For example, " "<option>--verbose</option> (<option>-v</option>) always means " "<quote>verbose output,</quote> regardless of the subcommand you use it with." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:52 msgid "" "The <command>svn</command> command-line client usually exits quickly with an " "error if you pass it an option which does not apply to the specified " "subcommand. But as of Subversion 1.5, several of the options which apply to " "all—or nearly all—of the subcommands have been deemed acceptable " "by all subcommands, even if they have no effect on some of them. They " "appear grouped together in the command-line client's usage messages as " "global options. This was done to assist folks who write scripts which wrap " "the command-line client. These global options are as follows:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:67 ../en/book/ch09-reference.xml:7648 msgid "<option>--config-dir</option> <replaceable>DIR</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:70 ../en/book/ch09-reference.xml:7651 msgid "" "Instructs Subversion to read configuration information from the specified " "directory instead of the default location (<filename>.subversion</filename> " "in the user's home directory)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:78 ../en/book/ch09-reference.xml:7659 msgid "<option>--no-auth-cache</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:80 ../en/book/ch09-reference.xml:7661 msgid "" "Prevents caching of authentication information (e.g., username and password) " "in the Subversion runtime configuration directories." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:87 ../en/book/ch09-reference.xml:7668 msgid "<option>--non-interactive</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:89 msgid "" "Disables all interactive prompting. Some examples of interactive prompting " "include requests for authentication credentials and conflict resolution " "decisions. This is useful if you're running Subversion inside an automated " "script and it's more appropriate to have Subversion fail than to prompt for " "more information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:100 msgid "<option>--password</option> <replaceable>PASSWD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:103 msgid "" "Specifies the password to use when authenticating against a Subversion " "server. If not provided, or if incorrect, Subversion will prompt you for " "this information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:111 #, fuzzy #| msgid "<filename>filename.r<replaceable>NEWREV</replaceable> </filename>" msgid "<option>--username</option> <replaceable>NAME</replaceable>" msgstr "<filename>filename.r<replaceable>NEWREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:114 msgid "" "Specifies the username to use when authenticating against a Subversion " "server. If not provided, or if incorrect, Subversion will prompt you for " "this information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:123 msgid "" "The rest of the options apply and are accepted by only a subset of the " "subcommand. They are as follows:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:129 msgid "<option>--accept</option> <replaceable>ACTION</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:132 msgid "" "Specifies an action for automatic conflict resolution. Possible actions are " "<literal>postpone</literal>, <literal>base</literal>, <literal>mine-full</" "literal>, <literal>theirs-full</literal>, <literal>edit</literal>, and " "<literal>launch</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:141 msgid "<option>--auto-props</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:143 msgid "" "Enables auto-props, overriding the <literal>enable-auto-props</literal> " "directive in the <filename>config</filename> file." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:150 msgid "" "<option>--change</option> (<option>-c</option>) <replaceable>ARG</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:153 msgid "" "Used as a means to refer to a specific <quote>change</quote> (a.k.a. a " "revision). This option is syntactic sugar for <quote>-r ARG-1:ARG</quote>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:160 msgid "<option>--changelist</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:163 msgid "" "Instructs Subversion to operate only on members of the changelist named " "<replaceable>ARG</replaceable>. You can use this option multiple times to " "specify sets of changelists." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:170 msgid "<option>--cl</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:173 msgid "An alias for the <option>--changelist</option> option." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:179 msgid "<option>--depth</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:182 msgid "" "Instructs Subversion to limit the scope of an operation to a particular tree " "depth. <replaceable>ARG</replaceable> is one of <literal>empty</literal>, " "<literal>files</literal>, <literal>immediates</literal>, or " "<literal>infinity</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:191 msgid "<option>--diff-cmd</option> <replaceable>CMD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:194 msgid "" "Specifies an external program to use to show differences between files. " "When <command>svn diff</command> is invoked without this option, it uses " "Subversion's internal diff engine, which provides unified diffs by default. " "If you want to use an external diff program, use <option>--diff-cmd</" "option>. You can pass options to the diff program with the <option>--" "extensions</option> option (more on that later in this section)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:207 msgid "<option>--diff3-cmd</option> <replaceable>CMD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:210 msgid "Specifies an external program to use to merge files." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:215 msgid "<option>--dry-run</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:217 msgid "" "Goes through all the motions of running a command, but makes no actual " "changes—either on disk or in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:224 msgid "<option>--editor-cmd</option> <replaceable>CMD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:227 msgid "" "Specifies an external program to use to edit a log message or a property " "value. See the <literal>editor-cmd</literal> section in <xref linkend=\"svn." "advanced.confarea.opts.config\"/> for ways to specify a default editor." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:235 msgid "<option>--encoding</option> <replaceable>ENC</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:237 msgid "" "Tells Subversion that your commit message is encoded in the charset " "provided. The default is your operating system's native locale, and you " "should specify the encoding if your commit message is in any other encoding." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:246 msgid "" "<option>--extensions</option> (<option>-x</option>) <replaceable>ARGS</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:249 msgid "" "Specifies an argument or arguments that Subversion should pass to an " "external diff command. This option is valid only when used with the " "<command>svn diff</command> or <command>svn merge</command> commands, with " "the <option>--diff-cmd</option> option. If you wish to pass multiple " "arguments, you must enclose all of them in quotes (e.g., <userinput>svn diff " "--diff-cmd /usr/bin/diff -x \"-b -E\"</userinput>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:266 msgid "" "<option>--file</option> (<option>-F</option>) <replaceable>FILENAME</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:270 msgid "" "Uses the contents of the named file for the specified subcommand, though " "different subcommands do different things with this content. For example, " "<command>svn commit</command> uses the content as a commit log, whereas " "<command>svn propset</command> uses it as a property value." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:280 msgid "<option>--force</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:282 msgid "" "Forces a particular command or operation to run. Subversion will prevent " "you from performing some operations in normal usage, but you can pass the " "force option to tell Subversion <quote>I know what I'm doing as well as the " "possible repercussions of doing it, so let me at 'em.</quote> This option is " "the programmatic equivalent of doing your own electrical work with the power " "on—if you don't know what you're doing, you're likely to get a nasty " "shock." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:295 msgid "<option>--force-log</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:297 msgid "" "Forces a suspicious parameter passed to the <option>--message</option> " "(<option>-m</option>) or <option>--file</option> (<option>-F</option>) " "option to be accepted as valid. By default, Subversion will produce an " "error if parameters to these options look like they might instead be targets " "of the subcommand. For example, if you pass a versioned file's path to the " "<option>--file</option> (<option>-F</option>) option, Subversion will assume " "you've made a mistake, that the path was instead intended as the target of " "the operation, and that you simply failed to provide some other—" "unversioned—file as the source of your log message. To assert your " "intent and override these types of errors, pass the <option>--force-log</" "option> option to subcommands that accept log messages." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:316 msgid "<option>--help</option> (<option>-h</option>) or <option>-?</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:320 msgid "" "If used with one or more subcommands, shows the built-in help text for " "each. If used alone, it displays the general client help text." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:327 msgid "<option>--ignore-ancestry</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:329 msgid "" "Tells Subversion to ignore ancestry when calculating differences (rely on " "path contents alone)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:335 msgid "<option>--ignore-externals</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:337 msgid "" "Tells Subversion to ignore externals definitions and the external working " "copies managed by them." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:343 ../en/book/ch09-reference.xml:5405 msgid "<option>--incremental</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:345 msgid "Prints output in a format suitable for concatenation." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:351 msgid "<option>--keep-changelists</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:353 msgid "Tells Subversion not to delete changelists after committing." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:358 msgid "<option>--keep-local</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:360 msgid "" "Keeps the local copy of a file or directory (used with the <command>svn " "delete</command> command)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:366 msgid "" "<option>--limit</option> (<option>-l</option>) <replaceable>NUM</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:369 msgid "Shows only the first <replaceable>NUM</replaceable> log messages." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:375 msgid "" "<option>--message</option> (<option>-m</option>) <replaceable>MESSAGE</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:379 msgid "" "Indicates that you will specify either a log message or a lock comment on " "the command line, following this option. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><screen> #: ../en/book/ch09-reference.xml:383 #, no-wrap msgid "" "\n" "$ svn commit -m \"They don't make Sunday.\"\n" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:390 msgid "<option>--new</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:392 msgid "" "Uses <replaceable>ARG</replaceable> as the newer target (for use with " "<command>svn diff</command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:398 msgid "<option>--no-auto-props</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:400 msgid "" "Disables auto-props, overriding the <literal>enable-auto-props</literal> " "directive in the <filename>config</filename> file." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:407 ../en/book/ch09-reference.xml:6626 msgid "<option>--no-diff-deleted</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:409 msgid "" "Prevents Subversion from printing differences for deleted files. The " "default behavior when you remove a file is for <command>svn diff</command> " "to print the same differences that you would see if you had left the file " "but removed all the content." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:418 msgid "<option>--no-ignore</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:420 msgid "" "Shows files in the status listing that would normally be omitted since they " "match a pattern in the <literal>global-ignores</literal> configuration " "option or the <literal>svn:ignore</literal> property. See <xref linkend=" "\"svn.advanced.confarea.opts.config\"/> and <xref linkend=\"svn.advanced." "props.special.ignore\"/> for more information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:431 msgid "<option>--no-unlock</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:433 msgid "" "Tells Subversion not to automatically unlock files (the default commit " "behavior is to unlock all files listed as part of the commit). See <xref " "linkend=\"svn.advanced.locking\"/> for more information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:441 msgid "<option>--non-recursive</option> (<option>-N</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:443 msgid "" "<emphasis>Deprecated</emphasis>. Stops a subcommand from recursing into " "subdirectories. Most subcommands recurse by default, but some " "subcommands—usually those that have the potential to remove or undo " "your local modifications—do not." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:452 msgid "<option>--notice-ancestry</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:454 msgid "Pays attention to ancestry when calculating differences." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:460 msgid "<option>--old</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:462 msgid "" "Uses <replaceable>ARG</replaceable> as the older target (for use with " "<command>svn diff</command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:468 msgid "<option>--parents</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:470 msgid "" "Creates and adds nonexistent or nonversioned parent subdirectories to the " "working copy or repository as part of an operation. This is useful for " "automatically creating multiple subdirectories where none currently exist. " "If performed on a URL, all the directories will be created in a single " "commit." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:480 ../en/book/ch09-reference.xml:7680 msgid "<option>--quiet</option> (<option>-q</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:482 ../en/book/ch09-reference.xml:7682 msgid "" "Requests that the client print only essential information while performing " "an operation." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:488 msgid "<option>--record-only</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:490 msgid "Marks revisions as merged (for use with <option>--revision</option>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:496 msgid "<option>--recursive</option> (<option>-R</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:498 msgid "" "Makes a subcommand recurse into subdirectories. Most subcommands recurse by " "default." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:504 msgid "<option>--reintegrate</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:506 msgid "" "Used with the <command>svn merge</command> subcommand, merges all of the " "source URL's changes into the working copy. See <xref linkend=\"svn." "branchemerge.basicmerging.stayinsync\"/> for details." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:515 msgid "" "<option>--relocate</option> <replaceable>FROM TO [PATH...]</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:518 msgid "" "Used with the <command>svn switch</command> subcommand, changes the location " "of the repository that your working copy references. This is useful if the " "location of your repository changes and you have an existing working copy " "that you'd like to continue to use. See <command>svn switch</command> for " "an example." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:529 msgid "<option>--remove</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:532 msgid "Disassociates <replaceable>ARG</replaceable> from a changelist" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:538 msgid "" "<option>--revision</option> (<option>-r</option>) <replaceable>REV</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:542 msgid "" "Indicates that you're going to supply a revision (or range of revisions) for " "a particular operation. You can provide revision numbers, keywords, or " "dates (in curly braces) as arguments to the revision option. If you wish to " "offer a range of revisions, you can provide two revisions separated by a " "colon. For example:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><screen> #: ../en/book/ch09-reference.xml:550 #, no-wrap msgid "" "\n" "$ svn log -r 1729\n" "$ svn log -r 1729:HEAD\n" "$ svn log -r 1729:1744\n" "$ svn log -r {2001-12-04}:{2002-02-17}\n" "$ svn log -r 1729:{2002-02-17}\n" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:558 msgid "See <xref linkend=\"svn.tour.revs.keywords\"/> for more information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:564 ../en/book/ch09-reference.xml:6657 msgid "<option>--revprop</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:566 ../en/book/ch09-reference.xml:6659 msgid "" "Operates on a revision property instead of a property specific to a file or " "directory. This option requires that you also pass a revision with the " "<option>--revision</option> (<option>-r</option>) option." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:575 msgid "<option>--set-depth</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:578 msgid "" "Sets the sticky depth on a directory in a working copy to one of " "<literal>empty</literal>, <literal>files</literal>, <literal>immediates</" "literal>, or <literal>infinity</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:586 msgid "<option>--show-revs</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:588 msgid "" "Used to make <command>svn mergeinfo</command> display either " "<literal>merged</literal> or <literal>eligible</literal> revisions." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:595 msgid "<option>--show-updates</option> (<option>-u</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:597 msgid "" "Causes the client to display information about which files in your working " "copy are out of date. This doesn't actually update any of your files—" "it just shows you which files will be updated if you then use <command>svn " "update</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:607 msgid "<option>--stop-on-copy</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:609 msgid "" "Causes a Subversion subcommand that traverses the history of a versioned " "resource to stop harvesting that historical information when a copy—" "that is, a location in history where that resource was copied from another " "location in the repository—is encountered." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:619 msgid "<option>--strict</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:621 msgid "" "Causes Subversion to use strict semantics, a notion that is rather vague " "unless talking about specific subcommands (namely, <command>svn propget</" "command>)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:628 msgid "<option>--targets</option> <replaceable>FILENAME</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:631 msgid "" "Tells Subversion to get the list of files that you wish to operate on from " "the filename that you provide instead of listing all the files on the " "command line." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:639 msgid "<option>--use-merge-history</option> (<option>-g</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:642 msgid "Uses or displays additional information from merge history." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:648 msgid "<option>--verbose</option> (<option>-v</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:650 msgid "" "Requests that the client print out as much information as it can while " "running any subcommand. This may result in Subversion printing out " "additional fields, detailed information about every file, or additional " "information regarding its actions." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:659 ../en/book/ch09-reference.xml:8190 #: ../en/book/ch09-reference.xml:8532 msgid "<option>--version</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:661 msgid "" "Prints the client version info. This information includes not only the " "version number of the client, but also a listing of all repository access " "modules that the client can use to access a Subversion repository. With " "<option>--quiet</option> (<option>-q</option>) it prints only the version " "number in a compact form." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:671 msgid "<option>--with-all-revprops</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:673 msgid "" "Used with the <option>--xml</option> option to <command>svn log</command>, " "will retrieve and display all revision properties in the log output." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:680 msgid "<option>--with-revprop</option> <replaceable>ARG</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:683 msgid "" "When used with any command that writes to the repository, sets the revision " "property, using the <replaceable>NAME=VALUE</replaceable> format, " "<replaceable>NAME</replaceable> to <replaceable>VALUE</replaceable>. When " "used with <command>svn log</command> in <option>--xml</option> mode, this " "displays the value of <replaceable>ARG</replaceable> in the log output." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:694 msgid "<option>--xml</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:696 msgid "Prints output in XML format." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:706 msgid "svn Subcommands" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:708 msgid "" "Here are the various subcommands for the <command>svn</command> program. " "For the sake of brevity, we omit the global options (described in <xref " "linkend=\"svn.ref.svn.sw\" />) from the subcommand descriptions which follow." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:722 #, fuzzy #| msgid "svnadmin" msgid "svn add" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:723 msgid "Add files, directories, or symbolic links." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:727 ../en/book/ch09-reference.xml:836 #: ../en/book/ch09-reference.xml:972 ../en/book/ch09-reference.xml:1052 #: ../en/book/ch09-reference.xml:1147 ../en/book/ch09-reference.xml:1294 #: ../en/book/ch09-reference.xml:1371 ../en/book/ch09-reference.xml:1511 #: ../en/book/ch09-reference.xml:1716 ../en/book/ch09-reference.xml:1828 #: ../en/book/ch09-reference.xml:2153 ../en/book/ch09-reference.xml:2268 #: ../en/book/ch09-reference.xml:2318 ../en/book/ch09-reference.xml:2425 #: ../en/book/ch09-reference.xml:2611 ../en/book/ch09-reference.xml:2754 #: ../en/book/ch09-reference.xml:2847 ../en/book/ch09-reference.xml:3158 #: ../en/book/ch09-reference.xml:3305 ../en/book/ch09-reference.xml:3378 #: ../en/book/ch09-reference.xml:3462 ../en/book/ch09-reference.xml:3591 #: ../en/book/ch09-reference.xml:3670 ../en/book/ch09-reference.xml:3747 #: ../en/book/ch09-reference.xml:3845 ../en/book/ch09-reference.xml:3948 #: ../en/book/ch09-reference.xml:4086 ../en/book/ch09-reference.xml:4218 #: ../en/book/ch09-reference.xml:4312 ../en/book/ch09-reference.xml:4424 #: ../en/book/ch09-reference.xml:4867 ../en/book/ch09-reference.xml:5064 #: ../en/book/ch09-reference.xml:5152 ../en/book/ch09-reference.xml:5519 #: ../en/book/ch09-reference.xml:5567 ../en/book/ch09-reference.xml:5646 #: ../en/book/ch09-reference.xml:5686 ../en/book/ch09-reference.xml:5787 #: ../en/book/ch09-reference.xml:5819 ../en/book/ch09-reference.xml:5873 #: ../en/book/ch09-reference.xml:5906 ../en/book/ch09-reference.xml:5954 #: ../en/book/ch09-reference.xml:6020 ../en/book/ch09-reference.xml:6074 #: ../en/book/ch09-reference.xml:6120 ../en/book/ch09-reference.xml:6197 #: ../en/book/ch09-reference.xml:6242 ../en/book/ch09-reference.xml:6297 #: ../en/book/ch09-reference.xml:6358 ../en/book/ch09-reference.xml:6414 #: ../en/book/ch09-reference.xml:6469 ../en/book/ch09-reference.xml:6536 #: ../en/book/ch09-reference.xml:6708 ../en/book/ch09-reference.xml:6754 #: ../en/book/ch09-reference.xml:6812 ../en/book/ch09-reference.xml:6936 #: ../en/book/ch09-reference.xml:6982 ../en/book/ch09-reference.xml:7054 #: ../en/book/ch09-reference.xml:7100 ../en/book/ch09-reference.xml:7140 #: ../en/book/ch09-reference.xml:7203 ../en/book/ch09-reference.xml:7254 #: ../en/book/ch09-reference.xml:7306 ../en/book/ch09-reference.xml:7352 #: ../en/book/ch09-reference.xml:7407 ../en/book/ch09-reference.xml:7471 #: ../en/book/ch09-reference.xml:7531 ../en/book/ch09-reference.xml:7574 #: ../en/book/ch09-reference.xml:7757 ../en/book/ch09-reference.xml:7825 #: ../en/book/ch09-reference.xml:7866 ../en/book/ch09-reference.xml:7943 #: ../en/book/ch09-reference.xml:8299 ../en/book/ch09-reference.xml:8363 #: ../en/book/ch09-reference.xml:8427 ../en/book/ch09-reference.xml:8470 msgid "Synopsis" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:728 #, no-wrap msgid "svn add PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:733 msgid "" "Schedule files, directories, or symbolic links in your working copy for " "addition to the repository. They will be uploaded and added to the " "repository on your next commit. If you add something and change your mind " "before committing, you can unschedule the addition using <command>svn " "revert</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:743 ../en/book/ch09-reference.xml:849 #: ../en/book/ch09-reference.xml:984 ../en/book/ch09-reference.xml:1067 #: ../en/book/ch09-reference.xml:1164 ../en/book/ch09-reference.xml:1318 #: ../en/book/ch09-reference.xml:1406 ../en/book/ch09-reference.xml:1579 #: ../en/book/ch09-reference.xml:1738 ../en/book/ch09-reference.xml:1969 #: ../en/book/ch09-reference.xml:2178 ../en/book/ch09-reference.xml:2279 #: ../en/book/ch09-reference.xml:2336 ../en/book/ch09-reference.xml:2470 #: ../en/book/ch09-reference.xml:2655 ../en/book/ch09-reference.xml:2770 #: ../en/book/ch09-reference.xml:2884 ../en/book/ch09-reference.xml:3220 #: ../en/book/ch09-reference.xml:3324 ../en/book/ch09-reference.xml:3398 #: ../en/book/ch09-reference.xml:3510 ../en/book/ch09-reference.xml:3607 #: ../en/book/ch09-reference.xml:3686 ../en/book/ch09-reference.xml:3764 #: ../en/book/ch09-reference.xml:3861 ../en/book/ch09-reference.xml:3974 #: ../en/book/ch09-reference.xml:4154 ../en/book/ch09-reference.xml:4240 #: ../en/book/ch09-reference.xml:4329 ../en/book/ch09-reference.xml:4730 #: ../en/book/ch09-reference.xml:4922 ../en/book/ch09-reference.xml:5081 #: ../en/book/ch09-reference.xml:5242 ../en/book/ch09-reference.xml:5800 #: ../en/book/ch09-reference.xml:7119 ../en/book/ch09-reference.xml:7364 #: ../en/book/ch09-reference.xml:7419 msgid "Alternate names" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:744 ../en/book/ch09-reference.xml:985 #: ../en/book/ch09-reference.xml:1319 ../en/book/ch09-reference.xml:2179 #: ../en/book/ch09-reference.xml:2337 ../en/book/ch09-reference.xml:2471 #: ../en/book/ch09-reference.xml:2771 ../en/book/ch09-reference.xml:2885 #: ../en/book/ch09-reference.xml:3221 ../en/book/ch09-reference.xml:3325 #: ../en/book/ch09-reference.xml:3399 ../en/book/ch09-reference.xml:4155 #: ../en/book/ch09-reference.xml:4241 ../en/book/ch09-reference.xml:4330 #: ../en/book/ch09-reference.xml:5082 ../en/book/ch09-reference.xml:5537 #: ../en/book/ch09-reference.xml:6038 ../en/book/ch09-reference.xml:6209 #: ../en/book/ch09-reference.xml:6431 ../en/book/ch09-reference.xml:6500 #: ../en/book/ch09-reference.xml:7115 ../en/book/ch09-reference.xml:7269 #: ../en/book/ch09-reference.xml:7547 ../en/book/ch09-reference.xml:7585 #: ../en/book/ch09-reference.xml:7780 ../en/book/ch09-reference.xml:7842 #: ../en/book/ch09-reference.xml:7847 ../en/book/ch09-reference.xml:8442 msgid "None" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:748 ../en/book/ch09-reference.xml:854 #: ../en/book/ch09-reference.xml:989 ../en/book/ch09-reference.xml:1072 #: ../en/book/ch09-reference.xml:1169 ../en/book/ch09-reference.xml:1323 #: ../en/book/ch09-reference.xml:1413 ../en/book/ch09-reference.xml:1584 #: ../en/book/ch09-reference.xml:1743 ../en/book/ch09-reference.xml:1974 #: ../en/book/ch09-reference.xml:2183 ../en/book/ch09-reference.xml:2287 #: ../en/book/ch09-reference.xml:2341 ../en/book/ch09-reference.xml:2475 #: ../en/book/ch09-reference.xml:2660 ../en/book/ch09-reference.xml:2775 #: ../en/book/ch09-reference.xml:2889 ../en/book/ch09-reference.xml:3225 #: ../en/book/ch09-reference.xml:3329 ../en/book/ch09-reference.xml:3403 #: ../en/book/ch09-reference.xml:3515 ../en/book/ch09-reference.xml:3612 #: ../en/book/ch09-reference.xml:3691 ../en/book/ch09-reference.xml:3769 #: ../en/book/ch09-reference.xml:3866 ../en/book/ch09-reference.xml:3979 #: ../en/book/ch09-reference.xml:4159 ../en/book/ch09-reference.xml:4245 #: ../en/book/ch09-reference.xml:4334 ../en/book/ch09-reference.xml:4735 #: ../en/book/ch09-reference.xml:4927 ../en/book/ch09-reference.xml:5086 #: ../en/book/ch09-reference.xml:5247 #, fuzzy #| msgid "Make changes." msgid "Changes" msgstr "Nehmen Sie Änderungen vor." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:749 ../en/book/ch09-reference.xml:1073 #: ../en/book/ch09-reference.xml:1324 ../en/book/ch09-reference.xml:3226 #: ../en/book/ch09-reference.xml:4160 ../en/book/ch09-reference.xml:4246 #: ../en/book/ch09-reference.xml:4335 ../en/book/ch09-reference.xml:4928 #: ../en/book/ch09-reference.xml:5248 #, fuzzy #| msgid "Working Copies" msgid "Working copy" msgstr "Arbeitskopien" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:753 ../en/book/ch09-reference.xml:859 #: ../en/book/ch09-reference.xml:994 ../en/book/ch09-reference.xml:1077 #: ../en/book/ch09-reference.xml:1174 ../en/book/ch09-reference.xml:1328 #: ../en/book/ch09-reference.xml:1418 ../en/book/ch09-reference.xml:1589 #: ../en/book/ch09-reference.xml:1749 ../en/book/ch09-reference.xml:1979 #: ../en/book/ch09-reference.xml:2188 ../en/book/ch09-reference.xml:2292 #: ../en/book/ch09-reference.xml:2346 ../en/book/ch09-reference.xml:2480 #: ../en/book/ch09-reference.xml:2665 ../en/book/ch09-reference.xml:2780 #: ../en/book/ch09-reference.xml:2894 ../en/book/ch09-reference.xml:3230 #: ../en/book/ch09-reference.xml:3334 ../en/book/ch09-reference.xml:3408 #: ../en/book/ch09-reference.xml:3520 ../en/book/ch09-reference.xml:3617 #: ../en/book/ch09-reference.xml:3696 ../en/book/ch09-reference.xml:3774 #: ../en/book/ch09-reference.xml:3871 ../en/book/ch09-reference.xml:3984 #: ../en/book/ch09-reference.xml:4164 ../en/book/ch09-reference.xml:4250 #: ../en/book/ch09-reference.xml:4339 ../en/book/ch09-reference.xml:4740 #: ../en/book/ch09-reference.xml:4932 ../en/book/ch09-reference.xml:5091 #: ../en/book/ch09-reference.xml:5252 #, fuzzy #| msgid "The Repository" msgid "Accesses repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:758 ../en/book/ch09-reference.xml:864 #: ../en/book/ch09-reference.xml:999 ../en/book/ch09-reference.xml:1082 #: ../en/book/ch09-reference.xml:1179 ../en/book/ch09-reference.xml:1333 #: ../en/book/ch09-reference.xml:1423 ../en/book/ch09-reference.xml:1595 #: ../en/book/ch09-reference.xml:1754 ../en/book/ch09-reference.xml:1985 #: ../en/book/ch09-reference.xml:2193 ../en/book/ch09-reference.xml:2297 #: ../en/book/ch09-reference.xml:2351 ../en/book/ch09-reference.xml:2485 #: ../en/book/ch09-reference.xml:2670 ../en/book/ch09-reference.xml:2785 #: ../en/book/ch09-reference.xml:2899 ../en/book/ch09-reference.xml:3235 #: ../en/book/ch09-reference.xml:3339 ../en/book/ch09-reference.xml:3413 #: ../en/book/ch09-reference.xml:3525 ../en/book/ch09-reference.xml:3622 #: ../en/book/ch09-reference.xml:3701 ../en/book/ch09-reference.xml:3779 #: ../en/book/ch09-reference.xml:3876 ../en/book/ch09-reference.xml:3989 #: ../en/book/ch09-reference.xml:4169 ../en/book/ch09-reference.xml:4255 #: ../en/book/ch09-reference.xml:4344 ../en/book/ch09-reference.xml:4745 #: ../en/book/ch09-reference.xml:4937 ../en/book/ch09-reference.xml:5096 #: ../en/book/ch09-reference.xml:5257 ../en/book/ch09-reference.xml:5535 #: ../en/book/ch09-reference.xml:5599 ../en/book/ch09-reference.xml:5664 #: ../en/book/ch09-reference.xml:5741 ../en/book/ch09-reference.xml:5839 #: ../en/book/ch09-reference.xml:5966 ../en/book/ch09-reference.xml:6036 #: ../en/book/ch09-reference.xml:6130 ../en/book/ch09-reference.xml:6207 #: ../en/book/ch09-reference.xml:6254 ../en/book/ch09-reference.xml:6324 #: ../en/book/ch09-reference.xml:6375 ../en/book/ch09-reference.xml:6429 #: ../en/book/ch09-reference.xml:6498 ../en/book/ch09-reference.xml:6557 #: ../en/book/ch09-reference.xml:6719 ../en/book/ch09-reference.xml:6765 #: ../en/book/ch09-reference.xml:6870 ../en/book/ch09-reference.xml:6947 #: ../en/book/ch09-reference.xml:6993 ../en/book/ch09-reference.xml:7066 #: ../en/book/ch09-reference.xml:7114 ../en/book/ch09-reference.xml:7152 #: ../en/book/ch09-reference.xml:7214 ../en/book/ch09-reference.xml:7267 #: ../en/book/ch09-reference.xml:7316 ../en/book/ch09-reference.xml:7369 #: ../en/book/ch09-reference.xml:7424 ../en/book/ch09-reference.xml:7483 #: ../en/book/ch09-reference.xml:7546 ../en/book/ch09-reference.xml:7584 #: ../en/book/ch09-reference.xml:7784 ../en/book/ch09-reference.xml:7846 #: ../en/book/ch09-reference.xml:7889 ../en/book/ch09-reference.xml:7972 #: ../en/book/ch09-reference.xml:8311 ../en/book/ch09-reference.xml:8375 #: ../en/book/ch09-reference.xml:8441 ../en/book/ch09-reference.xml:8501 msgid "Options" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:760 #, no-wrap msgid "" "\n" "--auto-props\n" "--depth ARG\n" "--force\n" "--no-auto-props\n" "--no-ignore\n" "--parents\n" "--quiet (-q)\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:773 ../en/book/ch09-reference.xml:906 #: ../en/book/ch09-reference.xml:1007 ../en/book/ch09-reference.xml:1191 #: ../en/book/ch09-reference.xml:1342 ../en/book/ch09-reference.xml:1442 #: ../en/book/ch09-reference.xml:1611 ../en/book/ch09-reference.xml:1771 #: ../en/book/ch09-reference.xml:2005 ../en/book/ch09-reference.xml:2206 #: ../en/book/ch09-reference.xml:2370 ../en/book/ch09-reference.xml:2499 #: ../en/book/ch09-reference.xml:2683 ../en/book/ch09-reference.xml:2798 #: ../en/book/ch09-reference.xml:2918 ../en/book/ch09-reference.xml:3254 #: ../en/book/ch09-reference.xml:3347 ../en/book/ch09-reference.xml:3428 #: ../en/book/ch09-reference.xml:3542 ../en/book/ch09-reference.xml:3635 #: ../en/book/ch09-reference.xml:3717 ../en/book/ch09-reference.xml:3793 #: ../en/book/ch09-reference.xml:3891 ../en/book/ch09-reference.xml:4006 #: ../en/book/ch09-reference.xml:4181 ../en/book/ch09-reference.xml:4266 #: ../en/book/ch09-reference.xml:4356 ../en/book/ch09-reference.xml:4761 #: ../en/book/ch09-reference.xml:4953 ../en/book/ch09-reference.xml:5105 #: ../en/book/ch09-reference.xml:5274 ../en/book/ch09-reference.xml:5542 #: ../en/book/ch09-reference.xml:5612 ../en/book/ch09-reference.xml:5752 #: ../en/book/ch09-reference.xml:5923 ../en/book/ch09-reference.xml:5979 #: ../en/book/ch09-reference.xml:6042 ../en/book/ch09-reference.xml:6087 #: ../en/book/ch09-reference.xml:6136 ../en/book/ch09-reference.xml:6213 #: ../en/book/ch09-reference.xml:6262 ../en/book/ch09-reference.xml:6333 #: ../en/book/ch09-reference.xml:6385 ../en/book/ch09-reference.xml:6436 #: ../en/book/ch09-reference.xml:6505 ../en/book/ch09-reference.xml:6566 #: ../en/book/ch09-reference.xml:6728 ../en/book/ch09-reference.xml:6774 #: ../en/book/ch09-reference.xml:6880 ../en/book/ch09-reference.xml:6956 #: ../en/book/ch09-reference.xml:7005 ../en/book/ch09-reference.xml:7075 #: ../en/book/ch09-reference.xml:7162 ../en/book/ch09-reference.xml:7223 #: ../en/book/ch09-reference.xml:7273 ../en/book/ch09-reference.xml:7325 #: ../en/book/ch09-reference.xml:7379 ../en/book/ch09-reference.xml:7435 #: ../en/book/ch09-reference.xml:7551 ../en/book/ch09-reference.xml:7589 #: ../en/book/ch09-reference.xml:7799 ../en/book/ch09-reference.xml:7904 #: ../en/book/ch09-reference.xml:7987 ../en/book/ch09-reference.xml:8323 #: ../en/book/ch09-reference.xml:8543 msgid "Examples" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:775 #, fuzzy #| msgid "Update your working copy." msgid "To add a file to your working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:777 #, no-wrap msgid "" "\n" "$ svn add foo.c \n" "A foo.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:782 msgid "" "When adding a directory, the default behavior of <command>svn add</command> " "is to recurse:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:785 #, no-wrap msgid "" "\n" "$ svn add testdir\n" "A testdir\n" "A testdir/a\n" "A testdir/b\n" "A testdir/c\n" "A testdir/d\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:794 msgid "You can add a directory without adding its contents:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:797 #, no-wrap msgid "" "\n" "$ svn add --depth=empty otherdir\n" "A otherdir\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:802 msgid "" "Normally, the command <userinput>svn add *</userinput> will skip over any " "directories that are already under version control. Sometimes, however, you " "may want to add every unversioned object in your working copy, including " "those hiding deeper. Passing the <option>--force</option> option makes " "<command>svn add</command> recurse into versioned directories:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:811 #, no-wrap msgid "" "\n" "$ svn add * --force\n" "A foo.c\n" "A somedir/bar.c\n" "A (bin) otherdir/docs/baz.doc\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:831 msgid "svn blame" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:832 msgid "" "Show author and revision information inline for the specified files or URLs." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:837 #, no-wrap msgid "svn blame TARGET[@REV]..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:842 msgid "" "Show author and revision information inline for the specified files or " "URLs. Each line of text is annotated at the beginning with the author " "(username) and the revision number for the last change to that line." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:850 msgid "" "<command>praise</command>, <command>annotate</command>, <command>ann</" "command>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:855 ../en/book/ch09-reference.xml:990 #: ../en/book/ch09-reference.xml:1975 ../en/book/ch09-reference.xml:2288 #: ../en/book/ch09-reference.xml:2476 ../en/book/ch09-reference.xml:2661 #: ../en/book/ch09-reference.xml:2890 ../en/book/ch09-reference.xml:3330 #: ../en/book/ch09-reference.xml:4736 msgid "Nothing" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:866 #, no-wrap msgid "" "\n" "--extensions (-x) ARG\n" "--force\n" "--incremental\n" "--revision (-r) ARG\n" "--use-merge-history (-g)\n" "--verbose (-v)\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:908 msgid "" "If you want to see blame-annotated source for <filename>readme.txt</" "filename> in your test repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:911 #, no-wrap msgid "" "\n" "$ svn blame http://svn.red-bean.com/repos/test/readme.txt\n" " 3 sally This is a README file.\n" " 5 harry You should read this.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:917 msgid "" "Even if <command>svn blame</command> says that Harry last modified " "<filename>readme.txt</filename> in revision 5, you'll have to examine " "exactly what the revision changed to be sure that Harry changed the " "<emphasis>context</emphasis> of the line—he may have adjusted just the " "whitespace." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:925 msgid "" "If you use the <option>--xml</option> option, you can get XML output " "describing the blame annotations, but not the contents of the lines " "themselves:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:929 #, no-wrap msgid "" "\n" "$ svn blame --xml http://svn.red-bean.com/repos/test/readme.txt\n" "<?xml version=\"1.0\"?>\n" "<blame>\n" "<target\n" " path=\"sandwich.txt\">\n" "<entry\n" " line-number=\"1\">\n" "<commit\n" " revision=\"3\">\n" "<author>sally</author>\n" "<date>2008-05-25T19:12:31.428953Z</date>\n" "</commit>\n" "</entry>\n" "<entry\n" " line-number=\"2\">\n" "<commit\n" " revision=\"5\">\n" "<author>harry</author>\n" "<date>2008-05-29T03:26:12.293121Z</date>\n" "</commit>\n" "</entry>\n" "</target>\n" "</blame>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:968 msgid "Output the contents of the specified files or URLs." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:973 #, no-wrap msgid "svn cat TARGET[@REV]..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:978 msgid "" "Output the contents of the specified files or URLs. For listing the " "contents of directories, see <command>svn list</command> later in this " "chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1001 ../en/book/ch09-reference.xml:3341 #, no-wrap msgid "" "\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1009 msgid "" "If you want to view <filename>readme.txt</filename> in your repository " "without checking it out:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1011 #, no-wrap msgid "" "\n" "$ svn cat http://svn.red-bean.com/repos/test/readme.txt\n" "This is a README file.\n" "You should read this.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:1018 msgid "" "If your working copy is out of date (or you have local modifications) and " "you want to see the <literal>HEAD</literal> revision of a file in your " "working copy, <command>svn cat -r HEAD <replaceable>FILENAME</replaceable></" "command> will automatically fetch the <literal>HEAD</literal> revision of " "the specified path:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1026 #, no-wrap msgid "" "\n" "$ cat foo.c\n" "This file is in my local working copy \n" "and has changes that I've made.\n" "\n" "$ svn cat -r HEAD foo.c\n" "Latest revision fresh from the repository!\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:1047 msgid "svn changelist" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1048 msgid "Associate (or deassociate) local paths with a changelist." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1053 #, no-wrap msgid "changelist CLNAME TARGET..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1054 #, no-wrap msgid "changelist --remove TARGET..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1059 msgid "" "Used for dividing files in a working copy into a changelist (logical named " "grouping) in order to allow users to easily work on multiple file " "collections within a single working copy." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1068 #, fuzzy #| msgid "<command>svn copy</command>" msgid "<command>cl</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1084 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--remove\n" "--targets ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:1095 ../en/book/ch09-reference.xml:7495 #: ../en/book/ch09-reference.xml:8387 msgid "Example" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1097 msgid "" "Edit three files, add them to a changelist, then commit only files in that " "changelist:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1100 #, no-wrap msgid "" "\n" "$ svn cl issue1729 foo.c bar.c baz.c\n" "Path 'foo.c' is now a member of changelist 'issue1729'.\n" "Path 'bar.c' is now a member of changelist 'issue1729'.\n" "Path 'baz.c' is now a member of changelist 'issue1729'.\n" "\n" "$ svn status\n" "A someotherfile.c\n" "A test/sometest.c\n" "\n" "--- Changelist 'issue1729':\n" "A foo.c\n" "A bar.c\n" "A baz.c\n" "\n" "$ svn commit --changelist issue1729 -m \"Fixing Issue 1729.\"\n" "Adding bar.c\n" "Adding baz.c\n" "Adding foo.c\n" "Transmitting file data ...\n" "Committed revision 2.\n" "\n" "$ svn status\n" "A someotherfile.c\n" "A test/sometest.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1127 msgid "" "Note that only the files in changelist <replaceable>issue1729</replaceable> " "were committed." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:1143 #, fuzzy #| msgid "Initial Checkout" msgid "svn checkout" msgstr "Anfänglicher Checkout" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1144 msgid "Check out a working copy from a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1148 #, no-wrap msgid "svn checkout URL[@REV]... [PATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1153 msgid "" "Check out a working copy from a repository. If <replaceable>PATH</" "replaceable> is omitted, the basename of the URL will be used as the " "destination. If multiple URLs are given, each will be checked out into a " "subdirectory of <replaceable>PATH</replaceable>, with the name of the " "subdirectory being the basename of the URL." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1165 #, fuzzy #| msgid "<command>svn copy</command>" msgid "<command>co</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:1170 #, fuzzy #| msgid "Update your working copy." msgid "Creates a working copy" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1181 #, no-wrap msgid "" "\n" "--depth ARG\n" "--force\n" "--ignore-externals\n" "--quiet (-q)\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1193 msgid "" "Check out a working copy into a directory called <filename>mine</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1196 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos/test mine\n" "A mine/a\n" "A mine/b\n" "A mine/c\n" "A mine/d\n" "Checked out revision 20.\n" "$ ls\n" "mine\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1207 msgid "Check out two different directories into two separate working copies:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1210 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos/test file:///var/svn/repos/quiz\n" "A test/a\n" "A test/b\n" "A test/c\n" "A test/d\n" "Checked out revision 20.\n" "A quiz/l\n" "A quiz/m\n" "Checked out revision 13.\n" "$ ls\n" "quiz test\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1224 msgid "" "Check out two different directories into two separate working copies, but " "place both into a directory called <filename>working-copies</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1228 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos/test file:///var/svn/repos/quiz working-copies\n" "A working-copies/test/a\n" "A working-copies/test/b\n" "A working-copies/test/c\n" "A working-copies/test/d\n" "Checked out revision 20.\n" "A working-copies/quiz/l\n" "A working-copies/quiz/m\n" "Checked out revision 13.\n" "$ ls\n" "working-copies\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1242 msgid "" "If you interrupt a checkout (or something else interrupts your checkout, " "such as loss of connectivity, etc.), you can restart it either by issuing " "the identical checkout command again or by updating the incomplete working " "copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1248 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos/test mine\n" "A mine/a\n" "A mine/b\n" "^C\n" "svn: The operation was interrupted\n" "svn: caught SIGINT\n" "\n" "$ svn checkout file:///var/svn/repos/test mine\n" "A mine/c\n" "^C\n" "svn: The operation was interrupted\n" "svn: caught SIGINT\n" "\n" "$ svn update mine\n" "A mine/d\n" "Updated to revision 20.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1267 msgid "" "If you wish to check out some revision other than the most recent one, you " "can do so by providing the <option>--revision</option> (<option>-r</option>) " "option to the <command>svn checkout</command> command:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1272 #, no-wrap msgid "" "\n" "$ svn checkout -r 2 file:///var/svn/repos/test mine\n" "A mine/a\n" "Checked out revision 2.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:1290 msgid "svn cleanup" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1291 msgid "Recursively clean up the working copy" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1295 #, no-wrap msgid "svn cleanup [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1300 msgid "" "Recursively clean up the working copy, removing working copy locks and " "resuming unfinished operations. If you ever get a <literal>working copy " "locked</literal> error, run this command to remove stale locks and get your " "working copy into a usable state again." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1306 msgid "" "If, for some reason, an <command>svn update</command> fails due to a problem " "running an external diff program (e.g., user input or network failure), pass " "the <option>--diff3-cmd</option> to allow cleanup to complete any merging " "with your external diff program. You can also specify any configuration " "directory with the <option>--config-dir</option> option, but you should need " "these options extremely infrequently." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1335 #, no-wrap msgid "" "\n" "--diff3-cmd CMD\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1344 msgid "" "Well, there's not much to the examples here, as <command>svn cleanup</" "command> generates no output. If you pass no <replaceable>PATH</" "replaceable>, then <quote><filename>.</filename></quote> is used:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1349 #, no-wrap msgid "" "\n" "$ svn cleanup\n" "\n" "$ svn cleanup /var/svn/working-copy\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:1367 #, fuzzy #| msgid "svn import" msgid "svn commit" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1368 msgid "Send changes from your working copy to the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1372 #, no-wrap msgid "svn commit [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:1377 #, fuzzy #| msgid "" #| "If you fail to specify either the <option>--message</option> or <option>--" #| "file</option> option, Subversion will automatically launch your favorite " #| "editor (see the information on <literal>editor-cmd</literal> in <xref " #| "linkend=\"svn.advanced.confarea.opts.config\"/>) for composing a log " #| "message." msgid "" "Send changes from your working copy to the repository. If you do not supply " "a log message with your commit by using either the <option>--file</option> " "or <option>--message</option> option, <command>svn</command> will launch " "your editor for you to compose a commit message. See the <literal>editor-" "cmd</literal> list entry in <xref linkend=\"svn.advanced.confarea.opts.config" "\"/>." msgstr "" "Sollten Sie vergessen, entweder die Option <option>--message</option> oder " "die <option>--file</option>-Option anzugeben, startet Subversion automatisch " "Ihren Lieblingseditor (siehe die Information zu <literal>editor-cmd</" "literal> in <xref linkend=\"svn.advanced.confarea.opts.config\"/>), damit " "Sie einen Protokolleintrag erstellen können." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1386 msgid "" "<command>svn commit</command> will send any lock tokens that it finds and " "will release locks on all <replaceable>PATH</replaceable>s committed " "(recursively) unless <option>--no-unlock</option> is passed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:1392 msgid "" "If you begin a commit and Subversion launches your editor to compose the " "commit message, you can still abort without committing your changes. If you " "want to cancel your commit, just quit your editor without saving your commit " "message and Subversion will prompt you to either abort the commit, continue " "with no message, or edit the message again." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1407 msgid "" "<command>ci</command> (short for <quote>check in</quote>; not <command>co</" "command>, which is an alias for the <command>checkout</command> subcommand)" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:1414 #, fuzzy #| msgid "How Working Copies Track the Repository" msgid "Working copy; repository" msgstr "Wie Arbeitskopien das Repository verfolgen" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1425 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--editor-cmd ARG\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force-log\n" "--keep-changelists\n" "--message (-m) TEXT\n" "--no-unlock\n" "--quiet (-q)\n" "--targets FILENAME\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1444 msgid "" "Commit a simple modification to a file with the commit message on the " "command line and an implicit target of your current directory " "(<quote><filename>.</filename></quote>):" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:1449 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit -F logmsg\n" #| "Sending sandwich.txt\n" #| "Transmitting file data .\n" #| "Committed revision 4.\n" msgid "" "\n" "$ svn commit -m \"added howto section.\"\n" "Sending a\n" "Transmitting file data .\n" "Committed revision 3.\n" msgstr "" "\n" "$ svn commit -F logmsg\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 4.\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1456 msgid "" "Commit a modification to the file <filename>foo.c</filename> (explicitly " "specified on the command line) with the commit message in a file named " "<filename>msg</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:1461 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit -F logmsg\n" #| "Sending sandwich.txt\n" #| "Transmitting file data .\n" #| "Committed revision 4.\n" msgid "" "\n" "$ svn commit -F msg foo.c\n" "Sending foo.c\n" "Transmitting file data .\n" "Committed revision 5.\n" msgstr "" "\n" "$ svn commit -F logmsg\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 4.\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1468 msgid "" "If you want to use a file that's under version control for your commit " "message with <option>--file</option>, you need to pass the <option>--force-" "log</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1473 #, no-wrap msgid "" "\n" "$ svn commit --file file_under_vc.txt foo.c\n" "svn: The log message file is under version control\n" "svn: Log message file is a versioned file; use '--force-log' to override\n" "\n" "$ svn commit --force-log --file file_under_vc.txt foo.c\n" "Sending foo.c\n" "Transmitting file data .\n" "Committed revision 6.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1484 msgid "To commit a file scheduled for deletion:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:1486 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit -m \"Corrected number of cheese slices.\"\n" #| "Sending sandwich.txt\n" #| "Transmitting file data .\n" #| "Committed revision 3.\n" msgid "" "\n" "$ svn commit -m \"removed file 'c'.\"\n" "Deleting c\n" "\n" "Committed revision 7.\n" msgstr "" "\n" "$ svn commit -m \"Corrected number of cheese slices.\"\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 3.\n" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:1505 msgid "svn copy" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1506 msgid "Copy a file or directory in a working copy or in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1512 #, no-wrap msgid "svn copy SRC[@REV]... DST" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1518 msgid "" "Copy one or more files in a working copy or in the repository. When copying " "multiple sources, they will be added as children of <replaceable>DST</" "replaceable>, which must be a directory. <replaceable>SRC</replaceable> and " "<replaceable>DST</replaceable> can each be either a working copy (WC) path " "or URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1528 ../en/book/ch09-reference.xml:3492 msgid "WC → WC" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1530 msgid "Copy and schedule an item for addition (with history)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1536 msgid "WC → URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1538 msgid "Immediately commit a copy of WC to URL." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1543 msgid "URL → WC" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1545 msgid "Check out URL into WC and schedule it for addition." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1551 ../en/book/ch09-reference.xml:3500 msgid "URL → URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1553 msgid "Complete server-side copy. This is usually used to branch and tag." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1560 msgid "" "When copying multiple sources, they will be added as children of " "<replaceable>DST</replaceable>, which must be a directory." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1564 msgid "" "If no peg revision (i.e., <replaceable>@REV</replaceable>) is supplied, by " "default the <literal>BASE</literal> revision will be used for files copied " "from the working copy, while the <literal>HEAD</literal> revision will be " "used for files copied from a URL." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><note><para> #: ../en/book/ch09-reference.xml:1572 msgid "" "You can only copy files within a single repository. Subversion does not " "support cross-repository copying." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1580 #, fuzzy #| msgid "<command>svn copy</command>" msgid "<command>cp</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1585 msgid "" "Repository if destination is a URL; working copy if destination is a WC path" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1590 msgid "" "Yes, if source or destination is in the repository, or if needed to look up " "the source revision number." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1597 #, no-wrap msgid "" "\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force-log\n" "--message (-m) TEXT\n" "--parents\n" "--quiet (-q)\n" "--revision (-r) REV\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1613 msgid "" "Copy an item within your working copy (this schedules the copy—nothing " "goes into the repository until you commit):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1617 #, no-wrap msgid "" "\n" "$ svn copy foo.txt bar.txt\n" "A bar.txt\n" "$ svn status\n" "A + bar.txt\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1624 msgid "Copy several files in a working copy into a subdirectory:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1627 #, no-wrap msgid "" "\n" "$ svn cp bat.c baz.c qux.c src\n" "A src/bat.c\n" "A src/baz.c\n" "A src/qux.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1634 msgid "" "Copy revision 8 of <filename>bat.c</filename> into your working copy under a " "different name:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1637 #, no-wrap msgid "" "\n" "$ svn cp -r 8 bat.c ya-old-bat.c\n" "A ya-old-bat.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1642 msgid "" "Copy an item in your working copy to a URL in the repository (this is an " "immediate commit, so you must supply a commit message):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1646 #, no-wrap msgid "" "\n" "$ svn copy near.txt file:///var/svn/repos/test/far-away.txt -m \"Remote copy.\"\n" "\n" "Committed revision 8.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1652 msgid "" "Copy an item from the repository to your working copy (this just schedules " "the copy—nothing goes into the repository until you commit):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1656 #, no-wrap msgid "" "\n" "$ svn copy file:///var/svn/repos/test/far-away -r 6 near-here\n" "A near-here\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:1662 msgid "" "This is the recommended way to resurrect a dead file in your repository!" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1666 msgid "And finally, copy between two URLs:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1668 #, no-wrap msgid "" "\n" "$ svn copy file:///var/svn/repos/test/far-away \\\n" " file:///var/svn/repos/test/over-there -m \"remote copy.\"\n" "\n" "Committed revision 9.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1675 #, no-wrap msgid "" "\n" "$ svn copy file:///var/svn/repos/test/trunk \\\n" " file:///var/svn/repos/test/tags/0.6.32-prerelease -m \"tag tree\"\n" "\n" "Committed revision 12.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:1683 msgid "" "This is the easiest way to <quote>tag</quote> a revision in your " "repository—just <command>svn copy</command> that revision (usually " "<literal>HEAD</literal>) into your <filename>tags</filename> directory." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1689 msgid "" "And don't worry if you forgot to tag—you can always specify an older " "revision and tag anytime:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1692 #, no-wrap msgid "" "\n" "$ svn copy -r 11 file:///var/svn/repos/test/trunk \\\n" " file:///var/svn/repos/test/tags/0.6.32-prerelease \\\n" " -m \"Forgot to tag at rev 11\"\n" "\n" "Committed revision 13.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1711 #, fuzzy #| msgid "svndumpfilter" msgid "svn delete" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1712 msgid "Delete an item from a working copy or the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1717 #, no-wrap msgid "svn delete PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1718 #, no-wrap msgid "svn delete URL..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1723 msgid "" "Items specified by <replaceable>PATH</replaceable> are scheduled for " "deletion upon the next commit. Files (and directories that have not been " "committed) are immediately removed from the working copy unless the " "<option>--keep-local</option> option is given. The command will not remove " "any unversioned or modified items; use the <option>--force</option> option " "to override this behavior." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1732 msgid "" "Items specified by URL are deleted from the repository via an immediate " "commit. Multiple URLs are committed atomically." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1739 msgid "" "<command>del</command>, <command>remove</command>, <command>rm</command>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1744 msgid "Working copy if operating on files; repository if operating on URLs" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1750 ../en/book/ch09-reference.xml:2481 msgid "Only if operating on URLs" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1756 #, no-wrap msgid "" "\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force\n" "--force-log\n" "--keep-local\n" "--message (-m) TEXT\n" "--quiet (-q)\n" "--targets FILENAME\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1773 msgid "" "Using <command>svn</command> to delete a file from your working copy deletes " "your local copy of the file, but it merely schedules the file to be deleted " "from the repository. When you commit, the file is deleted in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:1779 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn commit -m \"Corrected number of cheese slices.\"\n" #| "Sending sandwich.txt\n" #| "Transmitting file data .\n" #| "Committed revision 3.\n" msgid "" "\n" "$ svn delete myfile\n" "D myfile\n" "\n" "$ svn commit -m \"Deleted file 'myfile'.\"\n" "Deleting myfile\n" "Transmitting file data .\n" "Committed revision 14.\n" msgstr "" "\n" "$ svn commit -m \"Corrected number of cheese slices.\"\n" "Sending sandwich.txt\n" "Transmitting file data .\n" "Committed revision 3.\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1789 msgid "" "Deleting a URL, however, is immediate, so you have to supply a log message:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1792 #, no-wrap msgid "" "\n" "$ svn delete -m \"Deleting file 'yourfile'\" \\\n" " file:///var/svn/repos/test/yourfile\n" "\n" "Committed revision 15.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1799 msgid "" "Here's an example of how to force deletion of a file that has local mods:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1802 #, no-wrap msgid "" "\n" "$ svn delete over-there \n" "svn: Attempting restricted operation for modified resource\n" "svn: Use --force to override this restriction\n" "svn: 'over-there' has local modifications\n" "\n" "$ svn delete --force over-there \n" "D over-there\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1824 #, fuzzy #| msgid "svnadmin" msgid "svn diff" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:1825 msgid "This displays the differences between two revisions or paths." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1829 #, no-wrap msgid "diff [-c M | -r N[:M]] [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1830 #, no-wrap msgid "diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:1831 #, no-wrap msgid "diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1840 msgid "" "Display the differences between two paths. You can use <command>svn diff</" "command> in the following ways:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1845 msgid "" "Use just <command>svn diff</command> to display local modifications in a " "working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1850 msgid "" "Display the changes made to <replaceable>TARGET</replaceable>s as they are " "seen in <replaceable>REV</replaceable> between two revisions. " "<replaceable>TARGET</replaceable>s may be all working copy paths or all " "<replaceable>URL</replaceable>s. If <replaceable>TARGET</replaceable>s are " "working copy paths, <replaceable>N</replaceable> defaults to <literal>BASE</" "literal> and <replaceable>M</replaceable> to the working copy; if " "<replaceable>TARGET</replaceable>s are <replaceable>URL</replaceable>s, " "<replaceable>N</replaceable> must be specified and <replaceable>M</" "replaceable> defaults to <literal>HEAD</literal>. The <literal>-c M</" "literal> option is equivalent to <literal>-r N:M</literal> where <literal>N " "= M-1</literal>. Using <literal>-c -M</literal> does the reverse: <literal>-" "r M:N</literal> where <literal>N = M-1</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1870 msgid "" "Display the differences between <replaceable>OLD-TGT</replaceable> as it was " "seen in <replaceable>OLDREV</replaceable> and <replaceable>NEW-TGT</" "replaceable> as it was seen in <replaceable>NEWREV</replaceable>. " "<replaceable>PATH</replaceable>s, if given, are relative to <replaceable>OLD-" "TGT</replaceable> and <replaceable>NEW-TGT</replaceable> and restrict the " "output to differences for those paths. <replaceable>OLD-TGT</replaceable> " "and <replaceable>NEW-TGT</replaceable> may be working copy paths or " "<replaceable>URL[@REV]</replaceable>. <replaceable>NEW-TGT</replaceable> " "defaults to <replaceable>OLD-TGT</replaceable> if not specified. <literal>-" "r N</literal> makes <replaceable>OLDREV</replaceable> default to <literal>N</" "literal>; <literal>-r N:M</literal> makes <replaceable>OLDREV</replaceable> " "default to <replaceable>N</replaceable> and <replaceable>NEWREV</" "replaceable> default to <replaceable>M</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1895 msgid "" "<command>svn diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]</command> is shorthand " "for <command>svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV].</" "command>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1900 msgid "" "<command>svn diff -r N:M URL</command> is shorthand for <command>svn diff -r " "N:M --old=URL --new=URL</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1904 msgid "" "<command>svn diff [-r N[:M]] URL1[@N] URL2[@M]</command> is shorthand for " "<command>svn diff [-r N[:M]] --old=URL1 --new=URL2</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1908 msgid "" "If <replaceable>TARGET</replaceable> is a URL, then revs <literal>N</" "literal> and <literal>M</literal> can be given either via the <option>--" "revision</option> option or by using the <quote>@</quote> notation as " "described earlier." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1913 msgid "" "If <replaceable>TARGET</replaceable> is a working copy path, the <option>--" "revision</option> option means:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1920 msgid "<option>--revision N:M</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1922 msgid "" "The server compares <replaceable>TARGET@N</replaceable> and " "<replaceable>TARGET@M</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1930 msgid "<option>--revision N</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1932 msgid "" "The client compares <replaceable>TARGET@N</replaceable> against the working " "copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:1939 msgid "(no <option>--revision</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:1941 msgid "" "The client compares base and working copies of <replaceable>TARGET</" "replaceable>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1948 msgid "" "If the alternate syntax is used, the server compares <replaceable>URL1</" "replaceable> and <replaceable>URL2</replaceable> at revisions " "<replaceable>N</replaceable> and <replaceable>M</replaceable>, " "respectively. If either <replaceable>N</replaceable> or <replaceable>M</" "replaceable> is omitted, a value of <literal>HEAD</literal> is assumed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1957 msgid "" "By default, <command>svn diff</command> ignores the ancestry of files and " "merely compares the contents of the two files being compared. If you use " "<option>--notice-ancestry</option>, the ancestry of the paths in question " "will be taken into consideration when comparing revisions (i.e., if you run " "<command>svn diff</command> on two files with identical contents but " "different ancestry, you will see the entire contents of the file as having " "been removed and added again)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:1970 #, fuzzy #| msgid "<command>svn diff</command>" msgid "<command>di</command>" msgstr "<command>svn diff</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:1980 msgid "" "For obtaining differences against anything but <literal>BASE</literal> " "revision in your working copy" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:1987 #, no-wrap msgid "" "\n" "--change (-c) ARG\n" "--changelist ARG\n" "--depth ARG\n" "--diff-cmd CMD\n" "--extensions (-x) \"ARGS\"\n" "--force\n" "--new ARG\n" "--no-diff-deleted\n" "--notice-ancestry\n" "--old ARG\n" "--revision (-r) ARG\n" "--summarize\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2007 msgid "" "Compare <literal>BASE</literal> and your working copy (one of the most " "popular uses of <command>svn diff</command>):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2011 #, no-wrap msgid "" "\n" "$ svn diff COMMITTERS \n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 4404)\n" "+++ COMMITTERS\t(working copy)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2019 msgid "" "See what changed in the file <filename>COMMITTERS</filename> revision 9115:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2022 #, no-wrap msgid "" "\n" "$ svn diff -c 9115 COMMITTERS \n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 3900)\n" "+++ COMMITTERS\t(working copy)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2031 msgid "" "See how your working copy's modifications compare against an older revision:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2034 #, no-wrap msgid "" "\n" "$ svn diff -r 3900 COMMITTERS \n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 3900)\n" "+++ COMMITTERS\t(working copy)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2042 msgid "Compare revision 3000 to revision 3500 using <quote>@</quote> syntax:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2045 #, no-wrap msgid "" "\n" "$ svn diff http://svn.collab.net/repos/svn/trunk/COMMITTERS@3000 \\\n" " http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500\n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 3000)\n" "+++ COMMITTERS\t(revision 3500)\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2055 msgid "" "Compare revision 3000 to revision 3500 using range notation (pass only the " "one URL in this case):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2059 #, no-wrap msgid "" "\n" "$ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk/COMMITTERS\n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 3000)\n" "+++ COMMITTERS\t(revision 3500)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2068 msgid "" "Compare revision 3000 to revision 3500 of all the files in <filename>trunk</" "filename> using range notation:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2071 #, no-wrap msgid "" "\n" "$ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2076 msgid "" "Compare revision 3000 to revision 3500 of only three files in " "<filename>trunk</filename> using range notation:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2080 #, no-wrap msgid "" "\n" "$ svn diff -r 3000:3500 --old http://svn.collab.net/repos/svn/trunk \\\n" " COMMITTERS README HACKING\n" " " msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2085 msgid "" "If you have a working copy, you can obtain the differences without typing in " "the long URLs:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2088 #, no-wrap msgid "" "\n" "$ svn diff -r 3000:3500 COMMITTERS \n" "Index: COMMITTERS\n" "===================================================================\n" "--- COMMITTERS\t(revision 3000)\n" "+++ COMMITTERS\t(revision 3500)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2096 msgid "" "Use <option>--diff-cmd</option> <replaceable>CMD</replaceable> <option>-x</" "option> to pass arguments directly to the external diff program:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2101 #, no-wrap msgid "" "\n" "$ svn diff --diff-cmd /usr/bin/diff -x \"-i -b\" COMMITTERS \n" "Index: COMMITTERS\n" "===================================================================\n" "0a1,2\n" "> This is a test\n" "> \n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2110 msgid "" "Lastly, you can use the <option>--xml</option> option along with the " "<option>--summarize</option> option to view XML describing the changes that " "occurred between revisions, but not the contents of the diff itself:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2115 #, no-wrap msgid "" "\n" "$ svn diff --summarize --xml http://svn.red-bean.com/repos/test@r2 \\\n" " http://svn.red-bean.com/repos/test\n" "<?xml version=\"1.0\"?>\n" "<diff>\n" "<paths>\n" "<path\n" " props=\"none\"\n" " kind=\"file\"\n" " item=\"modified\">http://svn.red-bean.com/repos/test/sandwich.txt</path>\n" "<path\n" " props=\"none\"\n" " kind=\"file\"\n" " item=\"deleted\">http://svn.red-bean.com/repos/test/burrito.txt</path>\n" "<path\n" " props=\"none\"\n" " kind=\"dir\"\n" " item=\"added\">http://svn.red-bean.com/repos/test/snacks</path>\n" "</paths>\n" "</diff>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2149 #, fuzzy #| msgid "svn import" msgid "svn export" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2150 msgid "Export a clean directory tree." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2154 #, no-wrap msgid "svn export [-r REV] URL[@PEGREV] [PATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2155 #, no-wrap msgid "svn export [-r REV] PATH1[@PEGREV] [PATH2]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2160 msgid "" "The first form exports a clean directory tree from the repository specified " "by <replaceable>URL</replaceable>—at revision <replaceable>REV</" "replaceable> if it is given; otherwise, at <literal>HEAD</literal>, into " "<replaceable>PATH</replaceable>. If <replaceable>PATH</replaceable> is " "omitted, the last component of the <replaceable>URL</replaceable> is used " "for the local directory name." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2169 msgid "" "The second form exports a clean directory tree from the working copy " "specified by <replaceable>PATH1</replaceable> into <replaceable>PATH2</" "replaceable>. All local changes will be preserved, but files not under " "version control will not be copied." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2184 msgid "Local disk" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2189 msgid "Only if exporting from a URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2195 #, no-wrap msgid "" "\n" "--depth ARG\n" "--force\n" "--ignore-externals\n" "--native-eol EOL\n" "--quiet (-q)\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2208 msgid "Export from your working copy (doesn't print every file and directory):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2211 #, no-wrap msgid "" "\n" "$ svn export a-wc my-export\n" "Export complete.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2216 msgid "Export directly from the repository (prints every file and directory):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2219 #, no-wrap msgid "" "\n" "$ svn export file:///var/svn/repos my-export\n" "A my-export/test\n" "A my-export/quiz\n" "…\n" "Exported revision 15.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2227 msgid "" "When rolling operating-system-specific release packages, it can be useful to " "export a tree that uses a specific EOL character for line endings. The " "<option>--native-eol</option> option will do this, but it affects only files " "that have <literal>svn:eol-style = native</literal> properties attached to " "them. For example, to export a tree with all CRLF line endings (possibly " "for a Windows <filename>.zip</filename> file distribution):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2237 #, no-wrap msgid "" "\n" "$ svn export file:///var/svn/repos my-export --native-eol CRLF\n" "A my-export/test\n" "A my-export/quiz\n" "…\n" "Exported revision 15.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2245 msgid "" "You can specify <literal>LR</literal>, <literal>CR</literal>, or " "<literal>CRLF</literal> as a line-ending type with the <option>--native-eol</" "option> option." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:2264 msgid "svn help" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2269 #, no-wrap msgid "svn help [SUBCOMMAND...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2274 msgid "" "This is your best friend when you're using Subversion and this book isn't " "within reach!" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2280 ../en/book/ch09-reference.xml:5801 #: ../en/book/ch09-reference.xml:7120 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>?</command>, <command>h</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2281 msgid "" "The options <option>-?</option>, <option>-h</option>, and <option>--help</" "option> have the same effect as using the <command>help</command> subcommand." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2314 msgid "Commit an unversioned file or tree into the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2319 #, fuzzy, no-wrap #| msgid "svn import" msgid "svn import [PATH] URL" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2324 msgid "" "Recursively commit a copy of <replaceable>PATH</replaceable> to " "<replaceable>URL</replaceable>. If <replaceable>PATH</replaceable> is " "omitted, <quote><filename>.</filename></quote> is assumed. Parent " "directories are created in the repository as necessary. Unversionable items " "such as device files and pipes are ignored even if <option>--force</option> " "is specified." msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:2342 #, fuzzy #| msgid "The Repository" msgid "Repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2353 #, no-wrap msgid "" "\n" "--auto-props\n" "--depth ARG\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force\n" "--force-log\n" "--message (-m) TEXT\n" "--no-auto-props\n" "--no-ignore\n" "--quiet (-q)\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2372 msgid "" "This imports the local directory <filename>myproj</filename> into " "<filename>trunk/misc</filename> in your repository. The directory " "<filename>trunk/misc</filename> need not exist before you import into " "it—<command>svn import</command> will recursively create directories " "for you." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2380 #, no-wrap msgid "" "\n" "$ svn import -m \"New import\" myproj \\\n" " http://svn.red-bean.com/repos/trunk/misc\n" "Adding myproj/sample.txt\n" "…\n" "Transmitting file data .........\n" "Committed revision 16.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2389 msgid "" "Be aware that this will <emphasis>not</emphasis> create a directory named " "<filename>myproj</filename> in the repository. If that's what you want, " "simply add <filename>myproj</filename> to the end of the URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2394 #, no-wrap msgid "" "\n" "$ svn import -m \"New import\" myproj \\\n" " http://svn.red-bean.com/repos/trunk/misc/myproj\n" "Adding myproj/sample.txt\n" "…\n" "Transmitting file data .........\n" "Committed revision 16.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:2403 #, fuzzy #| msgid "" #| "Note that after the import is finished, the original tree is " #| "<emphasis>not</emphasis> converted into a working copy. To start " #| "working, you still need to <command>svn checkout</command> a fresh " #| "working copy of the tree." msgid "" "After importing data, note that the original tree is <emphasis>not</" "emphasis> under version control. To start working, you still need to " "<command>svn checkout</command> a fresh working copy of the tree." msgstr "" "Beachten Sie, dass nach dem Import der Originalbaum <emphasis>nicht</" "emphasis> in eine Arbeitskopie umgewandelt wird. Vor Beginn der Arbeit " "müssen Sie noch <command>svn checkout</command> ausführen, um eine frische " "Arbeitskopie des Baums zu erhalten." # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2420 #, fuzzy #| msgid "svn import" msgid "svn info" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2421 msgid "Display information about a local or remote item." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2426 #, no-wrap msgid "svn info [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2431 msgid "" "Print information about the working copy paths or URLs specified. The " "information shown for both may include:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2436 msgid "Path" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2437 msgid "Name" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2438 msgid "URL" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch09-reference.xml:2439 #, fuzzy #| msgid "Repository URLs" msgid "Repository root" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch09-reference.xml:2440 #, fuzzy #| msgid "Repository URLs" msgid "Repository UUID" msgstr "Repository URLs" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2441 #, fuzzy #| msgid "Revisions" msgid "Revision" msgstr "Revisionen" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2442 msgid "Node kind" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2443 msgid "Last changed author" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2444 msgid "Last changed revision" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:2445 #, fuzzy #| msgid "Locally changed, and out of date" msgid "Last changed date" msgstr "Lokal geändert und veraltet" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2446 msgid "Lock token" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2447 msgid "Lock owner" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2448 msgid "Lock created (date)" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2449 msgid "Lock expires (date)" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2452 msgid "" "Additional kinds of information available only for working copy paths are:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2456 msgid "Schedule" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2457 msgid "Copied from URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2458 msgid "Copied from rev" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2459 msgid "Text last updated" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2460 msgid "Properties last updated" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2461 msgid "Checksum" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2462 msgid "Conflict previous base file" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2463 msgid "Conflict previous working file" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2464 msgid "Conflict current base file" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2465 msgid "Conflict properties file" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2487 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--incremental\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--targets FILENAME\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2501 msgid "" "<command>svn info</command> will show you all the useful information that it " "has for items in your working copy. It will show information for files:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2505 #, no-wrap msgid "" "\n" "$ svn info foo.c\n" "Path: foo.c\n" "Name: foo.c\n" "URL: http://svn.red-bean.com/repos/test/foo.c\n" "Repository Root: http://svn.red-bean.com/repos/test\n" "Repository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25\n" "Revision: 4417\n" "Node Kind: file\n" "Schedule: normal\n" "Last Changed Author: sally\n" "Last Changed Rev: 20\n" "Last Changed Date: 2003-01-13 16:43:13 -0600 (Mon, 13 Jan 2003)\n" "Text Last Updated: 2003-01-16 21:18:16 -0600 (Thu, 16 Jan 2003)\n" "Properties Last Updated: 2003-01-13 21:50:19 -0600 (Mon, 13 Jan 2003)\n" "Checksum: d6aeb60b0662ccceb6bce4bac344cb66\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2523 msgid "It will also show information for directories:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2525 #, no-wrap msgid "" "\n" "$ svn info vendors\n" "Path: vendors\n" "URL: http://svn.red-bean.com/repos/test/vendors\n" "Repository Root: http://svn.red-bean.com/repos/test\n" "Repository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25\n" "Revision: 19\n" "Node Kind: directory\n" "Schedule: normal\n" "Last Changed Author: harry\n" "Last Changed Rev: 19\n" "Last Changed Date: 2003-01-16 23:21:19 -0600 (Thu, 16 Jan 2003)\n" "Properties Last Updated: 2003-01-16 23:39:02 -0600 (Thu, 16 Jan 2003)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2540 msgid "" "<command>svn info</command> also acts on URLs (also note that the file " "<filename>readme.doc</filename> in this example is locked, so lock " "information is also provided):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2545 #, no-wrap msgid "" "\n" "$ svn info http://svn.red-bean.com/repos/test/readme.doc\n" "Path: readme.doc\n" "Name: readme.doc\n" "URL: http://svn.red-bean.com/repos/test/readme.doc\n" "Repository Root: http://svn.red-bean.com/repos/test\n" "Repository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25\n" "Revision: 1\n" "Node Kind: file\n" "Schedule: normal\n" "Last Changed Author: sally\n" "Last Changed Rev: 42\n" "Last Changed Date: 2003-01-14 23:21:19 -0600 (Tue, 14 Jan 2003)\n" "Lock Token: opaquelocktoken:14011d4b-54fb-0310-8541-dbd16bd471b2\n" "Lock Owner: harry\n" "Lock Created: 2003-01-15 17:35:12 -0600 (Wed, 15 Jan 2003)\n" "Lock Comment (1 line):\n" "My test lock comment\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2565 msgid "" "Lastly, <command>svn info</command> output is available in XML format by " "passing the<option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2569 #, no-wrap msgid "" "\n" "$ svn info --xml http://svn.red-bean.com/repos/test\n" "<?xml version=\"1.0\"?>\n" "<info>\n" "<entry\n" " kind=\"dir\"\n" " path=\".\"\n" " revision=\"1\">\n" "<url>http://svn.red-bean.com/repos/test</url>\n" "<repository>\n" "<root>http://svn.red-bean.com/repos/test</root>\n" "<uuid>5e7d134a-54fb-0310-bd04-b611643e5c25</uuid>\n" "</repository>\n" "<wc-info>\n" "<schedule>normal</schedule>\n" "<depth>infinity</depth>\n" "</wc-info>\n" "<commit\n" " revision=\"1\">\n" "<author>sally</author>\n" "<date>2003-01-15T23:35:12.847647Z</date>\n" "</commit>\n" "</entry>\n" "</info>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2608 msgid "List directory entries in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2612 #, no-wrap msgid "svn list [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2617 msgid "" "List each <replaceable>TARGET</replaceable> file and the contents of each " "<replaceable>TARGET</replaceable> directory as they exist in the " "repository. If <replaceable>TARGET</replaceable> is a working copy path, " "the corresponding repository URL will be used." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2623 msgid "" "The default <replaceable>TARGET</replaceable> is <quote><filename>.</" "filename></quote>, meaning the repository URL of the current working copy " "directory." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2628 msgid "" "With <option>--verbose</option>, <command>svn list</command> shows the " "following fields for each item:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2633 msgid "Revision number of the last commit" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2636 msgid "Author of the last commit" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2638 msgid "" "If locked, the letter <quote>O</quote> (see the preceding section on <xref " "linkend=\"svn.ref.svn.c.info\"/> for details)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2641 msgid "Size (in bytes)" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2643 msgid "Date and time of the last commit" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2647 msgid "" "With <option>--xml</option>, output is in XML format (with a header and an " "enclosing document element unless <option>--incremental</option> is also " "specified). All of the information is present; the <option>--verbose</" "option> option is not accepted." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:2656 #, fuzzy #| msgid "<command>svn add</command>" msgid "<command>ls</command>" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2672 #, no-wrap msgid "" "\n" "--depth ARG\n" "--incremental\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--verbose (-v)\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2685 msgid "" "<command>svn list</command> is most useful if you want to see what files a " "repository has without downloading a working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2689 #, no-wrap msgid "" "\n" "$ svn list http://svn.red-bean.com/repos/test/support\n" "README.txt\n" "INSTALL\n" "examples/\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2697 msgid "" "You can pass the <option>--verbose</option> option for additional " "information, rather like the Unix command <command>ls -l</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2701 #, no-wrap msgid "" "\n" "$ svn list --verbose file:///var/svn/repos\n" " 16 sally 28361 Jan 16 23:18 README.txt\n" " 27 sally 0 Jan 18 15:27 INSTALL\n" " 24 harry Jan 18 11:27 examples/\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2708 msgid "" "You can also get <command>svn list</command> output in XML format with the " "<option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2711 #, no-wrap msgid "" "\n" "$ svn list --xml http://svn.red-bean.com/repos/test\n" "<?xml version=\"1.0\"?>\n" "<lists>\n" "<list\n" " path=\"http://svn.red-bean.com/repos/test\">\n" "<entry\n" " kind=\"dir\">\n" "<name>examples</name>\n" "<size>0</size>\n" "<commit\n" " revision=\"24\">\n" "<author>harry</author>\n" "<date>2008-01-18T06:35:53.048870Z</date>\n" "</commit>\n" "</entry>\n" "...\n" "</list>\n" "</lists>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2732 msgid "" "For further details, see the earlier section <xref linkend=\"svn.tour." "history.browsing.list\"/>." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:2748 #, fuzzy #| msgid "svnlook" msgid "svn lock" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2749 msgid "" "Lock working copy paths or URLs in the repository so that no other user can " "commit changes to them." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2755 #, no-wrap msgid "svn lock TARGET..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2760 msgid "" "Lock each <replaceable>TARGET</replaceable>. If any <replaceable>TARGET</" "replaceable> is already locked by another user, print a warning and continue " "locking the rest of the <replaceable>TARGET</replaceable>s. Use <option>--" "force</option> to steal a lock from another user or working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:2776 ../en/book/ch09-reference.xml:5087 #, fuzzy #| msgid "How Working Copies Track the Repository" msgid "Working copy, repository" msgstr "Wie Arbeitskopien das Repository verfolgen" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2787 #, no-wrap msgid "" "\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force\n" "--force-log\n" "--message (-m) TEXT\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:2800 #, fuzzy #| msgid "Update your working copy." msgid "Lock two files in your working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2802 #, no-wrap msgid "" "\n" "$ svn lock tree.jpg house.jpg\n" "'tree.jpg' locked by user 'harry'.\n" "'house.jpg' locked by user 'harry'.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2808 msgid "" "Lock a file in your working copy that is currently locked by another user:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2811 #, no-wrap msgid "" "\n" "$ svn lock tree.jpg\n" "svn: warning: Path '/tree.jpg is already locked by user 'sally in \\\n" " filesystem '/var/svn/repos/db'\n" "\n" "$ svn lock --force tree.jpg\n" "'tree.jpg' locked by user 'harry'.\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:2820 #, fuzzy #| msgid "Update your working copy." msgid "Lock a file without a working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2822 #, no-wrap msgid "" "\n" "$ svn lock http://svn.red-bean.com/repos/test/tree.jpg\n" "'tree.jpg' locked by user 'harry'.\n" msgstr "" # type: Content of: <preface><sect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:2827 ../en/book/ch09-reference.xml:5132 #, fuzzy #| msgid "<xref linkend=\"svn.advanced\"/>" msgid "For further details, see <xref linkend=\"svn.advanced.locking\"/>." msgstr "<xref linkend=\"svn.advanced\"/>" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:2843 #, fuzzy #| msgid "svnlook" msgid "svn log" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:2844 msgid "Display commit log messages." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2848 #, no-wrap msgid "svn log [PATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:2849 #, no-wrap msgid "svn log URL[@REV] [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2854 msgid "" "Shows log messages from the repository. If no arguments are supplied, " "<command>svn log</command> shows the log messages for all files and " "directories inside (and including) the current working directory of your " "working copy. You can refine the results by specifying a path, one or more " "revisions, or any combination of the two. The default revision range for a " "local path is <literal>BASE:1</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2863 msgid "" "If you specify a URL alone, it prints log messages for everything the URL " "contains. If you add paths past the URL, only messages for those paths " "under that URL will be printed. The default revision range for a URL is " "<literal>HEAD:1</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2869 msgid "" "With <option>--verbose</option>, <command>svn log</command> will also print " "all affected paths with each log message. With <option>--quiet</option>, " "<command>svn log</command> will not print the log message body itself (this " "is compatible with <option>--verbose</option>)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2875 msgid "" "Each log message is printed just once, even if more than one of the affected " "paths for that revision were explicitly requested. Logs follow copy history " "by default. Use <option>--stop-on-copy</option> to disable this behavior, " "which can be useful for determining branch points." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2901 #, no-wrap msgid "" "\n" "--change (-c) ARG\n" "--incremental\n" "--limit (-l) NUM\n" "--quiet (-q)\n" "--revision (-r) REV\n" "--stop-on-copy\n" "--targets FILENAME\n" "--use-merge-history (-g)\n" "--verbose (-v)\n" "--with-all-revprops\n" "--with-revprop ARG\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2920 msgid "" "You can see the log messages for all the paths that changed in your working " "copy by running <userinput>svn log</userinput> from the top:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2924 #, no-wrap msgid "" "\n" "$ svn log\n" "------------------------------------------------------------------------\n" "r20 | harry | 2003-01-17 22:56:19 -0600 (Fri, 17 Jan 2003) | 1 line\n" "\n" "Tweak.\n" "------------------------------------------------------------------------\n" "r17 | sally | 2003-01-16 23:21:19 -0600 (Thu, 16 Jan 2003) | 2 lines\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2935 msgid "Examine all log messages for a particular file in your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2938 #, no-wrap msgid "" "\n" "$ svn log foo.c\n" "------------------------------------------------------------------------\n" "r32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n" "\n" "Added defines.\n" "------------------------------------------------------------------------\n" "r28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2949 msgid "If you don't have a working copy handy, you can log a URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2952 #, no-wrap msgid "" "\n" "$ svn log http://svn.red-bean.com/repos/test/foo.c\n" "------------------------------------------------------------------------\n" "r32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n" "\n" "Added defines.\n" "------------------------------------------------------------------------\n" "r28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2963 msgid "" "If you want several distinct paths underneath the same URL, you can use the " "<literal>URL [PATH...]</literal> syntax:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2967 #, no-wrap msgid "" "\n" "$ svn log http://svn.red-bean.com/repos/test/ foo.c bar.c\n" "------------------------------------------------------------------------\n" "r32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n" "\n" "Added defines.\n" "------------------------------------------------------------------------\n" "r31 | harry | 2003-01-10 12:25:08 -0600 (Fri, 10 Jan 2003) | 1 line\n" "\n" "Added new file bar.c\n" "------------------------------------------------------------------------\n" "r28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:2982 msgid "" "The <option>--verbose</option> option causes <command>svn log</command> to " "include information about the paths that were changed in each displayed " "revision. These paths appear, one path per line of output, with action " "codes that indicate what type of change was made to the path." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:2989 #, no-wrap msgid "" "\n" "$ svn log -v http://svn.red-bean.com/repos/test/ foo.c bar.c\n" "------------------------------------------------------------------------\n" "r32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n" "Changed paths:\n" " M /foo.c\n" "\n" "Added defines.\n" "------------------------------------------------------------------------\n" "r31 | harry | 2003-01-10 12:25:08 -0600 (Fri, 10 Jan 2003) | 1 line\n" "Changed paths:\n" " A /bar.c\n" "\n" "Added new file bar.c\n" "------------------------------------------------------------------------\n" "r28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3008 msgid "" "<command>svn log</command> uses just a handful of action codes, and they are " "similar to the ones the <command>svn update</command> command uses:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:3015 ../en/book/ch09-reference.xml:5176 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>A</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3016 msgid "The item was added." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:3019 ../en/book/ch09-reference.xml:5190 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>D</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3020 msgid "The item was deleted." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:3023 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>M</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3024 msgid "Properties or textual contents on the item were changed." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:3028 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>R</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3029 msgid "The item was replaced by a different one at the same location." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3034 msgid "" "In addition to the action codes which precede the changed paths, " "<command>svn log</command> with the <option>--verbose</option> option will " "note whether a path was added or replaced as the result of a copy " "operation. It does so by printing <literal>(from <replaceable>COPY-FROM-" "PATH</replaceable>:<replaceable>COPY-FROM-REV</replaceable>)</literal> after " "such paths." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3041 msgid "" "When you're concatenating the results of multiple calls to the log command, " "you may want to use the <option>--incremental</option> option. <command>svn " "log</command> normally prints out a dashed line at the beginning of a log " "message, after each subsequent log message, and following the final log " "message. If you ran <command>svn log</command> on a range of two revisions, " "you would get this:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3049 #, no-wrap msgid "" "\n" "$ svn log -r 14:15\n" "------------------------------------------------------------------------\n" "r14 | …\n" "\n" "------------------------------------------------------------------------\n" "r15 | …\n" "\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3060 msgid "" "However, if you wanted to gather two nonsequential log messages into a file, " "you might do something like this:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3064 #, no-wrap msgid "" "\n" "$ svn log -r 14 > mylog\n" "$ svn log -r 19 >> mylog\n" "$ svn log -r 27 >> mylog\n" "$ cat mylog\n" "------------------------------------------------------------------------\n" "r14 | …\n" "\n" "------------------------------------------------------------------------\n" "------------------------------------------------------------------------\n" "r19 | …\n" "\n" "------------------------------------------------------------------------\n" "------------------------------------------------------------------------\n" "r27 | …\n" "\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3083 msgid "" "You can avoid the clutter of the double dashed lines in your output by using " "the <option>--incremental</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3087 #, no-wrap msgid "" "\n" "$ svn log --incremental -r 14 > mylog\n" "$ svn log --incremental -r 19 >> mylog\n" "$ svn log --incremental -r 27 >> mylog\n" "$ cat mylog\n" "------------------------------------------------------------------------\n" "r14 | …\n" "\n" "------------------------------------------------------------------------\n" "r19 | …\n" "\n" "------------------------------------------------------------------------\n" "r27 | …\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3102 msgid "" "The <option>--incremental</option> option provides similar output control " "when using the <option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3106 #, no-wrap msgid "" "\n" "$ svn log --xml --incremental -r 1 sandwich.txt\n" "<logentry\n" " revision=\"1\">\n" "<author>harry</author>\n" "<date>2008-06-03T06:35:53.048870Z</date>\n" "<msg>Initial Import.</msg>\n" "</logentry>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:3117 msgid "" "If you run <command>svn log</command> on a specific path and provide a " "specific revision and get no output at all, as in the following:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><screen> #: ../en/book/ch09-reference.xml:3121 #, no-wrap msgid "" "\n" "$ svn log -r 20 http://svn.red-bean.com/untouched.txt\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:3126 msgid "" "that just means the path was not modified in that revision. If you log from " "the top of the repository or know the file that changed in that revision, " "you can specify it explicitly:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><screen> #: ../en/book/ch09-reference.xml:3131 #, no-wrap msgid "" "\n" "$ svn log -r 20 touched.txt \n" "------------------------------------------------------------------------\n" "r20 | sally | 2003-01-17 22:56:19 -0600 (Fri, 17 Jan 2003) | 1 line\n" "\n" "Made a change.\n" "------------------------------------------------------------------------\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:3153 #, fuzzy #| msgid "svnserve" msgid "svn merge" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3154 msgid "Apply the differences between two sources to a working copy path." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3159 #, no-wrap msgid "svn merge sourceURL1[@N] sourceURL2[@M] [WCPATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3160 #, no-wrap msgid "svn merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3161 #, no-wrap msgid "svn merge [[-c M]... | [-r N:M]...] [SOURCE[@REV] [WCPATH]]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3166 msgid "" "In the first form, the source URLs are specified at revisions " "<replaceable>N</replaceable> and <replaceable>M</replaceable>. These are " "the two sources to be compared. The revisions default to <literal>HEAD</" "literal> if omitted." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3171 msgid "" "In the second form, the URLs corresponding to the source working copy paths " "define the sources to be compared. The revisions must be specified." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3175 msgid "" "In the third form, <replaceable>SOURCE</replaceable> can be either a URL or " "a working copy path (in which case its corresponding URL is used). If not " "specified, <replaceable>SOURCE</replaceable> will be the same as " "<replaceable>WCPATH</replaceable>. <replaceable>SOURCE</replaceable> in " "revision <replaceable>REV</replaceable> is compared as it existed between " "revisions <replaceable>N</replaceable> and <replaceable>M</replaceable> for " "each revision range provided. If <replaceable>REV</replaceable> is not " "specified, <literal>HEAD</literal> is assumed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3187 msgid "" "<literal>-c M</literal> is equivalent to <literal>-r <M-1>:M</" "literal>, and <literal>-c -M</literal> does the reverse: <literal>-r M:<M-" "1></literal>. If no revision ranges are specified, the default range of " "<literal>1:HEAD</literal> is used. Multiple <literal>-c</literal> and/or " "<literal>-r</literal> instances may be specified, and mixing of forward and " "reverse ranges is allowed—the ranges are internally compacted to their " "minimum representation before merging begins (which may result in no-op)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3198 msgid "" "<replaceable>WCPATH</replaceable> is the working copy path that will receive " "the changes. If <replaceable>WCPATH</replaceable> is omitted, a default " "value of <quote><filename>.</filename></quote> is assumed, unless the " "sources have identical basenames that match a file within <quote><filename>." "</filename></quote>. In this case, the differences will be applied to that " "file." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3207 msgid "" "Subversion will internally track metadata about the merge operation only if " "the two sources are ancestrally related—if the first source is an " "ancestor of the second or vice versa. This is guaranteed to be the case " "when using the third form. Unlike <command>svn diff</command>, the merge " "command takes the ancestry of a file into consideration when performing a " "merge operation. This is very important when you're merging changes from " "one branch into another and you've renamed a file on one branch but not the " "other." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3231 msgid "Only if working with URLs" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3237 #, no-wrap msgid "" "\n" "--accept ARG\n" "--change (-c) REV\n" "--depth ARG\n" "--diff3-cmd CMD\n" "--dry-run\n" "--extensions (-x) ARG\n" "--force\n" "--ignore-ancestry\n" "--quiet (-q)\n" "--record-only\n" "--reintegrate\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3256 msgid "" "Merge a branch back into the trunk (assuming that you have an up-to-date " "working copy of the trunk):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3259 #, no-wrap msgid "" "\n" "$ svn merge --reintegrate \\\n" " http://svn.example.com/repos/calc/branches/my-calc-branch\n" "--- Merging differences between repository URLs into '.':\n" "U button.c\n" "U integer.c\n" "U Makefile\n" " U .\n" "\n" "$ # build, test, verify, ...\n" "\n" "$ svn commit -m \"Merge my-calc-branch back into trunk!\"\n" "Sending .\n" "Sending button.c\n" "Sending integer.c\n" "Sending Makefile\n" "Transmitting file data ..\n" "Committed revision 391.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3279 msgid "To merge changes to a single file:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3281 #, no-wrap msgid "" "\n" "$ cd myproj\n" "$ svn merge -r 30:31 thhgttg.txt \n" "U thhgttg.txt\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:3299 #, fuzzy #| msgid "svnversion" msgid "svn mergeinfo" msgstr "svnversion" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3300 msgid "" "Query merge-related information. See <xref linkend=\"svn.branchmerge." "basicmerging.mergeinfo\"/> for details." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3306 #, no-wrap msgid "svn mergeinfo SOURCE_URL[@REV] [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3311 msgid "" "Query information related to merges (or potential merges) between " "<replaceable>SOURCE-URL</replaceable> and <replaceable>TARGET</" "replaceable>. If the <option>--show-revs</option> option is not provided, " "display revisions which have been merged from <replaceable>SOURCE-URL</" "replaceable> to <replaceable>TARGET</replaceable>. Otherwise, display " "either <literal>merged</literal> or <literal>eligible</literal> revisions as " "specified by the <option>--show-revs</option> option." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3349 msgid "" "Find out which changesets your trunk directory has already received as well " "as what changesets it's still eligible to receive:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3353 #, no-wrap msgid "" "\n" "$ svn mergeinfo branches/test\n" "Path: branches/test\n" " Source path: /trunk\n" " Merged ranges: r2:13\n" " Eligible ranges: r13:15\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3374 #, fuzzy #| msgid "svn import" msgid "svn mkdir" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3375 msgid "Create a new directory under version control." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3379 #, no-wrap msgid "svn mkdir PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3380 #, no-wrap msgid "svn mkdir URL..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3385 msgid "" "Create a directory with a name given by the final component of the " "<replaceable>PATH</replaceable> or <replaceable>URL</replaceable>. A " "directory specified by a working copy <replaceable>PATH</replaceable> is " "scheduled for addition in the working copy. A directory specified by a URL " "is created in the repository via an immediate commit. Multiple directory " "URLs are committed atomically. In both cases, all the intermediate " "directories must already exist unless the <option>--parents</option> option " "is used." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3404 ../en/book/ch09-reference.xml:3516 msgid "Working copy; repository if operating on a URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3409 ../en/book/ch09-reference.xml:3521 #: ../en/book/ch09-reference.xml:3618 ../en/book/ch09-reference.xml:3697 #: ../en/book/ch09-reference.xml:3775 ../en/book/ch09-reference.xml:3872 #: ../en/book/ch09-reference.xml:3985 msgid "Only if operating on a URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3415 #, no-wrap msgid "" "\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force-log\n" "--message (-m) TEXT\n" "--parents\n" "--quiet (-q)\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:3430 #, fuzzy #| msgid "Update your working copy." msgid "Create a directory in your working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3432 #, no-wrap msgid "" "\n" "$ svn mkdir newdir\n" "A newdir\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3437 msgid "" "Create one in the repository (this is an instant commit, so a log message is " "required):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3440 #, no-wrap msgid "" "\n" "$ svn mkdir -m \"Making a new dir.\" http://svn.red-bean.com/repos/newdir\n" "\n" "Committed revision 26.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3458 #, fuzzy #| msgid "svn import" msgid "svn move" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3459 msgid "Move a file or directory." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3463 #, no-wrap msgid "svn move SRC... DST" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3468 msgid "" "This command moves files or directories in your working copy or in the " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:3472 msgid "" "This command is equivalent to an <command>svn copy</command> followed by " "<command>svn delete</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3477 msgid "" "When moving multiple sources, they will be added as children of " "<replaceable>DST</replaceable>, which must be a directory." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><note><para> #: ../en/book/ch09-reference.xml:3482 msgid "" "Subversion does not support moving between working copies and URLs. In " "addition, you can only move files within a single repository—" "Subversion does not support cross-repository moving. Subversion supports " "the following types of moves within a single repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3494 msgid "Move and schedule a file or directory for addition (with history)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:3502 msgid "Complete server-side rename." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3511 msgid "" "<command>mv</command>, <command>rename</command>, <command>ren</command>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3527 #, no-wrap msgid "" "\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force\n" "--force-log\n" "--message (-m) TEXT\n" "--parents\n" "--quiet (-q)\n" "--revision (-r) REV\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:3544 #, fuzzy #| msgid "Update your working copy." msgid "Move a file in your working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3546 #, no-wrap msgid "" "\n" "$ svn move foo.c bar.c\n" "A bar.c\n" "D foo.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3552 msgid "Move several files in your working copy into a subdirectory:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3555 #, no-wrap msgid "" "\n" "$ svn move baz.c bat.c qux.c src\n" "A src/baz.c\n" "D baz.c\n" "A src/bat.c\n" "D bat.c\n" "A src/qux.c\n" "D qux.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3565 msgid "" "Move a file in the repository (this is an immediate commit, so it requires a " "commit message):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3568 #, no-wrap msgid "" "\n" "$ svn move -m \"Move a file\" http://svn.red-bean.com/repos/foo.c \\\n" " http://svn.red-bean.com/repos/bar.c\n" "\n" "Committed revision 27.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:3587 msgid "svn propdel" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3588 msgid "Remove a property from an item." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3592 #, no-wrap msgid "svn propdel PROPNAME [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3593 #, no-wrap msgid "svn propdel PROPNAME --revprop -r REV [TARGET]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3598 msgid "" "This removes properties from files, directories, or revisions. The first " "form removes versioned properties in your working copy, and the second " "removes unversioned remote properties on a repository revision " "(<replaceable>TARGET</replaceable> determines only which repository to " "access)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:3608 #, fuzzy #| msgid "<command>svn add</command>" msgid "<command>pdel</command>, <command>pd</command>" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3613 ../en/book/ch09-reference.xml:3692 #: ../en/book/ch09-reference.xml:3770 ../en/book/ch09-reference.xml:3867 #: ../en/book/ch09-reference.xml:3980 msgid "Working copy; repository only if operating on a URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3624 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--revprop\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3637 msgid "Delete a property from a file in your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3640 #, no-wrap msgid "" "\n" "$ svn propdel svn:mime-type some-script\n" "property 'svn:mime-type' deleted from 'some-script'.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3645 msgid "Delete a revision property:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3647 #, no-wrap msgid "" "\n" "$ svn propdel --revprop -r 26 release-date \n" "property 'release-date' deleted from repository revision '26'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3664 #, fuzzy #| msgid "svn import" msgid "svn propedit" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3665 msgid "" "Edit the property of one or more items under version control. See <xref " "linkend=\"svn.ref.svn.c.propset\"/> later in this chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3671 #, no-wrap msgid "svn propedit PROPNAME TARGET..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3672 #, no-wrap msgid "svn propedit PROPNAME --revprop -r REV [TARGET]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3677 msgid "" "Edit one or more properties using your favorite editor. The first form " "edits versioned properties in your working copy, and the second edits " "unversioned remote properties on a repository revision (<replaceable>TARGET</" "replaceable> determines only which repository to access)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:3687 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>pedit</command>, <command>pe</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3703 #, no-wrap msgid "" "\n" "--editor-cmd EDITOR\n" "--encoding ENC\n" "--file (-F) ARG\n" "--force\n" "--force-log\n" "--message (-m) ARG\n" "--revision (-r) REV\n" "--revprop\n" "--with-revprop ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3719 msgid "" "<command>svn propedit</command> makes it easy to modify properties that have " "multiple values:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3722 #, no-wrap msgid "" "\n" "$ svn propedit svn:keywords foo.c \n" " <svn will launch your favorite editor here, with a buffer open\n" " containing the current contents of the svn:keywords property. You\n" " can add multiple values to a property easily here by entering one\n" " value per line.>\n" "Set new value for property 'svn:keywords' on 'foo.c'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3743 #, fuzzy #| msgid "svn import" msgid "svn propget" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3744 msgid "Print the value of a property." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3748 #, no-wrap msgid "svn propget PROPNAME [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3749 #, no-wrap msgid "svn propget PROPNAME --revprop -r REV [URL]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3754 msgid "" "Print the value of a property on files, directories, or revisions. The " "first form prints the versioned property of an item or items in your working " "copy, and the second prints unversioned remote properties on a repository " "revision. See <xref linkend=\"svn.advanced.props\"/> for more information " "on properties." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:3765 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>pget</command>, <command>pg</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3781 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--revprop\n" "--strict\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3795 msgid "Examine a property of a file in your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3798 #, no-wrap msgid "" "\n" "$ svn propget svn:keywords foo.c\n" "Author\n" "Date\n" "Rev\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3805 msgid "The same goes for a revision property:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3807 #, no-wrap msgid "" "\n" "$ svn propget svn:log --revprop -r 20 \n" "Began journal.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3812 msgid "" "Lastly, you can get <command>svn propget</command> output in XML format with " "the <option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3816 #, no-wrap msgid "" "\n" "$ svn propget --xml svn:ignore .\n" "<?xml version=\"1.0\"?>\n" "<properties>\n" "<target\n" " path=\"\">\n" "<property\n" " name=\"svn:ignore\">*.o\n" "</property>\n" "</target>\n" "</properties>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3841 #, fuzzy #| msgid "svn import" msgid "svn proplist" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3842 msgid "List all properties." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3846 #, no-wrap msgid "svn proplist [TARGET[@REV]...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3847 #, no-wrap msgid "svn proplist --revprop -r REV [TARGET]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3852 msgid "" "List all properties on files, directories, or revisions. The first form " "lists versioned properties in your working copy, and the second lists " "unversioned remote properties on a repository revision (<replaceable>TARGET</" "replaceable> determines only which repository to access)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:3862 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>plist</command>, <command>pl</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3878 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--revprop\n" "--verbose (-v)\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3893 msgid "" "You can use <command>proplist</command> to see the properties on an item in " "your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3896 #, no-wrap msgid "" "\n" "$ svn proplist foo.c\n" "Properties on 'foo.c':\n" " svn:mime-type\n" " svn:keywords\n" " owner\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3904 msgid "" "But with the <option>--verbose</option> flag, <command>svn proplist</" "command> is extremely handy as it also shows you the values for the " "properties:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3908 #, no-wrap msgid "" "\n" "$ svn proplist --verbose foo.c\n" "Properties on 'foo.c':\n" " svn:mime-type : text/plain\n" " svn:keywords : Author Date Rev\n" " owner : sally\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3916 msgid "" "Lastly, you can get <command>svn proplist</command> output in xml format " "with the <option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3920 #, no-wrap msgid "" "\n" "$ svn proplist --xml \n" "<?xml version=\"1.0\"?>\n" "<properties>\n" "<target\n" " path=\".\">\n" "<property\n" " name=\"svn:ignore\"/>\n" "</target>\n" "</properties>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:3944 #, fuzzy #| msgid "svn import" msgid "svn propset" msgstr "svn import" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:3945 msgid "" "Set <replaceable>PROPNAME</replaceable> to <replaceable>PROPVAL</" "replaceable> on files, directories, or revisions." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3949 #, no-wrap msgid "svn propset PROPNAME [PROPVAL | -F VALFILE] PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:3950 #, no-wrap msgid "svn propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [TARGET]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:3956 msgid "" "Set <replaceable>PROPNAME</replaceable> to <replaceable>PROPVAL</" "replaceable> on files, directories, or revisions. The first example creates " "a versioned, local property change in the working copy, and the second " "creates an unversioned, remote property change on a repository revision " "(<replaceable>TARGET</replaceable> determines only which repository to " "access)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:3966 msgid "" "Subversion has a number of <quote>special</quote> properties that affect its " "behavior. See <xref linkend=\"svn.ref.properties\"/> later in this chapter " "for more on these properties." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:3975 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "<replaceable>pset</replaceable>, <replaceable>ps</replaceable>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:3991 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--encoding ENC\n" "--file (-F) FILE\n" "--force\n" "--quiet (-q)\n" "--recursive (-R)\n" "--revision (-r) REV\n" "--revprop\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4008 msgid "Set the MIME type for a file:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4010 #, no-wrap msgid "" "\n" "$ svn propset svn:mime-type image/jpeg foo.jpg \n" "property 'svn:mime-type' set on 'foo.jpg'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4015 msgid "" "On a Unix system, if you want a file to have the executable permission set:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4018 #, no-wrap msgid "" "\n" "$ svn propset svn:executable ON somescript\n" "property 'svn:executable' set on 'somescript'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4023 msgid "" "Perhaps you have an internal policy to set certain properties for the " "benefit of your coworkers:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4026 #, no-wrap msgid "" "\n" "$ svn propset owner sally foo.c\n" "property 'owner' set on 'foo.c'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4031 msgid "" "If you made a mistake in a log message for a particular revision and want to " "change it, use <option>--revprop</option> and set <literal>svn:log</literal> " "to the new log message:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4036 #, no-wrap msgid "" "\n" "$ svn propset --revprop -r 25 svn:log \"Journaled about trip to New York.\"\n" "property 'svn:log' set on repository revision '25'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4041 msgid "Or, if you don't have a working copy, you can provide a URL:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4044 #, no-wrap msgid "" "\n" "$ svn propset --revprop -r 26 svn:log \"Document nap.\" \\\n" " http://svn.red-bean.com/repos\n" "property 'svn:log' set on repository revision '25'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4050 msgid "" "Lastly, you can tell <command>propset</command> to take its input from a " "file. You could even use this to set the contents of a property to " "something binary:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4054 #, no-wrap msgid "" "\n" "$ svn propset owner-pic -F sally.jpg moo.c \n" "property 'owner-pic' set on 'moo.c'\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><note><para> #: ../en/book/ch09-reference.xml:4060 msgid "" "By default, you cannot modify revision properties in a Subversion " "repository. Your repository administrator must explicitly enable revision " "property modifications by creating a hook named <literal>pre-revprop-change</" "literal>. See <xref linkend=\"svn.reposadmin.create.hooks\"/> for more " "information on hook scripts." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4081 #, fuzzy #| msgid "svnserve" msgid "svn resolve" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:4082 msgid "Resolve conflicts on working copy files or directories." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4087 #, no-wrap msgid "svn resolve PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4092 msgid "" "Resolve <quote>conflicted</quote> state on working copy files or " "directories. This routine does not semantically resolve conflict markers; " "however, it replaces <replaceable>PATH</replaceable> with the version " "specified by the <option>--accept</option> argument and then removes " "conflict-related artifact files. This allows <replaceable>PATH</" "replaceable> to be committed again—that is, it tells Subversion that " "the conflicts have been <quote>resolved.</quote>. You can pass the " "following arguments to the <option>--accept</option> command depending on " "your desired resolution:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4108 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>base</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4110 #, fuzzy #| msgid "" #| "This is the file that was the <literal>BASE</literal> revision before you " #| "updated your working copy. That is, the file that you checked out before " #| "you made your latest edits." msgid "" "Choose the file that was the <literal>BASE</literal> revision before you " "updated your working copy. That is, the file that you checked out before " "you made your latest edits." msgstr "" "Dies ist die Datei, die die <literal>BASE</literal>-Revision war bevor Sie " "Ihre Arbeitskopie aktualisiert haben; also die Datei, die Sie ausgecheckt " "hatten, bevor Sie Ihre letzten Änderungen machten." # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4119 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>working</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4121 msgid "" "Assuming that you've manually handled the conflict resolution, choose the " "version of the file as it currently stands in your working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4128 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>mine-full</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4130 msgid "" "Resolve all conflicted files with copies of the files as they stood " "immediately before you ran <command>svn update</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4137 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>theirs-full</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4139 msgid "" "Resolve all conflicted files with copies of the files that were fetched from " "the server when you ran <command>svn update</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4147 msgid "" "See <xref linkend=\"svn.tour.cycle.resolve\"/> for an in-depth look at " "resolving conflicts." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4171 #, no-wrap msgid "" "\n" "--accept ARG\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4183 msgid "" "Here's an example where, after a postponed conflict resolution during " "update, <command>svn resolve</command> replaces the all conflicts in file " "<filename>foo.c</filename> with your edits:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch09-reference.xml:4188 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn update\n" #| "Conflict discovered in 'sandwich.txt'.\n" #| "Select: (p) postpone, (df) diff-full, (e) edit,\n" #| " (h) help for more options: p\n" #| "C sandwich.txt\n" #| "Updated to revision 2.\n" #| "$ ls sandwich.*\n" #| "sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1\n" #| "$ svn resolve --accept theirs-full sandwich.txt\n" #| "Resolved conflicted state of 'sandwich.txt'\n" msgid "" "\n" "$ svn up\n" "Conflict discovered in 'foo.c'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options: p\n" "C foo.c\n" "Updated to revision 5.\n" "\n" "$ svn resolve --accept mine-full foo.c\n" "Resolved conflicted state of 'foo.c'\n" msgstr "" "\n" "$ svn update\n" "Conflict discovered in 'sandwich.txt'.\n" "Select: (p) postpone, (df) diff-full, (e) edit,\n" " (h) help for more options: p\n" "C sandwich.txt\n" "Updated to revision 2.\n" "$ ls sandwich.*\n" "sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1\n" "$ svn resolve --accept theirs-full sandwich.txt\n" "Resolved conflicted state of 'sandwich.txt'\n" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4212 #, fuzzy #| msgid "svnserve" msgid "svn resolved" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:4213 msgid "" "<emphasis>Deprecated</emphasis>. Remove <quote>conflicted</quote> state on " "working copy files or directories." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4219 #, no-wrap msgid "svn resolved PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4224 msgid "" "This command has been deprecated in favor of running <userinput>svn resolve " "--accept working <replaceable>PATH</replaceable></userinput>. See <xref " "linkend=\"svn.ref.svn.c.resolve\"/> in the preceding section for details." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4229 msgid "" "Remove <quote>conflicted</quote> state on working copy files or " "directories. This routine does not semantically resolve conflict markers; " "it merely removes conflict-related artifact files and allows " "<replaceable>PATH</replaceable> to be committed again; that is, it tells " "Subversion that the conflicts have been <quote>resolved.</quote> See <xref " "linkend=\"svn.tour.cycle.resolve\"/> for an in-depth look at resolving " "conflicts." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4257 #, no-wrap msgid "" "\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4268 msgid "" "If you get a conflict on an update, your working copy will sprout three new " "files:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:4271 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn update\n" #| "U foo.c\n" #| "U bar.c\n" #| "Updated to revision 2.\n" msgid "" "\n" "$ svn update\n" "C foo.c\n" "Updated to revision 31.\n" "$ ls\n" "foo.c\n" "foo.c.mine\n" "foo.c.r30\n" "foo.c.r31\n" msgstr "" "\n" "$ svn update\n" "U foo.c\n" "U bar.c\n" "Updated to revision 2.\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4282 msgid "" "Once you've resolved the conflict and <filename>foo.c</filename> is ready to " "be committed, run <command>svn resolved</command> to let your working copy " "know you've taken care of everything." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:4288 msgid "" "You <emphasis>can</emphasis> just remove the conflict files and commit, but " "<command>svn resolved</command> fixes up some bookkeeping data in the " "working copy administrative area in addition to removing the conflict files, " "so we recommend that you use this command." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4308 #, fuzzy #| msgid "svnserve" msgid "svn revert" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:4309 msgid "Undo all local edits." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4313 #, no-wrap msgid "svn revert PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4318 msgid "" "Reverts any local changes to a file or directory and resolves any conflicted " "states. <command>svn revert</command> will revert not only the contents of " "an item in your working copy, but also any property changes. Finally, you " "can use it to undo any scheduling operations that you may have performed (e." "g., files scheduled for addition or deletion can be <quote>unscheduled</" "quote>)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4346 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--quiet (-q)\n" "--recursive (-R)\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4358 msgid "Discard changes to a file:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:4360 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn revert README\n" #| "Reverted 'README'\n" msgid "" "\n" "$ svn revert foo.c\n" "Reverted foo.c\n" msgstr "" "\n" "$ svn revert README\n" "Reverted 'README'\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4365 msgid "" "If you want to revert a whole directory of files, use the <option>--" "depth=infinity</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4368 #, no-wrap msgid "" "\n" "$ svn revert --depth=infinity .\n" "Reverted newdir/afile\n" "Reverted foo.c\n" "Reverted bar.txt\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4375 msgid "Lastly, you can undo any scheduling operations:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4378 #, no-wrap msgid "" "\n" "$ svn add mistake.txt whoops\n" "A mistake.txt\n" "A whoops\n" "A whoops/oopsie.c\n" "\n" "$ svn revert mistake.txt whoops\n" "Reverted mistake.txt\n" "Reverted whoops\n" "\n" "$ svn status\n" "? mistake.txt\n" "? whoops\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:4394 msgid "" "<command>svn revert</command> is inherently dangerous, since its entire " "purpose is to throw away data—namely, your uncommitted changes. Once " "you've reverted, Subversion provides <emphasis>no way</emphasis> to get back " "those uncommitted changes." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:4401 msgid "" "If you provide no targets to <command>svn revert</command>, it will do " "nothing—to protect you from accidentally losing changes in your " "working copy, <command>svn revert</command> requires you to provide at least " "one target." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:4420 msgid "svn status" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:4421 msgid "Print the status of working copy files and directories." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4425 #, no-wrap msgid "svn status [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4430 msgid "" "Print the status of working copy files and directories. With no arguments, " "it prints only locally modified items (no repository access). With " "<option>--show-updates</option>, it adds working revision and server out-of-" "date information. With <option>--verbose</option>, it prints full revision " "information on every item. With <option>--quiet</option>, it prints only " "summary information about locally modified items." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4440 msgid "" "The first six columns in the output are each one character wide, and each " "column gives you information about different aspects of each working copy " "item." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4444 msgid "" "The first column indicates that an item was added, deleted, or otherwise " "changed:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4450 ../en/book/ch09-reference.xml:4545 #: ../en/book/ch09-reference.xml:4577 ../en/book/ch09-reference.xml:4598 #: ../en/book/ch09-reference.xml:4620 ../en/book/ch09-reference.xml:4640 #: ../en/book/ch09-reference.xml:4699 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>' '</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4452 ../en/book/ch09-reference.xml:4547 msgid "No modifications." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4457 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'A'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4459 msgid "Item is scheduled for addition." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4464 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'D'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4466 msgid "Item is scheduled for deletion." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4471 ../en/book/ch09-reference.xml:4552 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'M'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4473 msgid "Item has been modified." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4478 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'R'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4480 msgid "" "Item has been replaced in your working copy. This means the file was " "scheduled for deletion, and then a new file with the same name was scheduled " "for addition in its place." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4488 ../en/book/ch09-reference.xml:4560 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'C'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4490 msgid "" "The contents (as opposed to the properties) of the item conflict with " "updates received from the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4497 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'X'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4499 msgid "Item is present because of an externals definition." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4504 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'I'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4506 msgid "" "Item is being ignored (e.g., with the <literal>svn:ignore</literal> " "property)." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4512 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'?'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4514 msgid "Item is not under version control." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4519 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'!'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4521 msgid "" "Item is missing (e.g., you moved or deleted it without using <command>svn</" "command>). This also indicates that a directory is incomplete (a checkout " "or update was interrupted)." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4529 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'~'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4531 msgid "" "Item is versioned as one kind of object (file, directory, link), but has " "been replaced by a different kind of object." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4539 msgid "" "The second column tells the status of a file's or directory's properties:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4554 #, fuzzy #| msgid "" #| "The contents of the file <filename>item</filename> have been modified." msgid "Properties for this item have been modified." msgstr "Der Inhalt der Datei <filename>item</filename> ist geändert worden." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4562 msgid "" "Properties for this item are in conflict with property updates received from " "the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4570 msgid "" "The third column is populated only if the working copy directory is locked " "(see <xref linkend=\"svn.tour.cleanup\"/>):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4579 msgid "Item is not locked." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4584 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'L'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4586 msgid "Item is locked." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4592 msgid "" "The fourth column is populated only if the item is scheduled for addition-" "with-history:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4600 msgid "No history scheduled with commit." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4605 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'+'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4607 msgid "History scheduled with commit." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4613 msgid "" "The fifth column is populated only if the item is switched relative to its " "parent (see <xref linkend=\"svn.branchmerge.switchwc\"/>):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4622 msgid "Item is a child of its parent directory." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4627 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'S'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4629 msgid "Item is switched." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4635 msgid "The sixth column is populated with lock information:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4642 msgid "" "When <option>--show-updates</option> is used, the file is not locked. If " "<option>--show-updates</option> is <emphasis>not</emphasis> used, this " "merely means that the file is not locked in this working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4651 msgid "K" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4653 msgid "File is locked in this working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4658 msgid "O" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4660 msgid "" "File is locked either by another user or in another working copy. This " "appears only when <option>--show-updates</option> is used." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4667 msgid "T" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4669 msgid "" "File was locked in this working copy, but the lock has been <quote>stolen</" "quote> and is invalid. The file is currently locked in the repository. " "This appears only when <option>--show-updates</option> is used." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:4678 msgid "B" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4680 msgid "" "File was locked in this working copy, but the lock has been <quote>broken</" "quote> and is invalid. The file is no longer locked. This appears only " "when <option>--show-updates</option> is used." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4692 msgid "" "The out-of-date information appears in the seventh column (only if you pass " "the <option>--show-updates</option> option):" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:4701 #, fuzzy #| msgid "Update your working copy." msgid "The item in your working copy is up to date." msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:4706 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'*'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:4708 msgid "A newer revision of the item exists on the server." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4715 msgid "" "The remaining fields are variable width and delimited by spaces. The " "working revision is the next field if the <option>--show-updates</option> or " "<option>--verbose</option> option is passed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4720 msgid "" "If the <option>--verbose</option> option is passed, the last committed " "revision and last committed author are displayed next." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4724 msgid "" "The working copy path is always the final field, so it can include spaces." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:4731 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>stat</command>, <command>st</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4741 msgid "Only if using <option>--show-updates</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4747 #, no-wrap msgid "" "\n" "--changelist ARG\n" "--depth ARG\n" "--ignore-externals\n" "--incremental\n" "--no-ignore\n" "--quiet (-q)\n" "--show-updates (-u)\n" "--verbose (-v)\n" "--xml\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4763 msgid "" "This is the easiest way to find out what changes you have made to your " "working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4766 #, no-wrap msgid "" "\n" "$ svn status wc\n" " M wc/bar.c\n" "A + wc/qax.c\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4772 msgid "" "If you want to find out what files in your working copy are out of date, " "pass the <option>--show-updates</option> option (this will <emphasis>not</" "emphasis> make any changes to your working copy). Here you can see that " "<filename>wc/foo.c</filename> has changed in the repository since we last " "updated our working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4781 #, no-wrap msgid "" "\n" "$ svn status --show-updates wc\n" " M 965 wc/bar.c\n" " * 965 wc/foo.c\n" "A + 965 wc/qax.c\n" "Status against revision: 981\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><note><para> #: ../en/book/ch09-reference.xml:4790 msgid "" "<option>--show-updates</option> <emphasis>only</emphasis> places an asterisk " "next to items that are out of date (i.e., items that will be updated from " "the repository if you later use <command>svn update</command>). <option>--" "show-updates</option> does <emphasis>not</emphasis> cause the status listing " "to reflect the repository's version of the item (although you can see the " "revision number in the repository by passing the <option>--verbose</option> " "option)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4801 msgid "" "The most information you can get out of the status subcommand is as follows:" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><screen> #: ../en/book/ch09-reference.xml:4804 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn status -u -v\n" #| "M * 44 23 sally README\n" #| "M 44 20 harry bar.c\n" #| " * 44 35 harry stuff/trout.c\n" #| "D 44 19 ira stuff/fish.c\n" #| "A 0 ? ? stuff/things/bloo.h\n" #| "Status against revision: 46\n" msgid "" "\n" "$ svn status --show-updates --verbose wc\n" " M 965 938 sally wc/bar.c\n" " * 965 922 harry wc/foo.c\n" "A + 965 687 harry wc/qax.c\n" " 965 687 harry wc/zig.c\n" "Head revision: 981\n" msgstr "" "\n" "$ svn status -u -v\n" "M * 44 23 sally README\n" "M 44 20 harry bar.c\n" " * 44 35 harry stuff/trout.c\n" "D 44 19 ira stuff/fish.c\n" "A 0 ? ? stuff/things/bloo.h\n" "Status against revision: 46\n" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4813 msgid "" "Lastly, you can get <command>svn status</command> output in XML format with " "the <option>--xml</option> option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4817 #, no-wrap msgid "" "\n" "$ svn status --xml wc\n" "<?xml version=\"1.0\"?>\n" "<status>\n" "<target\n" " path=\"wc\">\n" "<entry\n" " path=\"qax.c\">\n" "<wc-status\n" " props=\"none\"\n" " item=\"added\"\n" " revision=\"0\">\n" "</wc-status>\n" "</entry>\n" "<entry\n" " path=\"bar.c\">\n" "<wc-status\n" " props=\"normal\"\n" " item=\"modified\"\n" " revision=\"965\">\n" "<commit\n" " revision=\"965\">\n" "<author>sally</author>\n" "<date>2008-05-28T06:35:53.048870Z</date>\n" "</commit>\n" "</wc-status>\n" "</entry>\n" "</target>\n" "</status>\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4848 msgid "" "For many more examples of <command>svn status</command>, see <xref linkend=" "\"svn.tour.cycle.examine.status\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:4863 #, fuzzy #| msgid "svn import" msgid "svn switch" msgstr "svn import" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:4864 #, fuzzy #| msgid "Update your working copy." msgid "Update working copy to a different URL." msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4868 #, no-wrap msgid "svn switch URL[@PEGREV] [PATH]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:4870 #, no-wrap msgid "switch --relocate FROM TO [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4877 msgid "" "The first variant of this subcommand (without the <option>--relocate</" "option> option) updates your working copy to point to a new URL—" "usually a URL that shares a common ancestor with your working copy, although " "not necessarily. This is the Subversion way to move a working copy to a new " "branch. If specified, <replaceable>PEGREV</replaceable> determines in which " "revision the target is first looked up. See <xref linkend=\"svn.branchmerge." "switchwc\"/> for an in-depth look at switching." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4888 msgid "" "If <option>--force</option> is used, unversioned obstructing paths in the " "working copy do not automatically cause a failure if the switch attempts to " "add the same path. If the obstructing path is the same type (file or " "directory) as the corresponding path in the repository, it becomes versioned " "but its contents are left untouched in the working copy. This means that an " "obstructing directory's unversioned children may also obstruct and become " "versioned. For files, any content differences between the obstruction and " "the repository are treated like a local modification to the working copy. " "All properties from the repository are applied to the obstructing path." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4902 msgid "" "As with most subcommands, you can limit the scope of the switch operation to " "a particular tree depth using the <option>--depth</option> option. " "Alternatively, you can use the <option>--set-depth</option> option to set a " "new <quote>sticky</quote> working copy depth on the switch target. " "Currently, the depth of a working copy directory can only be increased " "(telescoped more deeply); you cannot make a directory more shallow." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4911 msgid "" "The <option>--relocate</option> option causes <command>svn switch</command> " "to do something different: it updates your working copy to point to " "<emphasis>the same</emphasis> repository directory, only at a different URL " "(typically because an administrator has moved the repository to another " "server, or to another URL on the same server)." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:4923 #, fuzzy #| msgid "<command>svn add</command>" msgid "<command>sw</command>" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4939 #, no-wrap msgid "" "\n" "--accept ARG\n" "--depth ARG\n" "--diff3-cmd CMD\n" "--force\n" "--ignore-externals\n" "--quiet (-q)\n" "--relocate\n" "--revision (-r) REV\n" "--set-depth ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4955 msgid "" "If you're currently inside the directory <filename>vendors</filename>, which " "was branched to <filename>vendors-with-fix</filename>, and you'd like to " "switch your working copy to that branch:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4960 #, no-wrap msgid "" "\n" "$ svn switch http://svn.red-bean.com/repos/branches/vendors-with-fix .\n" "U myproj/foo.txt\n" "U myproj/bar.txt\n" "U myproj/baz.c\n" "U myproj/qux.c\n" "Updated to revision 31.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4969 msgid "" "To switch back, just provide the URL to the location in the repository from " "which you originally checked out your working copy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:4973 #, no-wrap msgid "" "\n" "$ svn switch http://svn.red-bean.com/repos/trunk/vendors .\n" "U myproj/foo.txt\n" "U myproj/bar.txt\n" "U myproj/baz.c\n" "U myproj/qux.c\n" "Updated to revision 31.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:4983 msgid "" "You can switch just part of your working copy to a branch if you don't want " "to switch your entire working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:4988 msgid "" "Sometimes an administrator might change the location (or apparent location) " "of your repository—in other words, the content of the repository " "doesn't change, but the repository's root URL does. For example, the " "hostname may change, the URL scheme may change, or any part of the URL that " "leads to the repository itself may change. Rather than check out a new " "working copy, you can have the <command>svn switch</command> command " "<quote>rewrite</quote> your working copy's administrative metadata to refer " "to the new repository location. If you use the <option>--relocate</option> " "option to <command>svn switch</command>, Subversion will contact the " "repository to validate the relocation request (looking for the repository at " "the new URL, of course), and then do this metadata rewriting. No file " "contents will be changed as the result of this type of switch " "operation—this is a metadata-only modification to the working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5006 #, no-wrap msgid "" "\n" "$ svn checkout file:///var/svn/repos test\n" "A test/a\n" "A test/b\n" "…\n" "\n" "$ mv repos newlocation\n" "$ cd test/\n" "\n" "$ svn update\n" "svn: Unable to open an ra_local session to URL\n" "svn: Unable to open repository 'file:///var/svn/repos'\n" "\n" "$ svn switch --relocate file:///var/svn/repos file:///tmp/newlocation .\n" "$ svn update\n" "At revision 3.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:5025 msgid "" "Be careful when using the <option>--relocate</option> option. If you " "mistype the argument, you might end up creating nonsensical URLs within your " "working copy that render the whole workspace unusable and tricky to fix. " "It's also important to understand exactly when one should or shouldn't use " "<option>--relocate</option>. Here's the rule of thumb:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:5035 msgid "" "If the working copy needs to reflect a new directory <emphasis>within</" "emphasis> the repository, use just <command>svn switch</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:5040 msgid "" "If the working copy still reflects the same repository directory, but the " "location of the repository itself has changed, use <command>svn switch</" "command> with the <option>--relocate</option> option." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5060 #, fuzzy #| msgid "svnlook" msgid "svn unlock" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5061 msgid "Unlock working copy paths or URLs." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5065 #, no-wrap msgid "svn unlock TARGET..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5070 msgid "" "Unlock each <replaceable>TARGET</replaceable>. If any <replaceable>TARGET</" "replaceable> is locked by another user or no valid lock token exists in the " "working copy, print a warning and continue unlocking the rest of the " "<replaceable>TARGET</replaceable>s. Use <option>--force</option> to break a " "lock belonging to another user or working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5098 #, no-wrap msgid "" "\n" "--force\n" "--targets FILENAME\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:5107 #, fuzzy #| msgid "Update your working copy." msgid "Unlock two files in your working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5109 #, no-wrap msgid "" "\n" "$ svn unlock tree.jpg house.jpg\n" "'tree.jpg' unlocked.\n" "'house.jpg' unlocked.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5115 msgid "" "Unlock a file in your working copy that is currently locked by another user:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5118 #, no-wrap msgid "" "\n" "$ svn unlock tree.jpg\n" "svn: 'tree.jpg' is not locked in this working copy\n" "$ svn unlock --force tree.jpg\n" "'tree.jpg' unlocked.\n" msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:5125 #, fuzzy #| msgid "Update your working copy." msgid "Unlock a file without a working copy:" msgstr "Aktualisieren Sie Ihre Arbeitskopie." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5127 #, no-wrap msgid "" "\n" "$ svn unlock http://svn.red-bean.com/repos/test/tree.jpg\n" "'tree.jpg unlocked.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5148 #, fuzzy #| msgid "svndumpfilter" msgid "svn update" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5153 #, no-wrap msgid "svn update [PATH...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5158 msgid "" "<command>svn update</command> brings changes from the repository into your " "working copy. If no revision is given, it brings your working copy up to " "date with the <literal>HEAD</literal> revision. Otherwise, it synchronizes " "the working copy to the revision given by the <option>--revision</option> " "option. As part of the synchronization, <command>svn update</command> also " "removes any stale locks (see <xref linkend=\"svn.tour.cleanup\"/>) found in " "the working copy." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5169 msgid "" "For each updated item, it prints a line that starts with a character " "reporting the action taken. These characters have the following meaning:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5178 msgid "Added" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:5183 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>B</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5185 msgid "Broken lock (third column only)" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5192 msgid "Deleted" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:5197 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>U</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5199 msgid "Updated" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:5204 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>C</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5206 msgid "Conflicted" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:5211 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>G</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5213 msgid "Merged" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:5218 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>E</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5220 msgid "Existed" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5226 msgid "" "A character in the first column signifies an update to the actual file, " "whereas updates to the file's properties are shown in the second column. " "Lock information is printed in the third column." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5231 msgid "" "As with most subcommands, you can limit the scope of the update operation to " "a particular tree depth using the <option>--depth</option> option. " "Alternatively, you can use the <option>--set-depth</option> option to set a " "new <quote>sticky</quote> working copy depth on the update target. " "Currently, the depth of a working copy directory can only be increased " "(telescoped more deeply); you cannot make a directory more shallow." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:5243 #, fuzzy #| msgid "<command>svn update</command>" msgid "<command>up</command>" msgstr "<command>svn update</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5259 #, no-wrap msgid "" "\n" "--accept ARG\n" "--changelist\n" "--depth ARG\n" "--diff3-cmd CMD\n" "--editor-cmd ARG\n" "--force\n" "--ignore-externals\n" "--quiet (-q)\n" "--revision (-r) REV\n" "--set-depth ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5276 msgid "Pick up repository changes that have happened since your last update:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5279 #, no-wrap msgid "" "\n" "$ svn update\n" "A newdir/toggle.c\n" "A newdir/disclose.c\n" "A newdir/launch.c\n" "D newdir/README\n" "Updated to revision 32.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5288 msgid "" "You can also <quote>update</quote> your working copy to an older revision " "(Subversion doesn't have the concept of <quote>sticky</quote> files like CVS " "does; see <xref linkend=\"svn.forcvs\"/>):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5293 #, no-wrap msgid "" "\n" "$ svn update -r30\n" "A newdir/README\n" "D newdir/toggle.c\n" "D newdir/disclose.c\n" "D newdir/launch.c\n" "U foo.c\n" "Updated to revision 30.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><tip><para> #: ../en/book/ch09-reference.xml:5304 msgid "" "If you want to examine an older revision of a single file, you may want to " "use <command>svn cat</command> instead—it won't change your working " "copy." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:5322 msgid "" "<command>svnadmin</command> is the administrative tool for monitoring and " "repairing your Subversion repository. For detailed information on " "repository administration, see the maintenance section for <xref linkend=" "\"svn.reposadmin.maint.tk.svnadmin\"/>." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:5327 msgid "" "Since <command>svnadmin</command> works via direct repository access (and " "thus can only be used on the machine that holds the repository), it refers " "to the repository with a path, not a URL." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:5333 #, fuzzy #| msgid "<command>svn add</command>" msgid "<command>svnadmin</command> Options" msgstr "<command>svn add</command>" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:5335 msgid "" "Options in <command>svmadin</command> are global, just as they are in " "<command>svn</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5341 msgid "<option>--bdb-log-keep</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5343 msgid "" "(Berkeley DB-specific.) Disable automatic log removal of database logfiles. " "Having these logfiles around can be convenient if you need to restore from a " "catastrophic repository failure." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5351 msgid "<option>--bdb-txn-nosync</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5354 msgid "" "(Berkeley DB-specific.) Disables fsync when committing database " "transactions. Used with the <command>svnadmin create</command> command to " "create a Berkeley DB-backed repository with <literal>DB_TXN_NOSYNC</literal> " "enabled (which improves speed but has some risks associated with it)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5364 msgid "<option>--bypass-hooks</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5366 msgid "Bypass the repository hook system." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5371 msgid "<option>--clean-logs</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5373 msgid "Remove unused Berkeley DB logs." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5381 msgid "<option>--force-uuid</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5383 msgid "" "By default, when loading data into repository that already contains " "revisions, <command>svnadmin</command> will ignore the <literal>UUID</" "literal> from the dump stream. This option will cause the repository's " "<literal>UUID</literal> to be set to the <literal>UUID</literal> from the " "stream." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5393 msgid "<option>--ignore-uuid</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5395 msgid "" "By default, when loading an empty repository, <command>svnadmin</command> " "will ignore the <literal>UUID</literal> from the dump stream. This option " "will force that UUID to be ignored (useful for overriding your configuration " "file if it has <option>--force-uuid</option> set)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5407 msgid "" "Dump a revision only as a diff against the previous revision, instead of the " "usual fulltext." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5414 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "<option>--parent-dir <replaceable>DIR</replaceable></option>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5417 msgid "" "When loading a dump file, root paths at <replaceable>DIR</replaceable> " "instead of <filename>/</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5424 msgid "<option>--pre-1.4-compatible</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5426 msgid "" "When creating a new repository, use a format that is compatible with " "versions of Subversion earlier than Subversion 1.4." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5433 msgid "<option>--pre-1.5-compatible</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5435 msgid "" "When creating a new repository, use a format that is compatible with " "versions of Subversion earlier than Subversion 1.5." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5442 msgid "" "<option>--revision</option> (<option>-r</option>) <replaceable>ARG</" "replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5445 msgid "Specify a particular revision to operate on." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5451 ../en/book/ch09-reference.xml:8269 msgid "<option>--quiet</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5453 msgid "Do not show normal progress—show only errors." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5459 msgid "<option>--use-post-commit-hook</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5461 msgid "" "When loading a dump file, runs the repository's <literal>post-commit</" "literal> hook after finalizing each newly loaded revision." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5468 msgid "<option>--use-post-revprop-change-hook</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5470 msgid "" "When changing a revision property, runs the repository's <literal>post-" "revprop-change</literal> hook after changing the revision property." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5477 msgid "<option>--use-pre-commit-hook</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5479 msgid "" "When loading a dump file, runs the repository's <literal>pre-commit</" "literal> hook before finalizing each newly loaded revision. If the hook " "fails, aborts the commit and terminates the load process." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5487 msgid "<option>--use-pre-revprop-change-hook</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5489 msgid "" "When changing a revision property, runs the repository's <literal>pre-" "revprop-change</literal> hook before changing the revision property. If the " "hook fails, aborts the modification and terminates." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:5501 msgid "svnadmin Subcommands" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:5503 msgid "" "Here are the various subcommands for the <command>svnadmin</command> program." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5515 #, fuzzy #| msgid "svnadmin" msgid "svnadmin crashtest" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5516 msgid "Simulate a process that crashes." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5520 #, no-wrap msgid "svnadmin crashtest REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5525 msgid "" "Open the repository at <replaceable>REPOS_PATH</replaceable>, then abort, " "thus simulating a process that crashes while holding an open repository " "handle. This is used for testing automatic repository recovery (a new " "feature in Berkeley DB 4.4). It's unlikely that you'll need to run this " "command." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5544 #, no-wrap msgid "" "\n" "$ svnadmin crashtest /var/svn/repos\n" "Aborted\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5549 msgid "Exciting, isn't it?" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5563 #, fuzzy #| msgid "svnadmin" msgid "svnadmin create" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5564 msgid "Create a new, empty repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5568 #, no-wrap msgid "svnadmin create REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para><footnote> #: ../en/book/ch09-reference.xml:5573 msgid "" "Create a new, empty repository at the path provided. If the provided " "directory does not exist, it will be created for you. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para><footnote><para> #: ../en/book/ch09-reference.xml:5577 msgid "" "Remember, <command>svnadmin</command> works only with local <emphasis>paths</" "emphasis>, not <emphasis>URLs</emphasis>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5580 msgid "" "</footnote> As of Subversion 1.2, <command>svnadmin</command> creates new " "repositories with the <literal>FSFS</literal> filesystem backend by default." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5586 msgid "" "While <command>svnadmin create</command> will create the base directory for " "a new repository, it will not create intermediate directories. For example, " "if you have an empty directory named <filename>/var/svn</filename>, creating " "<filename>/var/svn/repos</filename> will work, while attempting to create " "<filename>/var/svn/subdirectory/repos</filename> will fail with an error." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5601 #, no-wrap msgid "" "\n" "--bdb-log-keep\n" "--bdb-txn-nosync\n" "--config-dir DIR\n" "--fs-type TYPE\n" "--pre-1.4-compatible\n" "--pre-1.5-compatible\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5614 msgid "Creating a new repository is this easy:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5616 #, no-wrap msgid "" "\n" "$ svnadmin create /var/svn/repos\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5620 msgid "" "In Subversion 1.0, a Berkeley DB repository is always created. In " "Subversion 1.1, a Berkeley DB repository is the default repository type, but " "an FSFS repository can be created using the <option>--fs-type</option> " "option:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5626 #, no-wrap msgid "" "\n" "$ svnadmin create /var/svn/repos --fs-type fsfs\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5642 #, fuzzy #| msgid "svnadmin" msgid "svnadmin deltify" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5643 msgid "Deltify changed paths in a revision range." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5647 #, no-wrap msgid "svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5652 msgid "" "<command>svnadmin deltify</command> exists in current versions of Subversion " "only for historical reasons. This command is deprecated and no longer " "needed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5656 msgid "" "It dates from a time when Subversion offered administrators greater control " "over compression strategies in the repository. This turned out to be a lot " "of complexity for <emphasis>very</emphasis> little gain, and this " "<quote>feature</quote> was deprecated." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5666 #, no-wrap msgid "" "\n" "--quiet (-q)\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5682 #, fuzzy #| msgid "svnadmin" msgid "svnadmin dump" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:5683 #, fuzzy #| msgid "" #| "The contents of the file <filename>item</filename> have been modified." msgid "Dump the contents of the filesystem to <filename>stdout</filename>." msgstr "Der Inhalt der Datei <filename>item</filename> ist geändert worden." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5687 #, no-wrap msgid "svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5692 msgid "" "Dump the contents of the filesystem to <filename>stdout</filename> in a " "<quote>dump file</quote> portable format, sending feedback to " "<filename>stderr</filename>. Dump revisions <replaceable>LOWER</" "replaceable> rev through <replaceable>UPPER</replaceable> rev. If no " "revisions are given, dump all revision trees. If only <replaceable>LOWER</" "replaceable> is given, dump that one revision tree. See <xref linkend=\"svn." "reposadmin.maint.migrate\"/> for a practical use." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5702 msgid "" "By default, the Subversion dump stream contains a single revision (the first " "revision in the requested revision range) in which every file and directory " "in the repository in that revision is presented as though that whole tree " "was added at once, followed by other revisions (the remainder of the " "revisions in the requested range), which contain only the files and " "directories that were modified in those revisions. For a modified file, the " "complete full-text representation of its contents, as well as all of its " "properties, are presented in the dump file; for a directory, all of its " "properties are presented." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5714 msgid "" "Two useful options modify the dump file generator's behavior. The first is " "the <option>--incremental</option> option, which simply causes that first " "revision in the dump stream to contain only the files and directories " "modified in that revision, instead of being presented as the addition of a " "new tree, and in exactly the same way that every other revision in the dump " "file is presented. This is useful for generating a relatively small dump " "file to be loaded into another repository that already has the files and " "directories that exist in the original repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5726 msgid "" "The second useful option is <option>--deltas</option>. This option causes " "<command>svnadmin dump</command> to, instead of emitting full-text " "representations of file contents and property lists, emit only deltas of " "those items against their previous versions. This reduces (in some cases, " "drastically) the size of the dump file that <command>svnadmin dump</command> " "creates. There are, however, disadvantages to using this option—" "deltified dump files are more CPU-intensive to create, cannot be operated on " "by <command>svndumpfilter</command>, and tend not to compress as well as " "their nondeltified counterparts when using third-party tools such as " "<command>gzip</command> and <command>bzip2</command>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5743 #, no-wrap msgid "" "\n" "--deltas\n" "--incremental\n" "--quiet (-q)\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5754 msgid "Dump your whole repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5756 #, no-wrap msgid "" "\n" "$ svnadmin dump /var/svn/repos > full.dump\n" "* Dumped revision 0.\n" "* Dumped revision 1.\n" "* Dumped revision 2.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5764 msgid "Incrementally dump a single transaction from your repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5767 #, no-wrap msgid "" "\n" "$ svnadmin dump /var/svn/repos -r 21 --incremental > incr.dump\n" "* Dumped revision 21.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5784 #, fuzzy #| msgid "svnadmin" msgid "svnadmin help" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5788 #, no-wrap msgid "svnadmin help [SUBCOMMAND...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5794 msgid "" "This subcommand is useful when you're trapped on a desert island with " "neither a Net connection nor a copy of this book." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5815 #, fuzzy #| msgid "svnadmin" msgid "svnadmin hotcopy" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5816 msgid "Make a hot copy of a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5820 #, no-wrap msgid "svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5826 msgid "" "This subcommand makes a full <quote>hot</quote> backup of your repository, " "including all hooks, configuration files, and, of course, database files. " "If you pass the <option>--clean-logs</option> option, <command>svnadmin</" "command> will perform a hot copy of your repository, and then remove unused " "Berkeley DB logs from the original repository. You can run this command at " "any time and make a safe copy of the repository, regardless of whether other " "processes are using the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5841 #, no-wrap msgid "" "\n" "--clean-logs\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:5846 msgid "" "As described in <xref linkend=\"svn.reposadmin.basics.backends.bdb\"/>, hot-" "copied Berkeley DB repositories are <emphasis>not</emphasis> portable across " "operating systems, nor will they work on machines with a different " "<quote>endianness</quote> than the machine where they were created." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:5867 msgid "svnadmin list-dblogs" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5868 msgid "" "Ask Berkeley DB which logfiles exist for a given Subversion repository " "(applies only to repositories using the <literal>bdb</literal> backend)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5874 #, no-wrap msgid "svnadmin list-dblogs REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5879 ../en/book/ch09-reference.xml:5912 msgid "" "Berkeley DB creates logs of all changes to the repository, which allow it to " "recover in the face of catastrophe. Unless you enable " "<literal>DB_LOG_AUTOREMOVE</literal>, the logfiles accumulate, although most " "are no longer used and can be deleted to reclaim disk space. See <xref " "linkend=\"svn.reposadmin.maint.diskspace\"/> for more information." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:5900 msgid "svnadmin list-unused-dblogs" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5901 msgid "" "Ask Berkeley DB which logfiles can be safely deleted (applies only to " "repositories using the <literal>bdb</literal> backend)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5907 #, no-wrap msgid "svnadmin list-unused-dblogs REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5925 msgid "Remove all unused logfiles from the repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5927 #, no-wrap msgid "" "\n" "$ svnadmin list-unused-dblogs /var/svn/repos\n" "/var/svn/repos/log.0000000031\n" "/var/svn/repos/log.0000000032\n" "/var/svn/repos/log.0000000033\n" "\n" "$ svnadmin list-unused-dblogs /var/svn/repos | xargs rm\n" "## disk space reclaimed!\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:5949 #, fuzzy #| msgid "svnadmin" msgid "svnadmin load" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:5949 msgid "Read a repository dump stream from <filename>stdin</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:5955 #, no-wrap msgid "svnadmin load REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5960 msgid "" "Read a repository dump stream from <filename>stdin</filename>, committing " "new revisions into the repository's filesystem. Send progress feedback to " "<filename>stdout</filename>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5968 #, no-wrap msgid "" "\n" "--force-uuid\n" "--ignore-uuid\n" "--parent-dir\n" "--quiet (-q)\n" "--use-post-commit-hook\n" "--use-pre-commit-hook\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5981 msgid "" "This shows the beginning of loading a repository from a backup file (made, " "of course, with <command>svnadmin dump</command>):" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5985 #, no-wrap msgid "" "\n" "$ svnadmin load /var/svn/restored < repos-backup\n" "<<< Started new txn, based on original revision 1\n" " * adding path : test ... done.\n" " * adding path : test/a ... done.\n" "…\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:5993 msgid "Or if you want to load into a subdirectory:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:5995 #, no-wrap msgid "" "\n" "$ svnadmin load --parent-dir new/subdir/for/project \\\n" " /var/svn/restored < repos-backup\n" "<<< Started new txn, based on original revision 1\n" " * adding path : test ... done.\n" " * adding path : test/a ... done.\n" "…\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6016 #, fuzzy #| msgid "svnadmin" msgid "svnadmin lslocks" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6017 msgid "Print descriptions of all locks." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6021 #, no-wrap msgid "svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6026 msgid "" "Print descriptions of all locks in repository <replaceable>REPOS_PATH</" "replaceable> underneath the path <replaceable>PATH-IN-REPOS</replaceable>. " "If <replaceable>PATH-IN-REPOS</replaceable> is not provided, it defaults to " "the root directory of the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6045 msgid "" "This lists the one locked file in the repository at <filename>/var/svn/" "repos</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6048 #, no-wrap msgid "" "\n" "$ svnadmin lslocks /var/svn/repos\n" "Path: /tree.jpg\n" "UUID Token: opaquelocktoken:ab00ddf0-6afb-0310-9cd0-dda813329753\n" "Owner: harry\n" "Created: 2005-07-08 17:27:36 -0500 (Fri, 08 Jul 2005)\n" "Expires: \n" "Comment (1 line):\n" "Rework the uppermost branches on the bald cypress in the foreground.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6070 #, fuzzy #| msgid "svnadmin" msgid "svnadmin lstxns" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6071 msgid "Print the names of all uncommitted transactions." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6075 #, no-wrap msgid "svnadmin lstxns REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6080 msgid "" "Print the names of all uncommitted transactions. See <xref linkend=\"svn." "reposadmin.maint.diskspace.deadtxns\" /> for information on how uncommitted " "transactions are created and what you should do with them." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6089 msgid "List all outstanding transactions in a repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6092 #, no-wrap msgid "" "\n" "$ svnadmin lstxns /var/svn/repos/ \n" "1w\n" "1x\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6110 #, fuzzy #| msgid "svnadmin" msgid "svnadmin recover" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6112 msgid "" "Bring a repository database back into a consistent state (applies only to " "repositories using the <literal>bdb</literal> backend). In addition, if " "<filename>repos/conf/passwd</filename> does not exist, it will create a " "default passwordfile ." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6121 #, no-wrap msgid "svnadmin recover REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6126 msgid "" "Run this command if you get an error indicating that your repository needs " "to be recovered." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6131 #, no-wrap msgid "" "\n" "--wait\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6138 msgid "Recover a hung repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6140 #, no-wrap msgid "" "\n" "$ svnadmin recover /var/svn/repos/ \n" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" "\n" "Recovery completed.\n" "The latest repos revision is 34.\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6149 msgid "" "Recovering the database requires an exclusive lock on the repository. (This " "is a <quote>database lock</quote>; see the sidebar <xref linkend=\"svn." "advanced.locking.meanings\"/>.) If another process is accessing the " "repository, then <command>svnadmin recover</command> will error:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6154 #, no-wrap msgid "" "\n" "$ svnadmin recover /var/svn/repos\n" "svn: Failed to get exclusive repository access; perhaps another process\n" "such as httpd, svnserve or svn has it open?\n" "\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6162 msgid "" "The <option>--wait</option> option, however, will cause <command>svnadmin " "recover</command> to wait indefinitely for other processes to disconnect:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6166 #, no-wrap msgid "" "\n" "$ svnadmin recover /var/svn/repos --wait\n" "Waiting on repository lock; perhaps another process has it open?\n" "\n" "### time goes by…\n" "\n" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" "\n" "Recovery completed.\n" "The latest repos revision is 34.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6192 #, fuzzy #| msgid "svnadmin" msgid "svnadmin rmlocks" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6193 msgid "Unconditionally remove one or more locks from a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6198 #, no-wrap msgid "svnadmin rmlocks REPOS_PATH LOCKED_PATH..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6203 msgid "" "Remove one or more locks from each <replaceable>LOCKED_PATH</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:6215 #, fuzzy #| msgid "" #| "The previous example copied the contents of directory <filename>mytree</" #| "filename> under the directory <filename>some/project</filename> in the " #| "repository:" msgid "" "This deletes the locks on <filename>tree.jpg</filename> and <filename>house." "jpg</filename> in the repository at <filename>/var/svn/repos</filename>:" msgstr "" "Im vorstehenden Beispiel wurde der Inhalt des Verzeichnisses " "<filename>mytree</filename> unter dem Verzeichnis <filename>some/project</" "filename> im Repository abgelegt:" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6220 #, no-wrap msgid "" "\n" "$ svnadmin rmlocks /var/svn/repos tree.jpg house.jpg\n" "Removed lock on '/tree.jpg.\n" "Removed lock on '/house.jpg.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6238 #, fuzzy #| msgid "svnadmin" msgid "svnadmin rmtxns" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6239 msgid "Delete transactions from a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6243 #, no-wrap msgid "svnadmin rmtxns REPOS_PATH TXN_NAME..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6248 msgid "" "Delete outstanding transactions from a repository. This is covered in " "detail in <xref linkend=\"svn.reposadmin.maint.diskspace.deadtxns\" />." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6256 #, no-wrap msgid "" "\n" "--quiet (-q)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6264 msgid "Remove named transactions:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6266 #, no-wrap msgid "" "\n" "$ svnadmin rmtxns /var/svn/repos/ 1w 1x\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6270 msgid "" "Fortunately, the output of <command>lstxns</command> works great as the " "input for <command>rmtxns</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6273 #, no-wrap msgid "" "\n" "$ svnadmin rmtxns /var/svn/repos/ `svnadmin lstxns /var/svn/repos/`\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6277 msgid "This removes all uncommitted transactions from your repository." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6293 #, fuzzy #| msgid "svnadmin" msgid "svnadmin setlog" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6294 msgid "Set the log message on a revision." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6298 #, no-wrap msgid "svnadmin setlog REPOS_PATH -r REVISION FILE" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6303 msgid "" "Set the log message on revision <replaceable>REVISION</replaceable> to the " "contents of <replaceable>FILE</replaceable>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6307 msgid "" "This is similar to using <command>svn propset</command> with the <option>--" "revprop</option> option to set the <literal>svn:log</literal> property on a " "revision, except that you can also use the option <option>--bypass-hooks</" "option> to avoid running any pre- or post-commit hooks, which is useful if " "the modification of revision properties has not been enabled in the " "<literal>pre-revprop-change</literal> hook." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:6316 msgid "" "Revision properties are not under version control, so this command will " "permanently overwrite the previous log message." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6326 #, no-wrap msgid "" "\n" "--bypass-hooks\n" "--revision (-r) REV\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6335 msgid "" "Set the log message for revision 19 to the contents of the file " "<filename>msg</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6338 #, no-wrap msgid "" "\n" "$ svnadmin setlog /var/svn/repos/ -r 19 msg\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:6354 msgid "svnadmin setrevprop" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6355 msgid "Set a property on a revision." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6359 #, no-wrap msgid "svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6364 msgid "" "Set the property <replaceable>NAME</replaceable> on revision " "<replaceable>REVISION</replaceable> to the contents of <replaceable>FILE</" "replaceable>. Use <option>--use-pre-revprop-change-hook</option> or " "<option>--use-post-revprop-change-hook</option> to trigger the revision " "property-related hooks (e.g., if you want an email notification sent from " "your <literal>post-revprop-change-hook</literal>)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6377 #, no-wrap msgid "" "\n" "--revision (-r) ARG\n" "--use-post-revprop-change-hook\n" "--use-pre-revprop-change-hook\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6387 msgid "" "The following sets the revision property <literal>repository-photo</literal> " "to the contents of the file <filename>sandwich.png</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6391 #, no-wrap msgid "" "\n" "$svnadmin setrevprop /var/svn/repos -r 0 repository-photo sandwich.png\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6395 msgid "" "As you can see, <command>svnadmin setrevprop</command> has no output upon " "success." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6410 #, fuzzy #| msgid "svnadmin" msgid "svnadmin setuuid" msgstr "svnadmin" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:6411 #, fuzzy #| msgid "The Repository" msgid "Reset the repository UUID." msgstr "Das Repository" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6415 #, no-wrap msgid "svnadmin setuuid REPOS_PATH [NEW_UUID]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6420 msgid "" "Reset the repository UUID for the repository located at " "<replaceable>REPOS_PATH</replaceable>. If <replaceable>NEW_UUID</" "replaceable> is provided, use that as the new repository UUID; otherwise, " "generate a brand-new UUID for the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6438 msgid "" "If you've <command>svnsync</command>ed <filename>/var/svn/repos</filename> " "to <filename>/var/svn/repos-new</filename> and intend to use <filename>repos-" "new</filename> as your canonical repository, you may want to change the UUID " "for <filename>repos-new</filename> to the UUID of <filename>repos</filename> " "so that your users don't have to check out a new working copy to accommodate " "the change:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6445 #, no-wrap msgid "" "\n" "$ svnadmin setuuid /var/svn/repos-new 2109a8dd-854f-0410-ad31-d604008985ab\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6449 msgid "" "As you can see, <command>svnadmin setuuid</command> has no output upon " "success." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6464 #, fuzzy #| msgid "svnadmin" msgid "svnadmin upgrade" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6465 msgid "Upgrade a repository to the latest supported schema version." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6470 #, no-wrap msgid "svnadmin upgrade REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6475 msgid "" "Upgrade the repository located at <replaceable>REPOS_PATH</replaceable> to " "the latest supported schema version." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6479 msgid "" "This functionality is provided as a convenience for repository " "administrators who wish to make use of new Subversion functionality without " "having to undertake a potentially costly full repository dump and load " "operation. As such, the upgrade performs only the minimum amount of work " "needed to accomplish this while still maintaining the integrity of the " "repository. While a dump and subsequent load guarantee the most optimized " "repository state, <command>svnadmin upgrade</command> does not." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><warning><para> #: ../en/book/ch09-reference.xml:6491 msgid "" "You should <emphasis>always</emphasis> back up your repository before " "upgrading." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6507 msgid "Upgrade the repository at path <filename>/var/repos/svn</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6510 #, no-wrap msgid "" "\n" "$ svnadmin upgrade /var/repos/svn\n" "Repository lock acquired.\n" "Please wait; upgrading the repository may take some time...\n" "\n" "Upgrade completed.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6532 #, fuzzy #| msgid "svnadmin" msgid "svnadmin verify" msgstr "svnadmin" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6533 msgid "Verify the data stored in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6537 #, no-wrap msgid "svnadmin verify REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6542 msgid "" "Run this command if you wish to verify the integrity of your repository. " "This basically iterates through all revisions in the repository by " "internally dumping all revisions and discarding the output—it's a good " "idea to run this on a regular basis to guard against latent hard disk " "failures and <quote>bitrot.</quote> If this command fails—which it " "will do at the first sign of a problem—that means your repository has " "at least one corrupted revision, and you should restore the corrupted " "revision from a backup (you did make a backup, didn't you?)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6559 #, no-wrap msgid "" "\n" "--quiet (-q)\n" "--revision (-r) ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6568 msgid "Verify a hung repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6570 #, no-wrap msgid "" "\n" "$ svnadmin verify /var/svn/repos/ \n" "* Verified revision 1729.\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:6588 msgid "" "<command>svnlook</command> is a command-line utility for examining different " "aspects of a Subversion repository. It does not make any changes to the " "repository—it's just used for <quote>peeking.</quote> " "<command>svnlook</command> is typically used by the repository hooks, but a " "repository administrator might find it useful for diagnostic purposes." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:6596 msgid "" "Since <command>svnlook</command> works via direct repository access (and " "thus can be used only on the machine that holds the repository), it refers " "to the repository with a path, not a URL." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:6600 msgid "" "If no revision or transaction is specified, <command>svnlook</command> " "defaults to the youngest (most recent) revision of the repository." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6606 #, fuzzy #| msgid "svnlook" msgid "svnlook Options" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:6608 msgid "" "Options in <command>svnlook</command> are global, just as they are in " "<command>svn</command> and <command>svnadmin</command>; however, most " "options apply to only one subcommand since the functionality of " "<command>svnlook</command> is (intentionally) limited in scope:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6618 msgid "<option>--copy-info</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6620 msgid "" "Causes <command>svnlook changed</command> to show detailed copy source " "information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6628 msgid "" "Prevents <command>svnlook diff</command> from printing differences for " "deleted files. The default behavior when a file is deleted in a transaction/" "revision is to print the same differences that you would see if you had left " "the file but removed all the content." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6637 msgid "<option>--no-diff-added</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6639 msgid "" "Prevents <command>svnlook diff</command> from printing differences for added " "files. The default behavior when you add a file is to print the same " "differences that you would see if you had added the entire contents of an " "existing (empty) file." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6648 msgid "<option>--revision</option> (<option>-r</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6651 msgid "Specifies a particular revision number that you wish to examine." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6668 msgid "<option>--transaction</option> (<option>-t</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6671 msgid "Specifies a particular transaction ID that you wish to examine." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6677 msgid "<option>--show-ids</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6679 msgid "" "Shows the filesystem node revision IDs for each path in the filesystem tree." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:6690 msgid "svnlook Subcommands" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:6692 msgid "" "Here are the various subcommands for the <command>svnlook</command> program." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6704 #, fuzzy #| msgid "svnlook" msgid "svnlook author" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6705 msgid "Print the author." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6709 #, no-wrap msgid "svnlook author REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6714 msgid "Print the author of a revision or transaction in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6721 ../en/book/ch09-reference.xml:6767 #: ../en/book/ch09-reference.xml:6949 ../en/book/ch09-reference.xml:7068 #: ../en/book/ch09-reference.xml:7216 ../en/book/ch09-reference.xml:7318 #, no-wrap msgid "" "\n" "--revision (-r) REV\n" "--transaction (-t) TXN\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6730 msgid "<command>svnlook author</command> is handy, but not very exciting:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6733 #, no-wrap msgid "" "\n" "$ svnlook author -r 40 /var/svn/repos \n" "sally\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6750 #, fuzzy #| msgid "svnlook" msgid "svnlook cat" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6751 ../en/book/ch09-reference.xml:6760 msgid "Print the contents of a file." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6755 #, no-wrap msgid "svnlook cat REPOS_PATH PATH_IN_REPOS" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6776 msgid "" "This shows the contents of a file in transaction <literal>ax8</literal>, " "located at <filename>/trunk/README</filename>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6780 #, no-wrap msgid "" "\n" "$ svnlook cat -t ax8 /var/svn/repos /trunk/README\n" "\n" " Subversion, a version control system.\n" " =====================================\n" "\n" "$LastChangedDate: 2003-07-17 10:45:25 -0500 (Thu, 17 Jul 2003) $\n" "\n" "Contents:\n" "\n" " I. A FEW POINTERS\n" " II. DOCUMENTATION\n" " III. PARTICIPATING IN THE SUBVERSION COMMUNITY\n" "…\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6808 #, fuzzy #| msgid "svnlook" msgid "svnlook changed" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6809 msgid "Print the paths that were changed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6813 #, no-wrap msgid "svnlook changed REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6818 msgid "" "Print the paths that were changed in a particular revision or transaction, " "as well as <quote>svn update-style</quote> status letters in the first two " "columns:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:6826 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'A '</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6828 msgid "Item added to repository" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:6833 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'D '</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6835 msgid "Item deleted from repository" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:6840 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'U '</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6842 msgid "File contents changed" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:6847 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'_U'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6849 msgid "Properties of item changed; note the leading underscore" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:6854 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>'UU'</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:6856 msgid "File contents and properties changed" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6862 msgid "" "Files and directories can be distinguished, as directory paths are displayed " "with a trailing <quote><literal>/</literal></quote> character." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6872 #, no-wrap msgid "" "\n" "--copy-info\n" "--revision (-r) REV\n" "--transaction (-t) TXN\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6882 msgid "" "This shows a list of all the changed files and directories in revision 39 of " "a test repository. Note that the first changed item is a directory, as " "evidenced by the trailing <literal>/</literal>:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6887 #, no-wrap msgid "" "\n" "$ svnlook changed -r 39 /var/svn/repos\n" "A trunk/vendors/deli/\n" "A trunk/vendors/deli/chips.txt\n" "A trunk/vendors/deli/sandwich.txt\n" "A trunk/vendors/deli/pickle.txt\n" "U trunk/vendors/baker/bagel.txt\n" "_U trunk/vendors/baker/croissant.txt\n" "UU trunk/vendors/baker/pretzel.txt\n" "D trunk/vendors/baker/baguette.txt\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6899 msgid "Here's an example that shows a revision in which a file was renamed:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6902 #, no-wrap msgid "" "\n" "$ svnlook changed -r 64 /var/svn/repos\n" "A trunk/vendors/baker/toast.txt\n" "D trunk/vendors/baker/bread.txt\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6908 msgid "" "Unfortunately, nothing in the preceding output reveals the connection " "between the deleted and added files. Use the <option>--copy-info</option> " "option to make this relationship more apparent:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6913 #, no-wrap msgid "" "\n" "$ svnlook changed -r 64 --copy-info /var/svn/repos\n" "A + trunk/vendors/baker/toast.txt\n" " (from trunk/vendors/baker/bread.txt:r63)\n" "D trunk/vendors/baker/bread.txt\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6932 #, fuzzy #| msgid "svnlook" msgid "svnlook date" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6933 msgid "Print the datestamp." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6937 #, no-wrap msgid "svnlook date REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6942 msgid "Print the datestamp of a revision or transaction in a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6958 msgid "This shows the date of revision 40 of a test repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6961 #, no-wrap msgid "" "\n" "$ svnlook date -r 40 /var/svn/repos/\n" "2003-02-22 17:44:49 -0600 (Sat, 22 Feb 2003)\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:6978 #, fuzzy #| msgid "svnlook" msgid "svnlook diff" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:6979 msgid "Print differences of changed files and properties." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:6983 #, no-wrap msgid "svnlook diff REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:6988 msgid "" "Print GNU-style differences of changed files and properties in a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:6995 #, no-wrap msgid "" "\n" "--diff-copy-from\n" "--no-diff-added\n" "--no-diff-deleted\n" "--revision (-r) REV\n" "--transaction (-t) TXN\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7007 msgid "" "This shows a newly added (empty) file, a deleted file, and a copied file:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7010 #, no-wrap msgid "" "\n" "$ svnlook diff -r 40 /var/svn/repos/\n" "Copied: egg.txt (from rev 39, trunk/vendors/deli/pickle.txt)\n" "\n" "Added: trunk/vendors/deli/soda.txt\n" "==============================================================================\n" "\n" "Modified: trunk/vendors/deli/sandwich.txt\n" "==============================================================================\n" "--- trunk/vendors/deli/sandwich.txt\t(original)\n" "+++ trunk/vendors/deli/sandwich.txt\t2003-02-22 17:45:04.000000000 -0600\n" "@@ -0,0 +1 @@\n" "+Don't forget the mayo!\n" "\n" "Modified: trunk/vendors/deli/logo.jpg\n" "==============================================================================\n" "(Binary files differ)\n" "\n" "Deleted: trunk/vendors/deli/chips.txt\n" "==============================================================================\n" "\n" "Deleted: trunk/vendors/deli/pickle.txt\n" "==============================================================================\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7035 msgid "" "If a file has a nontextual <literal>svn:mime-type</literal> property, the " "differences are not explicitly shown." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:7050 msgid "svnlook dirs-changed" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7051 msgid "Print the directories that were themselves changed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7055 #, no-wrap msgid "svnlook dirs-changed REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7060 msgid "" "Print the directories that were themselves changed (property edits) or whose " "file children were changed." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7077 msgid "" "This shows the directories that changed in revision 40 in our sample " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7080 #, no-wrap msgid "" "\n" "$ svnlook dirs-changed -r 40 /var/svn/repos\n" "trunk/vendors/deli/\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7097 #, fuzzy #| msgid "svnlook" msgid "svnlook help" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7101 #, no-wrap msgid "Also svnlook -h and svnlook -?." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7106 msgid "" "Displays the help message for <command>svnlook</command>. This command, " "like its brother, <command>svn help</command>, is also your friend, even " "though you never call it anymore and forgot to invite it to your last party." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7134 #, fuzzy #| msgid "svnlook" msgid "svnlook history" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7135 ../en/book/ch09-reference.xml:7146 msgid "" "Print information about the history of a path in the repository (or the root " "directory if no path is supplied)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7141 #, no-wrap msgid "svnlook history REPOS_PATH [PATH_IN_REPOS]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7154 #, no-wrap msgid "" "\n" "--limit (-l) ARG\n" "--revision (-r) REV\n" "--show-ids\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7164 msgid "" "This shows the history output for the path <filename>/branches/bookstore</" "filename> as of revision 13 in our sample repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7168 #, no-wrap msgid "" "\n" "$ svnlook history -r 13 /var/svn/repos /branches/bookstore --show-ids\n" "REVISION PATH <ID>\n" "-------- ---------\n" " 13 /branches/bookstore <1.1.r13/390>\n" " 12 /branches/bookstore <1.1.r12/413>\n" " 11 /branches/bookstore <1.1.r11/0>\n" " 9 /trunk <1.0.r9/551>\n" " 8 /trunk <1.0.r8/131357096>\n" " 7 /trunk <1.0.r7/294>\n" " 6 /trunk <1.0.r6/353>\n" " 5 /trunk <1.0.r5/349>\n" " 4 /trunk <1.0.r4/332>\n" " 3 /trunk <1.0.r3/335>\n" " 2 /trunk <1.0.r2/295>\n" " 1 /trunk <1.0.r1/532>\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7198 #, fuzzy #| msgid "svnlook" msgid "svnlook info" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7199 msgid "Print the author, datestamp, log message size, and log message." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7204 #, no-wrap msgid "svnlook info REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7209 msgid "" "Print the author, datestamp, log message size (in bytes), and log message, " "followed by a newline character." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7225 msgid "This shows the info output for revision 40 in our sample repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7228 #, no-wrap msgid "" "\n" "$ svnlook info -r 40 /var/svn/repos\n" "sally\n" "2003-02-22 17:44:49 -0600 (Sat, 22 Feb 2003)\n" "16\n" "Rearrange lunch.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7249 #, fuzzy #| msgid "svnlook" msgid "svnlook lock" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7250 msgid "If a lock exists on a path in the repository, describe it." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7255 #, no-wrap msgid "svnlook lock REPOS_PATH PATH_IN_REPOS" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7260 msgid "" "Print all information available for the lock at <replaceable>PATH_IN_REPOS</" "replaceable>. If <replaceable>PATH_IN_REPOS</replaceable> is not locked, " "print nothing." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7275 #, fuzzy #| msgid "" #| "The contents of the file <filename>item</filename> have been modified." msgid "This describes the lock on the file <filename>tree.jpg</filename>:" msgstr "Der Inhalt der Datei <filename>item</filename> ist geändert worden." # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7278 #, no-wrap msgid "" "\n" "$ svnlook lock /var/svn/repos tree.jpg\n" "UUID Token: opaquelocktoken:ab00ddf0-6afb-0310-9cd0-dda813329753\n" "Owner: harry\n" "Created: 2005-07-08 17:27:36 -0500 (Fri, 08 Jul 2005)\n" "Expires: \n" "Comment (1 line):\n" "Rework the uppermost branches on the bald cypress in the foreground.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7301 #, fuzzy #| msgid "svnlook" msgid "svnlook log" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7302 msgid "Print the log message, followed by a newline character." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7307 #, no-wrap msgid "svnlook log REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7312 msgid "Print the log message." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7327 msgid "This shows the log output for revision 40 in our sample repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7330 #, no-wrap msgid "" "\n" "$ svnlook log /var/svn/repos/\n" "Rearrange lunch.\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7347 #, fuzzy #| msgid "svnlook" msgid "svnlook propget" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7348 msgid "Print the raw value of a property on a path in the repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7353 #, no-wrap msgid "svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7358 msgid "List the value of a property on a path in the repository." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:7365 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>pg</command>, <command>pget</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7371 #, no-wrap msgid "" "\n" "--revision (-r) REV\n" "--revprop\n" "--transaction (-t) TXN\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7381 msgid "" "This shows the value of the <quote>seasonings</quote> property on the file " "<filename>/trunk/sandwich</filename> in the <literal>HEAD</literal> revision:" msgstr "" # type: Content of: <chapter><sect1><sect2><screen> #: ../en/book/ch09-reference.xml:7385 #, fuzzy, no-wrap #| msgid "" #| "\n" #| "$ svn list file:///var/svn/repos\n" #| "/trunk\n" #| "/branches\n" #| "/tags\n" msgid "" "\n" "$ svnlook pg /var/svn/repos seasonings /trunk/sandwich\n" "mustard\n" msgstr "" "\n" "$ svn list file:///var/svn/repos\n" "/trunk\n" "/branches\n" "/tags\n" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7402 #, fuzzy #| msgid "svnlook" msgid "svnlook proplist" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7403 msgid "Print the names and values of versioned file and directory properties." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7408 #, no-wrap msgid "svnlook proplist REPOS_PATH [PATH_IN_REPOS]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7413 msgid "" "List the properties of a path in the repository. With <option>--verbose</" "option>, show the property values too." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:7420 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>pl</command>, <command>plist</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7426 #, no-wrap msgid "" "\n" "--revision (-r) REV\n" "--revprop\n" "--transaction (-t) TXN\n" "--verbose (-v)\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7437 msgid "" "This shows the names of properties set on the file <filename>/trunk/README</" "filename> in the <literal>HEAD</literal> revision:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7441 #, no-wrap msgid "" "\n" "$ svnlook proplist /var/svn/repos /trunk/README\n" " original-author\n" " svn:mime-type\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7447 msgid "" "This is the same command as in the preceding example, but this time showing " "the property values as well:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7450 #, no-wrap msgid "" "\n" "$ svnlook --verbose proplist /var/svn/repos /trunk/README\n" " original-author : harry\n" " svn:mime-type : text/plain\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7467 #, fuzzy #| msgid "svnlook" msgid "svnlook tree" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7468 msgid "Print the tree." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7472 #, no-wrap msgid "svnlook tree REPOS_PATH [PATH_IN_REPOS]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7476 msgid "" "Print the tree, starting at <replaceable>PATH_IN_REPOS</replaceable> (if " "supplied; at the root of the tree otherwise), optionally showing node " "revision IDs." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7485 #, no-wrap msgid "" "\n" "--full-paths\n" "--non-recursive (-N)\n" "--revision (-r) REV\n" "--show-ids\n" "--transaction (-t) TXN\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7497 msgid "" "This shows the tree output (with nodeIDs) for revision 13 in our sample " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7500 #, no-wrap msgid "" "\n" "$ svnlook tree -r 13 /var/svn/repos --show-ids\n" "/ <0.0.r13/811>\n" " trunk/ <1.0.r9/551>\n" " button.c <2.0.r9/238>\n" " Makefile <3.0.r7/41>\n" " integer.c <4.0.r6/98>\n" " branches/ <5.0.r13/593>\n" " bookstore/ <1.1.r13/390>\n" " button.c <2.1.r12/85>\n" " Makefile <3.0.r7/41>\n" " integer.c <4.1.r13/109>\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7526 #, fuzzy #| msgid "svnlook" msgid "svnlook uuid" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7527 msgid "Print the repository's <literal>UUID</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7532 #, no-wrap msgid "svnlook uuid REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7537 msgid "" "Print the <literal>UUID</literal> for the repository. The <literal>UUID</" "literal> is the repository's <emphasis>u</emphasis>niversal <emphasis>u</" "emphasis>nique <emphasis>id</emphasis>entifier. The Subversion client uses " "this identifier to differentiate between one repository and another." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7553 #, no-wrap msgid "" "\n" "$ svnlook uuid /var/svn/repos\n" "e7fe1b91-8cd5-0310-98dd-2f12e793c5e8\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7570 #, fuzzy #| msgid "svnlook" msgid "svnlook youngest" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7571 msgid "Print the youngest revision number." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7575 #, no-wrap msgid "svnlook youngest REPOS_PATH" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7580 msgid "Print the youngest revision number of a repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7591 msgid "This shows the youngest revision of our sample repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7594 #, no-wrap msgid "" "\n" "$ svnlook youngest /var/svn/repos/ \n" "42\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:7612 msgid "" "<command>svnsync</command> is the Subversion remote repository mirroring " "tool. Put simply, it allows you to replay the revisions of one repository " "into another one." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:7616 msgid "" "In any mirroring scenario, there are two repositories: the source " "repository, and the mirror (or <quote>sink</quote>) repository. The source " "repository is the repository from which <command>svnsync</command> pulls " "revisions. The mirror repository is the destination for the revisions " "pulled from the source repository. Each of the repositories may be local or " "remote—they are only ever addressed by their URLs." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:7624 msgid "" "The <command>svnsync</command> process requires only read access to the " "source repository; it never attempts to modify it. But obviously, " "<command>svnsync</command> requires both read and write access to the mirror " "repository." msgstr "" # type: Content of: <chapter><sect1><warning><para> #: ../en/book/ch09-reference.xml:7630 msgid "" "<command>svnsync</command> is very sensitive to changes made in the mirror " "repository that weren't made as part of a mirroring operation. To prevent " "this from happening, it's best if the <command>svnsync</command> process is " "the only process permitted to modify the mirror repository." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7639 #, fuzzy #| msgid "svnsync" msgid "svnsync Options" msgstr "svnsync" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:7641 msgid "" "Options in <command>svnsync</command> are global, just as they are in " "<command>svn</command> and <command>svnadmin</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7670 msgid "" "In the case of an authentication failure or insufficient credentials, " "prevents prompting for credentials (e.g., username or password). This is " "useful if you're running Subversion inside an automated script and it's more " "appropriate to have Subversion fail than to prompt for more information." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7688 msgid "<option>--source-password</option> <replaceable>PASSWD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7691 msgid "" "Specifies the password for the Subversion server from which you are " "syncing. If not provided, or if incorrect, Subversion will prompt you for " "this information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7699 msgid "<option>--source-username</option> <replaceable>NAME</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7702 msgid "" "Specifies the username for the Subversion server from which you are " "syncing. If not provided, or if incorrect, Subversion will prompt you for " "this information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7710 msgid "<option>--sync-password</option> <replaceable>PASSWD</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7713 msgid "" "Specifies the password for the Subversion server to which you are syncing. " "If not provided, or if incorrect, Subversion will prompt you for this " "information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7721 msgid "<option>--sync-username</option> <replaceable>NAME</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:7724 msgid "" "Specifies the username for the Subversion server to which you are syncing. " "If not provided, or if incorrect, Subversion will prompt you for this " "information as needed." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:7737 msgid "svnsync Subcommands" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:7739 msgid "" "Here are the various subcommands for the <command>svnsync</command> program." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:7751 msgid "svnsync copy-revprops" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7752 msgid "" "Copy all revision properties for a particular revision (or range of " "revisions) from the source repository to the mirror repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7758 #, no-wrap msgid "svnsync copy-revprops DEST_URL [REV[:REV2]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7763 msgid "" "Because Subversion revision properties can be changed at any time, it's " "possible that the properties for some revision might be changed after that " "revision has already been synchronized to another repository. Because the " "<command>svnsync synchronize</command> command operates only on the range of " "revisions that have not yet been synchronized, it won't notice a revision " "property change outside that range. Left as is, this causes a deviation in " "the values of that revision's properties between the source and mirror " "repositories. <command>svnsync copy-revprops</command> is the answer to " "this problem. Use it to resynchronize the revision properties for a " "particular revision or range of revisions." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:7779 ../en/book/ch09-reference.xml:7841 #: ../en/book/ch09-reference.xml:7884 ../en/book/ch09-reference.xml:7967 msgid "Alternate name" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7786 ../en/book/ch09-reference.xml:7891 #: ../en/book/ch09-reference.xml:7974 #, no-wrap msgid "" "\n" "--config-dir DIR\n" "--no-auth-cache\n" "--non-interactive\n" "--quiet (-q)\n" "--source-password ARG\n" "--source-username ARG\n" "--sync-password ARG\n" "--sync-username ARG\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7801 msgid "Resynchronize revision properties for a single revision:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7803 #, no-wrap msgid "" "\n" "$ svnsync copy-revprops file:///var/svn/repos-mirror 6\n" "Copied properties for revision 6.\n" "$\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:7821 ../en/book/ch09-reference.xml:7826 #, fuzzy, no-wrap #| msgid "svnsync" msgid "svnsync help" msgstr "svnsync" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7831 msgid "" "This subcommand is useful when you're trapped in a foreign prison with " "neither a Net connection nor a copy of this book, but you do have a local Wi-" "Fi network running and you'd like to sync a copy of your repository over to " "the backup server that Ira The Knife is running over in cell block D." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:7861 msgid "svnsync initialize" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7862 msgid "" "Initialize a mirror repository for synchronization from the source " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7867 #, no-wrap msgid "svnsync initialize MIRROR_URL SOURCE_URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7872 msgid "" "<command>svnsync initialize</command> verifies that a repository meets the " "requirements of a new mirror repository—that it has no previous " "existing version history and that it allows revision property " "modifications—and records the initial administrative information that " "associates the mirror repository with the source repository. This is the " "first <command>svnsync</command> operation you run on a would-be mirror " "repository." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:7885 #, fuzzy #| msgid "<command>svn commit</command>" msgid "<command>init</command>" msgstr "<command>svn commit</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7906 msgid "" "Fail to initialize a mirror repository due to inability to modify revision " "properties:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7909 #, no-wrap msgid "" "\n" "$ svnsync initialize file:///var/svn/repos-mirror http://svn.example.com/repos\n" "svnsync: Repository has not been enabled to accept revision propchanges;\n" "ask the administrator to create a pre-revprop-change hook\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7916 msgid "" "Initialize a repository as a mirror, having already created a <literal>pre-" "revprop-change</literal> hook that permits all revision property changes:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7920 #, no-wrap msgid "" "\n" "$ svnsync initialize file:///var/svn/repos-mirror http://svn.example.com/repos\n" "Copied properties for revision 0.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:7938 msgid "svnsync synchronize" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:7939 msgid "" "Transfer all pending revisions from the source repository to the mirror " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:7944 #, no-wrap msgid "svnsync synchronize DEST_URL" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7949 msgid "" "The <command>svnsync synchronize</command> command does all the heavy " "lifting of a repository mirroring operation. After consulting with the " "mirror repository to see which revisions have already been copied into it, " "it then begins to copy any not-yet-mirrored revisions from the source " "repository." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7956 msgid "" "<command>svnsync synchronize</command> can be gracefully canceled and " "restarted." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7959 msgid "" "As of Subversion 1.5, you can limit <command>svnsync</command> to a " "subdirectory of the source repository by specifying the subdirectory as part " "of the <replaceable>SOURCE_URL</replaceable>." msgstr "" # type: Content of: <chapter><sect1><orderedlist><listitem><itemizedlist><listitem><para> #: ../en/book/ch09-reference.xml:7968 #, fuzzy #| msgid "<command>svn copy</command>" msgid "<command>sync</command>" msgstr "<command>svn copy</command>" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:7989 msgid "" "Copy unsynchronized revisions from the source repository to the mirror " "repository:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:7992 #, no-wrap msgid "" "\n" "$ svnsync synchronize file:///var/svn/repos-mirror\n" "Committed revision 1.\n" "Copied properties for revision 1.\n" "Committed revision 2.\n" "Copied properties for revision 2.\n" "Committed revision 3.\n" "Copied properties for revision 3.\n" "…\n" "Committed revision 45.\n" "Copied properties for revision 45.\n" "Committed revision 46.\n" "Copied properties for revision 46.\n" "Committed revision 47.\n" "Copied properties for revision 47.\n" "$\n" msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:8024 msgid "" "<command>svnserve</command> allows access to Subversion repositories using " "Subversion's custom network protocol." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:8027 msgid "" "You can run <command>svnserve</command> as a standalone server process (for " "clients that are using the <literal>svn://</literal> access method); you can " "have a daemon such as <command>inetd</command> or <command>xinetd</command> " "launch it for you on demand (also for <literal>svn://</literal>), or you can " "have <command>sshd</command> launch it on demand for the <literal>svn+ssh://" "</literal> access method." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:8036 msgid "" "Regardless of the access method, once the client has selected a repository " "by transmitting its URL, <command>svnserve</command> reads a file named " "<filename>conf/svnserve.conf</filename> in the repository directory to " "determine repository-specific settings such as what authentication database " "to use and what authorization policies to apply. See <xref linkend=\"svn." "serverconfig.svnserve\"/> for details of the <filename>svnserve.conf</" "filename> file." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8048 #, fuzzy #| msgid "svnserve" msgid "svnserve Options" msgstr "svnserve" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:8050 msgid "" "Unlike the previous commands we've described, <command>svnserve</command> " "has no subcommands—it is controlled exclusively by options." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8058 msgid "<option>--daemon</option> (<option>-d</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8060 msgid "" "Causes <command>svnserve</command> to run in daemon mode. " "<command>svnserve</command> backgrounds itself and accepts and serves TCP/IP " "connections on the <literal>svn</literal> port (3690, by default)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8069 msgid "<option>--foreground</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8071 msgid "" "When used together with <option>-d</option>, causes <command>svnserve</" "command> to stay in the foreground. This is mainly useful for debugging." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8078 msgid "<option>--inetd</option> (<option>-i</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8080 msgid "" "Causes <command>svnserve</command> to use the <filename>stdin</filename> and " "<filename>stdout</filename> file descriptors, as is appropriate for a daemon " "running out of <command>inetd</command>." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8087 ../en/book/ch09-reference.xml:8525 msgid "<option>--help</option> (<option>-h</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8089 msgid "Displays a usage summary and exits." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8094 msgid "<option>--listen-host</option>=<replaceable>HOST</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8096 msgid "" "Causes <command>svnserve</command> to listen on the interface specified by " "<replaceable>HOST</replaceable>, which may be either a hostname or an IP " "address." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8103 msgid "<option>--listen-once</option> (<option>-X</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8105 msgid "" "Causes <command>svnserve</command> to accept one connection on the " "<literal>svn</literal> port, serve it, and exit. This option is mainly " "useful for debugging." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8113 msgid "<option>--listen-port</option>=<replaceable>PORT</replaceable>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8115 msgid "" "Causes <command>svnserve</command> to listen on <replaceable>PORT</" "replaceable> when run in daemon mode. (FreeBSD daemons listen only on tcp6 " "by default—this option tells them to also listen on tcp4.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8123 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "<option>--pid-file <replaceable>FILENAME</replaceable></option>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8125 msgid "" "Causes <command>svnserve</command> to write its process ID to " "<replaceable>FILENAME</replaceable>, which must be writable by the user " "under which <command>svnserve</command> is running." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8133 msgid "" "<option>--root</option>=<replaceable>ROOT</replaceable> (<option>-r</" "option>=<replaceable>ROOT</replaceable>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8136 msgid "" "Sets the virtual root for repositories served by <command>svnserve</" "command>. The pathname in URLs provided by the client will be interpreted " "relative to this root and will not be allowed to escape this root." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8145 msgid "<option>--threads</option> (<option>-T</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8147 msgid "" "When running in daemon mode, causes <command>svnserve</command> to spawn a " "thread instead of a process for each connection (e.g., for when running on " "Windows). The <command>svnserve</command> process still backgrounds itself " "at startup time." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8156 msgid "<option>--tunnel</option> (<option>-t</option>)" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8158 msgid "" "Causes <command>svnserve</command> to run in tunnel mode, which is just like " "the <command>inetd</command> mode of operation (both modes serve one " "connection over <filename>stdin</filename>/<filename>stdout</filename>, and " "then exit), except that the connection is considered to be preauthenticated " "with the username of the current UID. This flag is automatically passed for " "you by the client when running over a tunnel agent such as <command>ssh</" "command>. That means there's rarely any need for <emphasis>you</emphasis> " "to pass this option to <command>svnserve</command>. So, if you find " "yourself typing <literal>svnserve --tunnel</literal> on the command line and " "wondering what to do next, see <xref linkend=\"svn.serverconfig.svnserve." "sshauth\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8177 msgid "<option>--tunnel-user NAME</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8179 msgid "" "Used in conjunction with the <option>--tunnel</option> option, tells " "<command>svnserve</command> to assume that <replaceable>NAME</replaceable> " "is the authenticated user, rather than the UID of the <command>svnserve</" "command> process. This is useful for users wishing to share a single system " "account over SSH, but to maintain separate commit identities." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8192 msgid "" "Displays version information and a list of repository backend modules " "available, and then exits." msgstr "" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:8209 msgid "" "<command>svndumpfilter</command> is a command-line utility for removing " "history from a Subversion dump file by either excluding or including paths " "beginning with one or more named prefixes. For details, see <xref linkend=" "\"svn.reposadmin.maint.tk.svndumpfilter\"/>." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8217 #, fuzzy #| msgid "svndumpfilter" msgid "svndumpfilter Options" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:8219 msgid "" "Options in <command>svndumpfilter</command> are global, just as they are in " "<command>svn</command> and <command>svnadmin</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8228 msgid "" "If filtering causes any revision to be empty (i.e., causes no change to the " "repository), removes these revisions from the final dump file." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8237 msgid "Renumbers revisions that remain after filtering." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8243 msgid "<option>--skip-missing-merge-sources</option>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8245 msgid "" "Skips merge sources that have been removed as part of the filtering. " "Without this option, <command>svndumpfilter</command> will exit with an " "error if the merge source for a retained path is removed by filtering." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8256 msgid "" "If all nodes in a revision are removed by filtering and <option>--drop-empty-" "revs</option> is not passed, the default behavior of <command>svndumpfilter</" "command> is to remove all revision properties except for the date and the " "log message (which will merely indicate that the revision is empty). " "Passing ths option will preserve existing revision properties (which may or " "may not make sense since the related content is no longer present in the " "dump file)." msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8271 msgid "Does not display filtering statistics." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8281 #, fuzzy #| msgid "svndumpfilter" msgid "svndumpfilter Subcommands" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:8283 msgid "" "Here are the various subcommands for the <command>svndumpfilter</command> " "program." msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8295 #, fuzzy #| msgid "svndumpfilter" msgid "svndumpfilter exclude" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:8296 msgid "Filter out nodes with given prefixes from the dump stream." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:8300 #, no-wrap msgid "svndumpfilter exclude PATH_PREFIX..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8305 msgid "" "This can be used to exclude nodes that begin with one or more " "<replaceable>PATH_PREFIX</replaceable>es from a filtered dump file." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8313 ../en/book/ch09-reference.xml:8377 #, no-wrap msgid "" "\n" "--drop-empty-revs\n" "--preserve-revprops\n" "--quiet\n" "--renumber-revs\n" "--skip-missing-merge-sources\n" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8325 msgid "" "If we have a dump file from a repository with a number of different picnic-" "related directories in it, but we want to keep everything <emphasis>except</" "emphasis> the <filename>sandwiches</filename> part of the repository, we'll " "exclude only that path:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8331 #, no-wrap msgid "" "\n" "$ svndumpfilter exclude sandwiches < dumpfile > filtered-dumpfile\n" "Excluding prefixes:\n" " '/sandwiches'\n" "\n" "Revision 0 committed as 0.\n" "Revision 1 committed as 1.\n" "Revision 2 committed as 2.\n" "Revision 3 committed as 3.\n" "Revision 4 committed as 4.\n" "\n" "Dropped 1 node(s):\n" " '/sandwiches'\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8358 #, fuzzy #| msgid "svndumpfilter" msgid "svndumpfilter include" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><sect2><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:8359 msgid "Filter out nodes without given prefixes from dump stream." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:8364 #, no-wrap msgid "svndumpfilter include PATH_PREFIX..." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8369 msgid "" "Can be used to include nodes that begin with one or more " "<replaceable>PATH_PREFIX</replaceable>es in a filtered dump file (thus " "excluding all other paths)." msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8389 msgid "" "If we have a dump file from a repository with a number of different picnic-" "related directories in it, but want to keep only the <filename>sandwiches</" "filename> part of the repository, we'll include only that path:" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8394 #, no-wrap msgid "" "\n" "$ svndumpfilter include sandwiches < dumpfile > filtered-dumpfile\n" "Including prefixes:\n" " '/sandwiches'\n" "\n" "Revision 0 committed as 0.\n" "Revision 1 committed as 1.\n" "Revision 2 committed as 2.\n" "Revision 3 committed as 3.\n" "Revision 4 committed as 4.\n" "\n" "Dropped 3 node(s):\n" " '/drinks'\n" " '/snacks'\n" " '/supplies'\n" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8423 #, fuzzy #| msgid "svndumpfilter" msgid "svndumpfilter help" msgstr "svndumpfilter" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:8424 #, fuzzy #| msgid "Help!" msgid "Help!." msgstr "Hilfe!" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:8428 #, no-wrap msgid "svndumpfilter help [SUBCOMMAND...]" msgstr "" # type: Content of: <chapter><sect1><sect2><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8433 msgid "" "Displays the help message for <command>svndumpfilter</command>. Unlike " "other help commands documented in this chapter, there is no witty commentary " "for this help command. The authors of this book deeply regret the omission." msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:8465 msgid "Summarize the local revision(s) of a working copy." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><programlisting> #: ../en/book/ch09-reference.xml:8471 #, no-wrap msgid "svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8477 msgid "" "<command>svnversion</command> is a program for summarizing the revision " "mixture of a working copy. The resultant revision number, or revision " "range, is written to standard output." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8482 msgid "" "It's common to use this output in your build process when defining the " "version number of your program." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8485 msgid "" "<replaceable>TRAIL_URL</replaceable>, if present, is the trailing portion of " "the URL used to determine whether <replaceable>WC_PATH</replaceable> itself " "is switched (detection of switches within <replaceable>WC_PATH</replaceable> " "does not rely on <replaceable>TRAIL_URL</replaceable>)." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8492 msgid "" "When <replaceable>WC_PATH</replaceable> is not defined, the current " "directory will be used as the working copy path. <replaceable>TRAIL_URL</" "replaceable> cannot be defined if <replaceable>WC_PATH</replaceable> is not " "explicitly given." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8503 msgid "" "Like <command>svnserve</command>, <command>svnversion</command> has no " "subcommands—only options:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8510 msgid "<option>--no-newline</option> (<option>-n</option>)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8512 msgid "Omits the usual trailing newline from the output." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8517 msgid "<option>--committed</option> (<option>-c</option>)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8519 msgid "" "Uses the last-changed revisions rather than the current (i.e., highest " "locally available) revisions." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8527 msgid "Prints a help summary." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8534 msgid "" "Prints the version of <command>svnversion</command> and exit with no error." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8545 msgid "" "If the working copy is all at the same revision (e.g., immediately after an " "update), then that revision is printed out:" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8549 #, fuzzy, no-wrap #| msgid "svnversion" msgid "" "\n" "$ svnversion\n" "4168\n" msgstr "svnversion" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8554 msgid "" "You can add <replaceable>TRAIL_URL</replaceable> to make sure the working " "copy is not switched from what you expect. Note that the " "<replaceable>WC_PATH</replaceable> is required in this command:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8559 #, no-wrap msgid "" "\n" "$ svnversion . /var/svn/trunk\n" "4168\n" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8564 msgid "" "For a mixed-revision working copy, the range of revisions present is printed:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8567 #, no-wrap msgid "" "\n" "$ svnversion\n" "4123:4168\n" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8572 msgid "If the working copy contains modifications, a trailing \"M\" is added:" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8575 #, fuzzy, no-wrap #| msgid "svnversion" msgid "" "\n" "$ svnversion\n" "4168M\n" msgstr "svnversion" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8580 msgid "If the working copy is switched, a trailing \"S\" is added:" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8583 #, fuzzy, no-wrap #| msgid "svnversion" msgid "" "\n" "$ svnversion\n" "4168S\n" msgstr "svnversion" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8588 msgid "" "Thus, here is a mixed-revision, switched working copy containing some local " "modifications:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><screen> #: ../en/book/ch09-reference.xml:8591 #, no-wrap msgid "" "\n" "$ svnversion\n" "4212:4168MS\n" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8596 msgid "" "If invoked on a directory that is not a working copy, <command>svnversion</" "command> assumes it is an exported working copy and prints \"exported\":" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8600 #, fuzzy, no-wrap #| msgid "svnversion" msgid "" "\n" "$ svnversion\n" "exported\n" msgstr "svnversion" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:8620 msgid "mod_dav_svn Configuration Directives" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:8621 msgid "" "Apache configuration directives for serving Subversion repositories through " "the Apache HTTP Server." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8630 msgid "" "This section briefly describes each Subversion Apache configuration " "directive. For an in-depth description of configuring Apache with " "Subversion, see <xref linkend=\"svn.serverconfig.httpd\"/>.)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:8638 ../en/book/ch09-reference.xml:9032 msgid "Directives" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8640 msgid "" "These are the <filename>httpd.conf</filename> directives that apply to " "<command>mod_dav_svn</command>:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8646 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>DAV svn</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8649 msgid "" "Must be included in any <literal>Directory</literal> or <literal>Location</" "literal> block for a Subversion repository. It tells <command>httpd</" "command> to use the Subversion backend for <literal>mod_dav</literal> to " "handle all requests." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8660 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>SVNAllowBulkUpdates On|Off</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8663 msgid "" "Toggles support for all-inclusive responses to update-style <literal>REPORT</" "literal> requests. Subversion clients use <literal>REPORT</literal> " "requests to get information about directory tree checkouts and updates from " "<command>mod_dav_svn</command>. They can ask the server to send that " "information in one of two ways: with the entirety of the tree's information " "in one massive response, or with a <firstterm>skelta</firstterm> (a skeletal " "representation of a tree delta) which contains just enough information for " "the client to know what <emphasis>additional</emphasis> data to request from " "the server. When this directive is included with a value of <literal>Off</" "literal>, <command>mod_dav_svn</command> will only ever respond to these " "<literal>REPORT</literal> requests with skelta responses, regardless of the " "type of responses requested by the client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8683 msgid "" "Most folks won't need to use this directive at all. It primarily exists for " "administrators who wish—for security or auditing reasons—to " "force Subversion clients to fetch individually all the files and directories " "needed for updates and checkouts, thus leaving an audit trail of " "<literal>GET</literal> and <literal>PROPFIND</literal> requests in Apache's " "logs. The default value of this directive is <literal>On</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8696 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>SVNAutoversioning On|Off</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8699 msgid "" "When its value is <literal>On</literal>, allows write requests from WebDAV " "clients to result in automatic commits. A generic log message is auto-" "generated and attached to each revision. If you enable autoversioning, " "you'll likely want to set <literal>ModMimeUsePathInfo On</literal> so that " "<literal>mod_mime</literal> can set <literal>svn:mime-type</literal> to the " "correct MIME type automatically (as best as <literal>mod_mime</literal> is " "able to, of course). For more information, see <xref linkend=\"svn.webdav\"/" ">. The default value of this directive is <literal>Off</literal>." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8717 msgid "<literal>SVNPath <replaceable>directory-path</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8721 msgid "" "Specifies the location in the filesystem for a Subversion repository's " "files. In a configuration block for a Subversion repository, either this " "directive or <literal>SVNParentPath</literal> must be present, but not both." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8732 msgid "<literal>SVNSpecialURI <replaceable>component</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8736 msgid "" "Specifies the URI component (namespace) for special Subversion resources. " "The default is <literal>!svn</literal>, and most administrators will never " "use this directive. Set this only if there is a pressing need to have a " "file named <filename>!svn</filename> in your repository. If you change this " "on a server already in use, it will break all of the outstanding working " "copies, and your users will hunt you down with pitchforks and flaming " "torches." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8751 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "<literal>SVNReposName <replaceable>name</replaceable></literal>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8755 msgid "" "Specifies the name of a Subversion repository for use in <literal>HTTP GET</" "literal> responses. This value will be prepended to the title of all " "directory listings (which are served when you navigate to a Subversion " "repository with a web browser). This directive is optional." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8766 msgid "" "<literal>SVNIndexXSLT <replaceable>directory-path</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8770 msgid "" "Specifies the URI of an XSL transformation for directory indexes. This " "directive is optional." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8777 msgid "" "<literal>SVNParentPath <replaceable>directory-path</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8781 msgid "" "Specifies the location in the filesystem of a parent directory whose child " "directories are Subversion repositories. In a configuration block for a " "Subversion repository, either this directive or <literal>SVNPath</literal> " "must be present, but not both." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8792 msgid "<literal>SVNPathAuthz On|Off|short_circuit</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8795 msgid "" "Controls path-based authorization by enabling subrequests (<literal>On</" "literal>), disabling subrequests (<literal>Off</literal>; see <xref linkend=" "\"svn.serverconfig.httpd.authz.pathauthzoff\"/>), or querying " "<command>mod_authz_svn</command> directly (<literal>short_circuit</" "literal>). The default value of this directive is <literal>On</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8807 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>SVNListParentPath On|Off</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8810 msgid "" "When set to <literal>On</literal>, allows a <literal>GET</literal> of " "<literal>SVNParentPath</literal>, which results in a listing of all " "repositories under that path. The default setting is <literal>Off</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sect3><itemizedlist><listitem><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8821 #, fuzzy #| msgid "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" msgid "<literal>SVNMasterURI <replaceable>url</replaceable></literal>" msgstr "<filename>filename.r<replaceable>OLDREV</replaceable> </filename>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8825 msgid "" "Specifies a URI to the master Subversion repository (used for a write-" "through proxy)." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8832 msgid "" "<literal>SVNActivitiesDB <replaceable>directory-path</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8836 msgid "" "Specifies the location in the filesystem where the activities database " "should be stored. By default, <command>mod_dav_svn</command> creates and " "uses a directory in the repository called <filename>dav/activities.d</" "filename>. The path specified with this option must be an absolute path." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8844 msgid "" "If specified for an <literal>SVNParentPath</literal> area, " "<command>mod_dav_svn</command> appends the basename of the repository to the " "path specified here. For example:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><screen> #: ../en/book/ch09-reference.xml:8849 #, no-wrap msgid "" "\n" "<Location /svn>\n" " DAV svn\n" "\n" " # any \"/svn/foo\" URL will map to a repository in \n" " # /net/svn.nfs/repositories/foo\n" " SVNParentPath \"/net/svn.nfs/repositories\"\n" "\n" " # any \"/svn/foo\" URL will map to an activities db in\n" " # /var/db/svn/activities/foo\n" " SVNActivitiesDB \"/var/db/svn/activities\"\n" "</Location>\n" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:8870 msgid "High-level logging" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:8872 msgid "" "This is a list of Subversion action log messages produced by Apache's high-" "level logging mechanism, followed by an example of the log message. See " "<xref linkend=\"svn.serverconfig.httpd.extra.logging\"/> for details on " "logging." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8881 msgid "Checkout or export" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8883 msgid "<literal>checkout-or-export /path r62 depth=infinity</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8889 msgid "Commit" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8891 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>commit harry r100</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8896 msgid "Diffs" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8898 msgid "<literal>diff /path r15:20 depth=infinity ignore-ancestry</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8899 msgid "" "<literal>diff /path1@15 /path2@20 depth=infinity ignore-ancestry</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8904 msgid "Fetch a directory" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8906 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>get-dir /trunk r17 text</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8911 msgid "Fetch a file" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8913 #, fuzzy #| msgid "<literal>file:///</literal>" msgid "<literal>get-file /path r20 props</literal>" msgstr "<literal>file:///</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8918 msgid "Fetch a file revision" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8920 msgid "<literal>get-file-revs /path r12:15 include-merged-revisions</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8925 msgid "Fetch merge information" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8927 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>get-mergeinfo (/path1 /path2)</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8932 msgid "Lock" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8934 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>lock /path steal</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8939 msgid "Log" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8941 msgid "" "<literal>log (/path1,/path2,/path3) r20:90 discover-changed-paths revprops=()" "</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8947 msgid "Replay revisions (svnsync)" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8949 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>replay /path r19</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8954 msgid "Revision property change" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8956 msgid "<literal>change-rev-prop r50 propertyname</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8962 msgid "Revision property list" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8964 #, fuzzy #| msgid "<literal>https://</literal>" msgid "<literal>rev-proplist r34</literal>" msgstr "<literal>https://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8971 msgid "<literal>status /path r62 depth=infinity</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8977 msgid "Switch" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8979 msgid "<literal>switch /pathA /pathB@50 depth=infinity</literal>" msgstr "" # type: Content of: <preface><sect1><sect2><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:8984 #, fuzzy #| msgid "svnlook" msgid "Unlock" msgstr "svnlook" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:8986 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>unlock /path break</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:8993 msgid "<literal>update /path r17 send-copyfrom-args</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9014 msgid "mod_authz_svn Configuration Directives" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9015 msgid "" "Apache configuration directives for configuring path-based authorization for " "Subversion repositories served through the Apache HTTP Server." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9024 msgid "" "This section briefly describes each Apache configuration directive offered " "by <command>mod_authz_svn</command>. For an in-depth description of using " "path-based authorization in Subversion, see <xref linkend=\"svn.serverconfig." "pathbasedauthz\"/>.)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9034 msgid "" "These are the <filename>httpd.conf</filename> directives that apply to " "<command>mod_authz_svn</command>:" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:9040 msgid "" "<literal>AuthzSVNAccessFile <replaceable>file-path</replaceable></literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9044 msgid "" "Consult <replaceable>file-path</replaceable> for access rules describing the " "permissions for paths in Subversion repository." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9052 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>AuthzSVNAnonymous On|Off</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9055 msgid "" "Set to <literal>Off</literal> to disable two special-case behaviours of this " "module: interaction with the <literal>Satisfy Any</literal> directive and " "enforcement of the authorization policy even when no <literal>Require</" "literal> directives are present. The default value of this directive is " "<literal>On</literal>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9067 #, fuzzy #| msgid "<literal>http://</literal>" msgid "<literal>AuthzSVNAuthoritative On|Off</literal>" msgstr "<literal>http://</literal>" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9070 msgid "" "Set to <literal>Off</literal> to allow access control to be passed along to " "lower modules. The default value of this directive is <literal>On</literal>." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><term> #: ../en/book/ch09-reference.xml:9079 msgid "<literal>AuthzSVNNoAuthWhenAnonymousAllowed On|Off</literal>" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9082 msgid "" "Set to <literal>On</literal> to suppress authentication and authorization " "for requests which anonymous users are allowed to perform. The default " "value of this directive is <literal>On</literal>." msgstr "" # type: Content of: <preface><sect1><sect2><title> #: ../en/book/ch09-reference.xml:9102 #, fuzzy #| msgid "Subversion's Components" msgid "Subversion Properties" msgstr "Die Komponenten von Subversion" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:9104 msgid "" "Subversion allows users to invent arbitrarily named versioned properties on " "files and directories, as well as unversioned properties on revisions. The " "only restriction is on properties whose names begin with <literal>svn:</" "literal> (those are reserved for Subversion's own use). While these " "properties may be set by users to control Subversion's behavior, users may " "not invent new <literal>svn:</literal> properties." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:9113 msgid "Versioned Properties" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:9115 msgid "" "These are the versioned properties that Subversion reserves for its own use:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9121 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:executable</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9124 msgid "" "If present on a file, the client will make the file executable in Unix-" "hosted working copies. See <xref linkend=\"svn.advanced.props.special." "executable\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9133 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:mime-type</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9136 msgid "" "If present on a file, the value indicates the file's MIME type. This allows " "the client to decide whether line-based contextual merging is safe to " "perform during updates, and can also affect how the file behaves when " "fetched via a web browser. See <xref linkend=\"svn.advanced.props.special." "mime-type\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9148 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:ignore</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9151 msgid "" "If present on a directory, the value is a list of <emphasis>unversioned</" "emphasis> file patterns to be ignored by <command>svn status</command> and " "other subcommands. See <xref linkend=\"svn.advanced.props.special.ignore\"/" ">." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9162 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:keywords</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9165 msgid "" "If present on a file, the value tells the client how to expand particular " "keywords within the file. See <xref linkend=\"svn.advanced.props.special." "keywords\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9175 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:eol-style</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9178 msgid "" "If present on a file, the value tells the client how to manipulate the " "file's line-endings in the working copy and in exported trees. See <xref " "linkend=\"svn.advanced.props.special.eol-style\"/> and <xref linkend=\"svn." "ref.svn.c.export\" /> earlier in this chapter." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9188 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:externals</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9191 msgid "" "If present on a directory, the value is a multiline list of other paths and " "URLs the client should check out. See <xref linkend=\"svn.advanced.externals" "\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9200 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:special</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote> #: ../en/book/ch09-reference.xml:9203 msgid "" "If present on a file, indicates that the file is not an ordinary file, but a " "symbolic link or other special object. <footnote>" msgstr "" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote><para> #: ../en/book/ch09-reference.xml:9207 msgid "" "As of this writing, symbolic links are indeed the only <quote>special</" "quote> objects. But there might be more in future releases of Subversion." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9218 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:needs-lock</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9221 msgid "" "If present on a file, tells the client to make the file read-only in the " "working copy, as a reminder that the file should be locked before editing " "begins. See <xref linkend=\"svn.advanced.locking.lock-communication\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9231 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:mergeinfo</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9234 msgid "" "Used by Subversion to track merge data. See <xref linkend=\"svn.branchmerge." "basicmerging.mergeinfo\"/> for details, but you should never edit this " "property unless you <emphasis>really</emphasis> know what you're doing." msgstr "" # type: Content of: <chapter><sect1><sect2><title> #: ../en/book/ch09-reference.xml:9247 msgid "Unversioned Properties" msgstr "" # type: Content of: <chapter><sect1><sect2><para> #: ../en/book/ch09-reference.xml:9249 msgid "" "These are the unversioned properties tht Subversion reserves for its own use:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9255 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:author</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9258 msgid "" "If present, contains the authenticated username of the person who created " "the revision. (If not present, the revision was committed anonymously.)" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9266 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:date</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9269 msgid "" "Contains the UTC time the revision was created, in ISO 8601 format. The " "value comes from the <emphasis>server</emphasis> machine's clock, not the " "client's." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9278 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:log</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9281 msgid "Contains the log message describing the revision." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><tbody><row><entry> #: ../en/book/ch09-reference.xml:9288 #, fuzzy #| msgid "<literal>svn://</literal>" msgid "<literal>svn:autoversioned</literal>" msgstr "<literal>svn://</literal>" # type: Content of: <chapter><sect1><sect2><variablelist><varlistentry><listitem><para> #: ../en/book/ch09-reference.xml:9291 msgid "" "If present, the revision was created via the autoversioning feature. See " "<xref linkend=\"svn.webdav.autoversioning\"/>." msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch09-reference.xml:9308 #, fuzzy #| msgid "Repository URLs" msgid "Repository Hooks" msgstr "Repository URLs" # type: Content of: <chapter><sect1><para> #: ../en/book/ch09-reference.xml:9310 msgid "These are the repository hooks that Subversion provides:" msgstr "" # type: Content of: <chapter><sect1><title> #: ../en/book/ch09-reference.xml:9316 ../en/book/ch09-reference.xml:9379 #: ../en/book/ch09-reference.xml:9434 ../en/book/ch09-reference.xml:9490 #: ../en/book/ch09-reference.xml:9562 ../en/book/ch09-reference.xml:9637 #: ../en/book/ch09-reference.xml:9696 ../en/book/ch09-reference.xml:9754 #: ../en/book/ch09-reference.xml:9814 #, fuzzy #| msgid "The Repository" msgid "repository" msgstr "Das Repository" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9322 msgid "start-commit" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9323 msgid "Notification of the beginning of a commit." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9329 msgid "" "The start-commit hook is run before the commit transaction is even created. " "It is typically used to decide whether the user has commit privileges at all." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9333 msgid "" "If the start-commit hook program returns a nonzero exit value, the commit is " "stopped before the commit transaction is even created, and anything printed " "to <filename>stderr</filename> is marshalled back to the client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:9341 msgid "Input Parameter(s)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9343 ../en/book/ch09-reference.xml:9410 #: ../en/book/ch09-reference.xml:9466 ../en/book/ch09-reference.xml:9522 #: ../en/book/ch09-reference.xml:9598 ../en/book/ch09-reference.xml:9668 #: ../en/book/ch09-reference.xml:9725 ../en/book/ch09-reference.xml:9786 #: ../en/book/ch09-reference.xml:9843 msgid "The command-line arguments passed to the hook program, in order, are:" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><title> #: ../en/book/ch09-reference.xml:9348 ../en/book/ch09-reference.xml:9415 #: ../en/book/ch09-reference.xml:9471 ../en/book/ch09-reference.xml:9527 #: ../en/book/ch09-reference.xml:9603 ../en/book/ch09-reference.xml:9673 #: ../en/book/ch09-reference.xml:9730 ../en/book/ch09-reference.xml:9791 #: ../en/book/ch09-reference.xml:9848 #, fuzzy #| msgid "Repository URLs" msgid "Repository path" msgstr "Repository URLs" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9351 msgid "Authenticated username attempting the commit" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9354 msgid "" "Colon-separated list of capabilities that a client passes to the server, " "including <literal>depth</literal>, <literal>mergeinfo</literal>, and " "<literal>log-revprops</literal> (new in Subversion 1.5)." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:9364 ../en/book/ch09-reference.xml:9424 #: ../en/book/ch09-reference.xml:9480 ../en/book/ch09-reference.xml:9552 #: ../en/book/ch09-reference.xml:9627 ../en/book/ch09-reference.xml:9686 #: ../en/book/ch09-reference.xml:9744 ../en/book/ch09-reference.xml:9804 #: ../en/book/ch09-reference.xml:9862 msgid "Common uses" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9366 msgid "Access control (e.g., temporarily lock out commits for some reason)." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9369 msgid "" "A means to allow access only from clients that have certain capabilities." msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9385 msgid "pre-commit" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9386 msgid "Notification just prior to commit completion." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9392 msgid "" "The <literal>pre-commit</literal> hook is run just before a commit " "transaction is promoted to a new revision. Typically, this hook is used to " "protect against commits that are disallowed due to content or location (e." "g., your site might require that all commits to a certain branch include a " "ticket number from the bug tracker, or that the incoming log message is " "nonempty)." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9400 msgid "" "If the <literal>pre-commit</literal> hook program returns a nonzero exit " "value, the commit is aborted, the commit transaction is removed, and " "anything printed to <filename>stderr</filename> is marshalled back to the " "client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><title> #: ../en/book/ch09-reference.xml:9408 ../en/book/ch09-reference.xml:9464 #: ../en/book/ch09-reference.xml:9520 ../en/book/ch09-reference.xml:9596 #: ../en/book/ch09-reference.xml:9666 ../en/book/ch09-reference.xml:9723 #: ../en/book/ch09-reference.xml:9784 ../en/book/ch09-reference.xml:9841 msgid "Input parameter(s)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9418 msgid "Commit transaction name" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9425 msgid "Change validation and control" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9440 msgid "post-commit" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9441 msgid "Notification of a successful commit." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9447 msgid "" "The <literal>post-commit</literal> hook is run after the transaction is " "committed and a new revision is created. Most people use this hook to send " "out descriptive emails about the commit or to notify some other tool (such " "as an issue tracker) that a commit has happened. Some configurations also " "use this hook to trigger backup processes." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9454 msgid "" "If the <literal>post-commit</literal> hook returns a nonzero exit status, " "the commit <emphasis>will not</emphasis> be aborted since it has already " "completed. However, anything that the hook printed to <filename>stderr</" "filename> will be marshalled back to the client, making it easier to " "diagnose hook failures." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9474 msgid "Revision number created by the commit" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9481 msgid "Commit notification; tool integration" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9496 msgid "pre-revprop-change" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9497 msgid "Notification of a revision property change attempt." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9504 msgid "" "The <literal>pre-revprop-change</literal> hook is run immediately prior to " "the modification of a revision property when performed outside the scope of " "a normal commit. Unlike the other hooks, the default state of this one is " "to deny the proposed action. The hook must actually exist and return a zero " "exit value before a revision property modification can happen." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9512 msgid "" "If the <literal>pre-revprop-change</literal> hook doesn't exist, isn't " "executable, or returns a nonzero exit value, no change to the property will " "be made, and anything printed to <filename>stderr</filename> is marshalled " "back to the client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9530 msgid "Revision whose property is about to be modified" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9533 msgid "Authenticated username attempting the property change" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9536 ../en/book/ch09-reference.xml:9612 msgid "Name of the property changed" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9539 ../en/book/ch09-reference.xml:9615 msgid "" "Change description: <literal>A</literal> (added), <literal>D</literal> " "(deleted), or <literal>M</literal> (modified)" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9545 msgid "" "Additionally, Subversion passes the intended new value of the property to " "the hook program via standard input." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9553 msgid "Access control; change validation and control" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9568 msgid "post-revprop-change" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9569 msgid "Notification of a successful revision property change." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9576 msgid "" "The <literal>post-revprop-change</literal> hook is run immediately after the " "modification of a revision property when performed outside the scope of a " "normal commit. As you can derive from the description of its counterpart, " "the <literal>pre-revprop-change</literal> hook, this hook will not run at " "all unless the <literal>pre-revprop-change</literal> hook is implemented. " "It is typically used to send email notification of the property change." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9586 msgid "" "If the <literal>post-revprop-change</literal> hook returns a nonzero exit " "status, the change <emphasis>will not</emphasis> be aborted since it has " "already completed. However, anything that the hook printed to " "<filename>stderr</filename> will be marshalled back to the client, making it " "easier to diagnose hook failures." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9606 msgid "Revision whose property was modified" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9609 msgid "Authenticated username of the person making the change" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9621 msgid "" "Additionally, Subversion passes to the hook program, via standard input, the " "previous value of the property." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9628 msgid "Property change notification" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9643 msgid "pre-lock" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9644 msgid "Notification of a path lock attempt." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9650 msgid "" "The <literal>pre-lock</literal> hook runs whenever someone attempts to lock " "a path. It can be used to prevent locks altogether or to create a more " "complex policy specifying exactly which users are allowed to lock particular " "paths. If the hook notices a preexisting lock, it can also decide whether a " "user is allowed to <quote>steal</quote> the existing lock." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9658 msgid "" "If the <literal>pre-lock</literal> hook program returns a nonzero exit " "value, the lock action is aborted and anything printed to <filename>stderr</" "filename> is marshalled back to the client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9676 msgid "Versioned path that is to be locked" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9679 ../en/book/ch09-reference.xml:9797 msgid "Authenticated username of the person attempting the lock" msgstr "" # type: Content of: <chapter><sect1><sect2><sidebar><table><tgroup><thead><row><entry> #: ../en/book/ch09-reference.xml:9687 ../en/book/ch09-reference.xml:9805 #, fuzzy #| msgid "Access method" msgid "Access control" msgstr "Zugriffsmethode" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9702 msgid "post-lock" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9703 msgid "Notification of a successful path lock." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9709 msgid "" "The <literal>post-lock</literal> hook runs after one or more paths have been " "locked. It is typically used to send email notification of the lock event." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9713 msgid "" "If the <literal>post-lock</literal> hook returns a nonzero exit status, the " "lock <emphasis>will not</emphasis> be aborted since it has already " "completed. However, anything that the hook printed to <filename>stderr</" "filename> will be marshalled back to the client, making it easier to " "diagnose hook failures." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9733 msgid "Authenticated username of the person who locked the paths" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9738 msgid "" "Additionally, the list of paths locked is passed to the hook program via " "standard input, one path per line." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9745 msgid "Lock notification" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9760 msgid "pre-unlock" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9761 msgid "Notification of a path unlock attempt." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9767 msgid "" "The <literal>pre-unlock</literal> hook runs whenever someone attempts to " "remove a lock on a file. It can be used to create policies that specify " "which users are allowed to unlock particular paths. It's particularly " "important for determining policies about lock breakage. If user A locks a " "file, is user B allowed to break the lock? What if the lock is more than a " "week old? These sorts of things can be decided and enforced by the hook." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9776 msgid "" "If the <literal>pre-unlock</literal> hook program returns a nonzero exit " "value, the unlock action is aborted and anything printed to " "<filename>stderr</filename> is marshalled back to the client." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9794 msgid "Versioned path which is to be locked" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refname> #: ../en/book/ch09-reference.xml:9820 msgid "post-unlock" msgstr "" # type: Content of: <chapter><sect1><refentry><refnamediv><refpurpose> #: ../en/book/ch09-reference.xml:9821 msgid "Notification of a successful path unlock." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9827 msgid "" "The <literal>post-unlock</literal> hook runs after one or more paths have " "been unlocked. It is typically used to send email notification of the " "unlock event." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9831 msgid "" "If the <literal>post-unlock</literal> hook returns a nonzero exit status, " "the unlock <emphasis>will not</emphasis> be aborted since it has already " "completed. However, anything that the hook printed to <filename>stderr</" "filename> will be marshalled back to the client, making it easier to " "diagnose hook failures." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><orderedlist><listitem><para> #: ../en/book/ch09-reference.xml:9851 msgid "Authenticated username of the person who unlocked the paths" msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9856 msgid "" "Additionally, the list of paths unlocked is passed to the hook program via " "standard input, one path per line." msgstr "" # type: Content of: <chapter><sect1><refentry><refsect1><para> #: ../en/book/ch09-reference.xml:9863 msgid "Unlock notification" msgstr "" # type: Content of: <appendix><title> #: ../en/book/copyright.xml:2 msgid "Copyright" msgstr "" # type: Content of: <appendix><programlisting> #: ../en/book/copyright.xml:4 #, no-wrap msgid "" "\n" "\n" "Copyright (c) 2002-2007\n" "Ben Collins-Sussman, Brian W. Fitzpatrick, C. Michael Pilato. \n" "\n" "This work is licensed under the Creative Commons Attribution License.\n" "To view a copy of this license, visit\n" "http://creativecommons.org/licenses/by/2.0/ or send a letter to\n" "Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305,\n" "USA.\n" "\n" "A summary of the license is given below, followed by the full legal\n" "text.\n" "\n" "--------------------------------------------------------------------\n" "\n" "You are free:\n" "\n" " * to copy, distribute, display, and perform the work\n" " * to make derivative works\n" " * to make commercial use of the work\n" "\n" "Under the following conditions:\n" "\t\n" "Attribution. You must give the original author credit.\n" "\n" " * For any reuse or distribution, you must make clear to others the\n" " license terms of this work.\n" "\n" " * Any of these conditions can be waived if you get permission from\n" " the author.\n" "\n" "Your fair use and other rights are in no way affected by the above.\n" "\n" "The above is a summary of the full license below.\n" "\n" "====================================================================\n" "\n" "Creative Commons Legal Code\n" "Attribution 2.0\n" "\n" "CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE\n" "LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN\n" "ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS\n" "INFORMATION ON AN \"AS-IS\" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES\n" "REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR\n" "DAMAGES RESULTING FROM ITS USE.\n" "\n" "License\n" "\n" "THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS\n" "CREATIVE COMMONS PUBLIC LICENSE (\"CCPL\" OR \"LICENSE\"). THE WORK IS\n" "PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE\n" "WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS\n" "PROHIBITED.\n" "\n" "BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND\n" "AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS\n" "YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF\n" "SUCH TERMS AND CONDITIONS.\n" "\n" "1. Definitions\n" "\n" " a. \"Collective Work\" means a work, such as a periodical issue,\n" " anthology or encyclopedia, in which the Work in its entirety in\n" " unmodified form, along with a number of other contributions,\n" " constituting separate and independent works in themselves, are\n" " assembled into a collective whole. A work that constitutes a\n" " Collective Work will not be considered a Derivative Work (as\n" " defined below) for the purposes of this License.\n" "\n" " b. \"Derivative Work\" means a work based upon the Work or upon the\n" " Work and other pre-existing works, such as a translation,\n" " musical arrangement, dramatization, fictionalization, motion\n" " picture version, sound recording, art reproduction, abridgment,\n" " condensation, or any other form in which the Work may be recast,\n" " transformed, or adapted, except that a work that constitutes a\n" " Collective Work will not be considered a Derivative Work for the\n" " purpose of this License. For the avoidance of doubt, where the\n" " Work is a musical composition or sound recording, the\n" " synchronization of the Work in timed-relation with a moving\n" " image (\"synching\") will be considered a Derivative Work for the\n" " purpose of this License.\n" "\n" " c. \"Licensor\" means the individual or entity that offers the Work\n" " under the terms of this License.\n" "\n" " d. \"Original Author\" means the individual or entity who created the Work.\n" "\n" " e. \"Work\" means the copyrightable work of authorship offered under\n" " the terms of this License.\n" "\n" " f. \"You\" means an individual or entity exercising rights under this\n" " License who has not previously violated the terms of this\n" " License with respect to the Work, or who has received express\n" " permission from the Licensor to exercise rights under this\n" " License despite a previous violation.\n" "\n" "2. Fair Use Rights. Nothing in this license is intended to reduce,\n" " limit, or restrict any rights arising from fair use, first sale or\n" " other limitations on the exclusive rights of the copyright owner\n" " under copyright law or other applicable laws.\n" "\n" "3. License Grant. Subject to the terms and conditions of this License,\n" " Licensor hereby grants You a worldwide, royalty-free,\n" " non-exclusive, perpetual (for the duration of the applicable\n" " copyright) license to exercise the rights in the Work as stated\n" " below:\n" "\n" " a. to reproduce the Work, to incorporate the Work into one or more\n" " Collective Works, and to reproduce the Work as incorporated in\n" " the Collective Works;\n" "\n" " b. to create and reproduce Derivative Works;\n" "\n" " c. to distribute copies or phonorecords of, display publicly,\n" " perform publicly, and perform publicly by means of a digital\n" " audio transmission the Work including as incorporated in\n" " Collective Works;\n" "\n" " d. to distribute copies or phonorecords of, display publicly,\n" " perform publicly, and perform publicly by means of a digital\n" " audio transmission Derivative Works.\n" "\n" " e.\n" "\n" " For the avoidance of doubt, where the work is a musical composition:\n" "\n" " i. Performance Royalties Under Blanket Licenses. Licensor\n" " waives the exclusive right to collect, whether\n" " individually or via a performance rights society\n" " (e.g. ASCAP, BMI, SESAC), royalties for the public\n" " performance or public digital performance (e.g. webcast)\n" " of the Work.\n" "\n" " ii. Mechanical Rights and Statutory Royalties. Licensor waives\n" " the exclusive right to collect, whether individually or\n" " via a music rights agency or designated agent (e.g. Harry\n" " Fox Agency), royalties for any phonorecord You create from\n" " the Work (\"cover version\") and distribute, subject to the\n" " compulsory license created by 17 USC Section 115 of the US\n" " Copyright Act (or the equivalent in other jurisdictions).\n" "\n" " f. Webcasting Rights and Statutory Royalties. For the avoidance of\n" " doubt, where the Work is a sound recording, Licensor waives the\n" " exclusive right to collect, whether individually or via a\n" " performance-rights society (e.g. SoundExchange), royalties for\n" " the public digital performance (e.g. webcast) of the Work,\n" " subject to the compulsory license created by 17 USC Section 114\n" " of the US Copyright Act (or the equivalent in other\n" " jurisdictions).\n" "\n" "The above rights may be exercised in all media and formats whether now\n" "known or hereafter devised. The above rights include the right to make\n" "such modifications as are technically necessary to exercise the rights\n" "in other media and formats. All rights not expressly granted by\n" "Licensor are hereby reserved.\n" "\n" "4. Restrictions.The license granted in Section 3 above is expressly\n" " made subject to and limited by the following restrictions:\n" "\n" " a. You may distribute, publicly display, publicly perform, or\n" " publicly digitally perform the Work only under the terms of this\n" " License, and You must include a copy of, or the Uniform Resource\n" " Identifier for, this License with every copy or phonorecord of\n" " the Work You distribute, publicly display, publicly perform, or\n" " publicly digitally perform. You may not offer or impose any\n" " terms on the Work that alter or restrict the terms of this\n" " License or the recipients' exercise of the rights granted\n" " hereunder. You may not sublicense the Work. You must keep intact\n" " all notices that refer to this License and to the disclaimer of\n" " warranties. You may not distribute, publicly display, publicly\n" " perform, or publicly digitally perform the Work with any\n" " technological measures that control access or use of the Work in\n" " a manner inconsistent with the terms of this License\n" " Agreement. The above applies to the Work as incorporated in a\n" " Collective Work, but this does not require the Collective Work\n" " apart from the Work itself to be made subject to the terms of\n" " this License. If You create a Collective Work, upon notice from\n" " any Licensor You must, to the extent practicable, remove from\n" " the Collective Work any reference to such Licensor or the\n" " Original Author, as requested. If You create a Derivative Work,\n" " upon notice from any Licensor You must, to the extent\n" " practicable, remove from the Derivative Work any reference to\n" " such Licensor or the Original Author, as requested.\n" "\n" " b. If you distribute, publicly display, publicly perform, or\n" " publicly digitally perform the Work or any Derivative Works or\n" " Collective Works, You must keep intact all copyright notices for\n" " the Work and give the Original Author credit reasonable to the\n" " medium or means You are utilizing by conveying the name (or\n" " pseudonym if applicable) of the Original Author if supplied; the\n" " title of the Work if supplied; to the extent reasonably\n" " practicable, the Uniform Resource Identifier, if any, that\n" " Licensor specifies to be associated with the Work, unless such\n" " URI does not refer to the copyright notice or licensing\n" " information for the Work; and in the case of a Derivative Work,\n" " a credit identifying the use of the Work in the Derivative Work\n" " (e.g., \"French translation of the Work by Original Author,\" or\n" " \"Screenplay based on original Work by Original Author\"). Such\n" " credit may be implemented in any reasonable manner; provided,\n" " however, that in the case of a Derivative Work or Collective\n" " Work, at a minimum such credit will appear where any other\n" " comparable authorship credit appears and in a manner at least as\n" " prominent as such other comparable authorship credit.\n" "\n" "5. Representations, Warranties and Disclaimer\n" "\n" "UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING,\n" "LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR\n" "WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED,\n" "STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF\n" "TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE,\n" "NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY,\n" "OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT\n" "DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED\n" "WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.\n" "\n" "6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY\n" " APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY\n" " LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE\n" " OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE\n" " WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\n" " DAMAGES.\n" "\n" "7. Termination\n" "\n" " a. This License and the rights granted hereunder will terminate\n" " automatically upon any breach by You of the terms of this\n" " License. Individuals or entities who have received Derivative\n" " Works or Collective Works from You under this License, however,\n" " will not have their licenses terminated provided such\n" " individuals or entities remain in full compliance with those\n" " licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any\n" " termination of this License.\n" "\n" " b. Subject to the above terms and conditions, the license granted\n" " here is perpetual (for the duration of the applicable copyright\n" " in the Work). Notwithstanding the above, Licensor reserves the\n" " right to release the Work under different license terms or to\n" " stop distributing the Work at any time; provided, however that\n" " any such election will not serve to withdraw this License (or\n" " any other license that has been, or is required to be, granted\n" " under the terms of this License), and this License will continue\n" " in full force and effect unless terminated as stated above.\n" "\n" "8. Miscellaneous\n" "\n" " a. Each time You distribute or publicly digitally perform the Work\n" " or a Collective Work, the Licensor offers to the recipient a\n" " license to the Work on the same terms and conditions as the\n" " license granted to You under this License.\n" "\n" " b. Each time You distribute or publicly digitally perform a\n" " Derivative Work, Licensor offers to the recipient a license to\n" " the original Work on the same terms and conditions as the\n" " license granted to You under this License.\n" "\n" " c. If any provision of this License is invalid or unenforceable\n" " under applicable law, it shall not affect the validity or\n" " enforceability of the remainder of the terms of this License,\n" " and without further action by the parties to this agreement,\n" " such provision shall be reformed to the minimum extent necessary\n" " to make such provision valid and enforceable.\n" "\n" " d. No term or provision of this License shall be deemed waived and\n" " no breach consented to unless such waiver or consent shall be in\n" " writing and signed by the party to be charged with such waiver\n" " or consent.\n" "\n" " e. This License constitutes the entire agreement between the\n" " parties with respect to the Work licensed here. There are no\n" " understandings, agreements or representations with respect to\n" " the Work not specified here. Licensor shall not be bound by any\n" " additional provisions that may appear in any communication from\n" " You. This License may not be modified without the mutual written\n" " agreement of the Licensor and You.\n" "\n" "Creative Commons is not a party to this License, and makes no warranty\n" "whatsoever in connection with the Work. Creative Commons will not be\n" "liable to You or any party on any legal theory for any damages\n" "whatsoever, including without limitation any general, special,\n" "incidental or consequential damages arising in connection to this\n" "license. Notwithstanding the foregoing two (2) sentences, if Creative\n" "Commons has expressly identified itself as the Licensor hereunder, it\n" "shall have all rights and obligations of Licensor.\n" "\n" "Except for the limited purpose of indicating to the public that the\n" "Work is licensed under the CCPL, neither party will use the trademark\n" "\"Creative Commons\" or any related trademark or logo of Creative\n" "Commons without the prior written consent of Creative Commons. Any\n" "permitted use will be in compliance with Creative Commons'\n" "then-current trademark usage guidelines, as may be published on its\n" "website or otherwise made available upon request from time to time.\n" "\n" "Creative Commons may be contacted at http://creativecommons.org/.\n" "\n" "====================================================================\n" msgstr "" # type: Content of: <preface><prefaceinfo> #: ../en/book/foreword.xml:9 msgid "<author> <firstname>Karl</firstname> <surname>Fogel</surname> </author>" msgstr "" "<author> <firstname>Karl</firstname> <surname>Fogel</surname> </author>" # type: Content of: <preface><prefaceinfo><pubdate> #: ../en/book/foreword.xml:13 msgid "Chicago, March 14, 2004." msgstr "Chicago, 14, März 2004." # type: Content of: <preface><title> #: ../en/book/foreword.xml:16 msgid "Foreword" msgstr "Geleitwort" # type: Content of: <preface><para> #: ../en/book/foreword.xml:18 msgid "" "A bad Frequently Asked Questions (FAQ) sheet is one that is composed not of " "the questions people actually ask, but of the questions the FAQ's author " "<emphasis>wishes</emphasis> people would ask. Perhaps you've seen the type " "before:" msgstr "" "Eine schlechte FAQ (Frequently Asked Questions) ist eine, die nicht aus den " "Fragen besteht, die wirklich gefragt wurden, sondern aus denen, die der " "Autor sich von den Fragenden <emphasis>gewünscht</emphasis> hätte. " "Vielleicht haben Sie solche schon gesehen:" # type: Content of: <preface><blockquote><para> #: ../en/book/foreword.xml:24 msgid "Q: How can I use Glorbosoft XYZ to maximize team productivity?" msgstr "" "F: Wie kann ich Glorbosoft XYZ einsetzen, um die Team-Produktivität zu " "maximieren?" # type: Content of: <preface><blockquote><para> #: ../en/book/foreword.xml:29 msgid "" "A: Many of our customers want to know how they can maximize productivity " "through our patented office groupware innovations. The answer is simple. " "First, click on the <literal>File</literal> menu, scroll down to " "<literal>Increase Productivity</literal>, then…" msgstr "" "A: Viele unserer Kunden wollen wissen, wie sie Ihre Produktivität mit " "unseren patentierten Office Groupware Innovationen maximieren können. Die " "Antwort ist einfach: zuerst klicken Sie auf das Menü <quote><literal>Datei</" "literal></quote>, fahren hinunter zum Eintrag <quote><literal>Erhöhe " "Produktivität</literal></quote>, und dann …" # type: Content of: <preface><para> #: ../en/book/foreword.xml:37 msgid "" "The problem with such FAQs is that they are not, in a literal sense, FAQs at " "all. No one ever called the tech support line and asked, <quote>How can we " "maximize productivity?</quote> Rather, people asked highly specific " "questions, such as <quote>How can we change the calendaring system to send " "reminders two days in advance instead of one?</quote> and so on. But it's a " "lot easier to make up imaginary Frequently Asked Questions than it is to " "discover the real ones. Compiling a true FAQ sheet requires a sustained, " "organized effort: over the lifetime of the software, incoming questions must " "be tracked, responses monitored, and all gathered into a coherent, " "searchable whole that reflects the collective experience of users in the " "wild. It calls for the patient, observant attitude of a field naturalist. " "No grand hypothesizing, no visionary pronouncements here—open eyes and " "accurate note-taking are what's needed most." msgstr "" "Das Problem mit solchen FAQs ist, dass sie keine FAQs im eigentlichen Sinne " "sind. Niemand fragt den technischen Support: <quote>Wie können wir unsere " "Produktivität steigern?</quote> Üblicherweise fragen Leute sehr spezifische " "Fragen, wie: <quote>Wie können wir das Kalendersystem so ändern, dass es die " "Erinnerungen zwei Tage statt einen Tag im Voraus aussendet?</quote> und so " "weiter. Aber es ist viel leichter, häufig gestellte Fragen zu erfinden, als " "die richtigen Fragen zu entdecken. Eine sinnvolle FAQ-Sammlung " "zusammenzustellen, erfordert eine ausdauernde, planvolle Anstrengung: über " "die Lebensdauer einer Software müssen hereinkommende Anfragen ausgewertet " "und Rückmeldungen evaluiert werden und zu einem konsistenten und " "benutzerfreundlichen Ganzen zusammengeführt werden, das die gesammelte " "Erfahrung der Anwendenden wiedergibt. Es erfordert die geduldige, " "aufmerksame Einstellung eines Naturforschers. Nicht großartige Hypothesen " "und visionäre Vorhersagen, sondern hauptsächlich offene Augen und genaue " "Aufzeichnungen sind gefragt." # type: Content of: <preface><para> #: ../en/book/foreword.xml:54 msgid "" "What I love about this book is that it grew out of just such a process, and " "shows it on every page. It is the direct result of the authors' encounters " "with users. It began with Ben Collins-Sussman's observation that people " "were asking the same basic questions over and over on the Subversion mailing " "lists: what are the standard workflows to use with Subversion? Do branches " "and tags work the same way as in other version control systems? How can I " "find out who made a particular change?" msgstr "" "Was ich an diesem Buch liebe, ist, dass es genau aus einem solchen Prozess " "gewachsen ist und dies auf jeder Seite sichtbar ist. Es ist das direkte " "Ergebnis der Begegnungen der Autoren mit Benutzern. Es begann mit Ben " "Collins-Sussmans Beobachtung, dass Leute immer wieder die gleichen " "grundlegenden Fragen auf der Subversion-Mailingliste stellten: Was sind die " "Standard-Arbeitsabläufe mit Subversion? Funktionieren Branches und Tags " "genau so wie in anderen Versionskontrollsystemen? Wie finde ich heraus, wer " "eine bestimmte Änderung durchgeführt hat?" # type: Content of: <preface><para> #: ../en/book/foreword.xml:63 msgid "" "Frustrated at seeing the same questions day after day, Ben worked intensely " "over a month in the summer of 2002 to write <citetitle>The Subversion " "Handbook</citetitle>, a 60-page manual that covered all the basics of using " "Subversion. The manual made no pretense of being complete, but it was " "distributed with Subversion and got users over that initial hump in the " "learning curve. When O'Reilly decided to publish a full-length Subversion " "book, the path of least resistance was obvious: just expand the Subversion " "handbook." msgstr "" "Frustriert davon, Tag für Tag immer wieder die gleichen Fragen zu sehen, " "arbeitete Ben im Sommer 2002 über einen Monat intensiv daran, <citetitle>The " "Subversion Handbook</citetitle> zu schreiben, eine 60-seitige Anleitung, die " "die Grundlagen der Benutzung von Subversion beschrieb. Die Anleitung erhob " "keinen Anspruch auf Vollständigkeit, aber sie wurde mit Subversion verteilt " "und half vielen über die ersten Buckel der Lernkurve. Als O'Reilly and " "Associates sich entschieden, ein vollständiges Buch über Subversion " "herauszugeben, war der Weg des geringsten Widerstandes offensichtlich: " "<citetitle>The Subversion Handbook</citetitle> muss erweitert werden." # type: Content of: <preface><para> #: ../en/book/foreword.xml:74 msgid "" "The three coauthors of the new book were thus presented with an unusual " "opportunity. Officially, their task was to write a book top-down, starting " "from a table of contents and an initial draft. But they also had access to " "a steady stream—indeed, an uncontrollable geyser—of bottom-up " "source material. Subversion was already in the hands of thousands of early " "adopters, and those users were giving tons of feedback, not only about " "Subversion, but also about its existing documentation." msgstr "" "Die drei Co-Autoren des neuen Buches erhielten somit eine seltene " "Gelegenheit. Eigentlich war es ihre Aufgabe, ein Buch beginnend mit dem " "Inhaltsverzeichnis und einem Rohkonzept zu schreiben; jedoch hatten sie auch " "Zugang zu einem ständigen Strom – ja einem unkontrollierbaren Geysir " "– aus Quellmaterial. Subversion wurde bereits von tausenden " "experimentierfreudigen Menschen benutzt, und diese gaben Unmengen an " "Rückmeldungen – nicht nur über Subversion, sondern auch über die " "bestehende Dokumentation." # type: Content of: <preface><para> #: ../en/book/foreword.xml:84 msgid "" "During the entire time they wrote this book, Ben, Mike, and Brian haunted " "the Subversion mailing lists and chat rooms incessantly, carefully noting " "the problems users were having in real-life situations. Monitoring such " "feedback was part of their job descriptions at CollabNet anyway, and it gave " "them a huge advantage when they set out to document Subversion. The book " "they produced is grounded firmly in the bedrock of experience, not in the " "shifting sands of wishful thinking; it combines the best aspects of user " "manual and FAQ sheet. This duality might not be noticeable on a first " "reading. Taken in order, front to back, the book is simply a " "straightforward description of a piece of software. There's the overview, " "the obligatory guided tour, the chapter on administrative configuration, " "some advanced topics, and of course, a command reference and troubleshooting " "guide. Only when you come back to it later, seeking the solution to some " "specific problem, does its authenticity shine out: the telling details that " "can only result from encounters with the unexpected, the examples honed from " "genuine use cases, and most of all the sensitivity to the user's needs and " "the user's point of view." msgstr "" "Während der gesamten Zeit, in der sie dieses Buch schrieben, durchstöberten " "Ben, Mike und Brian unablässig die Subversion-Mailinglisten und Chaträume " "und notierten die Probleme, die Benutzer im echten Leben hatten. Die " "Beobachtung derartiger Rückmeldungen war ohnehin ein Teil ihrer Arbeit bei " "CollabNet, was ihnen einen Riesenvorteil verschaffte, als sie sich " "entschlossen, Subversion zu dokumentieren. Das Buch, das sie schrieben, " "gründet auf dem festen Fels der Erfahrung und nicht auf dem Treibsand des " "Wunschdenkens. Es vereint die Vorteile von Bedienungsanleitung und FAQ. " "Diese Zweigleisigkeit ist vielleicht nicht gleich zu erkennen. Von vorne " "nach hinten gelesen ist das Buch einfach eine Beschreibung einer Software. " "Es gibt die Übersicht, den obligatorischen Rundgang, das Kapitel über " "Administration, einige fortgeschrittene Themen und natürlich eine " "Funktionsübersicht sowie eine Anleitung zur Problemlösung. Erst wenn Sie es " "später wieder zur Hand nehmen, um die Lösung für ein bestimmtes Problem zu " "suchen, wird die Zuverlässigkeit des Buches offenbar: in den beschriebenen " "Details,die nur aus der Erfahrung mit dem Unerwarteten erwachsen konnten, in " "den Beispielen, die aus dem tatsächlichem Einsatz gebildet wurden, und am " "meisten durch das Gefühl für die Bedürfnisse und den Blickwinkel der " "Benutzer." # type: Content of: <preface><para> #: ../en/book/foreword.xml:105 msgid "" "Of course, no one can promise that this book will answer every question you " "have about Subversion. Sometimes the precision with which it anticipates " "your questions will seem eerily telepathic; yet occasionally, you will " "stumble into a hole in the community's knowledge and come away empty-" "handed. When this happens, the best thing you can do is email " "<email>users@subversion.tigris.org</email> and present your problem. The " "authors are still there and still watching, and the authors include not just " "the three listed on the cover, but many others who contributed corrections " "and original material. From the community's point of view, solving your " "problem is merely a pleasant side effect of a much larger project—" "namely, slowly adjusting this book, and ultimately Subversion itself, to " "more closely match the way people actually use it. They are eager to hear " "from you, not only because they can help you, but because you can help " "them. With Subversion, as with all active free software projects, " "<emphasis>you are not alone</emphasis>." msgstr "" "Natürlich kann niemand versprechen, dass dieses Buch alle Fragen " "beantwortet, die Sie über Subversion haben. Manchmal wird die Genauigkeit, " "mit der es Ihre Fragen erwartet, unheimlich und telepathisch erscheinen; " "gelegentlich werden Sie jedoch in ein Loch im Wissen der Gemeinschaft " "stolpern und mit leeren Händen dastehen. Wenn das passiert schreiben Sie am " "besten eine E-Mail an <email>users@subversion.tigris.org</email> und " "schildern Ihr Problem. Die Autoren sind nach wie vor dort und beobachten. " "Und das betrifft nicht nur die drei, die auf dem Umschlag erscheinen sind, " "sondern viele andere, die Korrekturen und neues Material beigesteuert " "haben. Aus der Sicht der Gemeinschaft ist die Lösung Ihres Problems " "lediglich ein erfreulicher Nebeneffekt eines viel größeren Projektes – " "nämlich das Buch und schlussendlich auch Subversion selbst immer näher an " "die Art und Weise anzupassen, in der es tatsächlich benutzt wird. Diese " "Personen sind begierig darauf, von Ihnen zu hören, nicht nur weil sie Ihnen " "helfen können, sondern auch weil ihnen selbst damit geholfen ist. Für " "Subversion – so wie für alle aktiven freien Software-Projekte – " "gilt: <emphasis>Sie sind nicht allein</emphasis>." # type: Content of: <preface><para> #: ../en/book/foreword.xml:124 msgid "Let this book be your first companion." msgstr "Lassen Sie dieses Buch Ihren ersten Begleiter sein."