From 2533ea9a7fa0c694b215d620a478ec68cd6dd9e0 Mon Sep 17 00:00:00 2001 From: Dongsheng Song Date: Mon, 12 Nov 2007 10:47:06 +0800 Subject: [PATCH] [svnbook]Upgrade to r2881. --- doc/svnbook/build.tmpl.properties | 4 - doc/svnbook/build.xml | 10 +- doc/svnbook/po/book.pot | 1636 ++++++++++++++--------------- doc/svnbook/po/zh_CN.po | 1893 +++++++++++++++++----------------- doc/svnbook/source/book.txt | 6 +- doc/svnbook/source/book.xml | 28 +- doc/svnbook/stylesheets/zh_CN/fo.xsl | 12 +- doc/svnbook/version | 2 +- 8 files changed, 1799 insertions(+), 1792 deletions(-) diff --git a/doc/svnbook/build.tmpl.properties b/doc/svnbook/build.tmpl.properties index 88c706d..7082dc8 100644 --- a/doc/svnbook/build.tmpl.properties +++ b/doc/svnbook/build.tmpl.properties @@ -10,10 +10,6 @@ docbook5.xsl.url=file:///C:/wc/svn/i18n-zh/trunk/lib/docbook/docbook5-xsl # usr.share.java = /usr/share/java usr.share.java = C:/wc/svn/i18n-zh/trunk/lib/share/java -#Only for pdf files -fop.home=C:/wc/svn/i18n-zh/trunk/lib/fop/1.x -fop.class=org.apache.fop.cli.Main - # Only for pdf files(fop 0.20.5) fop.home=C:/wc/svn/i18n-zh/trunk/lib/fop/0.20.5 fop.class=org.apache.fop.apps.Fop diff --git a/doc/svnbook/build.xml b/doc/svnbook/build.xml index 62e3951..09bf3fa 100644 --- a/doc/svnbook/build.xml +++ b/doc/svnbook/build.xml @@ -25,11 +25,11 @@ - - - - - + + + + + diff --git a/doc/svnbook/po/book.pot b/doc/svnbook/po/book.pot index 548ac58..830cbc3 100644 --- a/doc/svnbook/po/book.pot +++ b/doc/svnbook/po/book.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-10-30 12:24 +0000\n" +"POT-Creation-Date: 2007-11-12 02:25 +0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -114,7 +114,7 @@ msgstr "" #.(subtitle) #: ../source/book.xml:5 -msgid "For Subversion 1.5(Compiled from r2880)" +msgid "For Subversion 1.5(Compiled from r2881)" msgstr "" #.(edition) @@ -875,7 +875,7 @@ msgid "Subversion, once installed, has a number of different pieces. The followi msgstr "" #.(term), (primary) -#: ../source/book.xml:982 ../source/book.xml:17042 ../source/book.xml:17145 ../source/book.xml:17249 ../source/book.xml:17334 ../source/book.xml:17465 ../source/book.xml:17541 ../source/book.xml:17669 ../source/book.xml:17825 ../source/book.xml:17935 ../source/book.xml:18188 ../source/book.xml:18300 ../source/book.xml:18353 ../source/book.xml:18457 ../source/book.xml:18658 ../source/book.xml:18776 ../source/book.xml:18870 ../source/book.xml:19094 ../source/book.xml:19216 ../source/book.xml:19301 ../source/book.xml:19408 ../source/book.xml:19487 ../source/book.xml:19566 ../source/book.xml:19647 ../source/book.xml:19735 ../source/book.xml:19860 ../source/book.xml:19949 ../source/book.xml:20055 ../source/book.xml:20400 ../source/book.xml:20562 ../source/book.xml:20649 +#: ../source/book.xml:982 ../source/book.xml:17030 ../source/book.xml:17133 ../source/book.xml:17237 ../source/book.xml:17322 ../source/book.xml:17453 ../source/book.xml:17529 ../source/book.xml:17657 ../source/book.xml:17813 ../source/book.xml:17923 ../source/book.xml:18176 ../source/book.xml:18288 ../source/book.xml:18341 ../source/book.xml:18445 ../source/book.xml:18646 ../source/book.xml:18764 ../source/book.xml:18858 ../source/book.xml:19082 ../source/book.xml:19204 ../source/book.xml:19289 ../source/book.xml:19396 ../source/book.xml:19475 ../source/book.xml:19554 ../source/book.xml:19635 ../source/book.xml:19723 ../source/book.xml:19848 ../source/book.xml:19937 ../source/book.xml:20043 ../source/book.xml:20388 ../source/book.xml:20550 ../source/book.xml:20637 msgid "svn" msgstr "" @@ -895,7 +895,7 @@ msgid "A program for reporting the state (in terms of revisions of the items pre msgstr "" #.(term), (title), (command), (primary) -#: ../source/book.xml:995 ../source/book.xml:9943 ../source/book.xml:21723 ../source/book.xml:21809 ../source/book.xml:21853 ../source/book.xml:21908 ../source/book.xml:21998 ../source/book.xml:22042 ../source/book.xml:22111 ../source/book.xml:22156 ../source/book.xml:22188 ../source/book.xml:22251 ../source/book.xml:22299 ../source/book.xml:22348 ../source/book.xml:22392 ../source/book.xml:22445 ../source/book.xml:22507 ../source/book.xml:22560 ../source/book.xml:22598 +#: ../source/book.xml:995 ../source/book.xml:9943 ../source/book.xml:21711 ../source/book.xml:21809 ../source/book.xml:21853 ../source/book.xml:21908 ../source/book.xml:21998 ../source/book.xml:22042 ../source/book.xml:22111 ../source/book.xml:22156 ../source/book.xml:22188 ../source/book.xml:22251 ../source/book.xml:22299 ../source/book.xml:22348 ../source/book.xml:22392 ../source/book.xml:22445 ../source/book.xml:22507 ../source/book.xml:22560 ../source/book.xml:22598 msgid "svnlook" msgstr "" @@ -905,7 +905,7 @@ msgid "A tool for directly inspecting a Subversion repository." msgstr "" #.(term), (title), (command), (primary) -#: ../source/book.xml:1001 ../source/book.xml:9913 ../source/book.xml:20793 ../source/book.xml:20943 ../source/book.xml:21002 ../source/book.xml:21041 ../source/book.xml:21144 ../source/book.xml:21177 ../source/book.xml:21223 ../source/book.xml:21255 ../source/book.xml:21301 ../source/book.xml:21364 ../source/book.xml:21410 ../source/book.xml:21448 ../source/book.xml:21525 ../source/book.xml:21569 ../source/book.xml:21617 ../source/book.xml:21674 +#: ../source/book.xml:1001 ../source/book.xml:9913 ../source/book.xml:20781 ../source/book.xml:20931 ../source/book.xml:20990 ../source/book.xml:21029 ../source/book.xml:21132 ../source/book.xml:21165 ../source/book.xml:21211 ../source/book.xml:21243 ../source/book.xml:21289 ../source/book.xml:21352 ../source/book.xml:21398 ../source/book.xml:21436 ../source/book.xml:21513 ../source/book.xml:21557 ../source/book.xml:21605 ../source/book.xml:21662 msgid "svnadmin" msgstr "" @@ -1656,7 +1656,7 @@ msgid "Note that this chapter is not meant to be an exhaustive list of all Subve msgstr "" #.(title), (refpurpose) -#: ../source/book.xml:1984 ../source/book.xml:18306 ../source/book.xml:21150 ../source/book.xml:22162 +#: ../source/book.xml:1984 ../source/book.xml:18294 ../source/book.xml:21138 ../source/book.xml:22162 msgid "Help!" msgstr "" @@ -1682,7 +1682,7 @@ msgid "There are two ways to get new files into your Subversion repository: enable-auto-props msgstr "" #.(option) -#: ../source/book.xml:16778 -msgid "--no-diff-added" -msgstr "" - -#.(para) -#: ../source/book.xml:16781 -msgid "Prevents Subversion from printing differences for added files. The default behavior when you add a file is for svn diff to print the same differences that you would see if you had added the entire contents of an existing (empty) file." -msgstr "" - -#.(option) -#: ../source/book.xml:16790 ../source/book.xml:21753 +#: ../source/book.xml:16778 ../source/book.xml:21741 msgid "--no-diff-deleted" msgstr "" #.(para) -#: ../source/book.xml:16793 +#: ../source/book.xml:16781 msgid "Prevents Subversion from printing differences for deleted files. The default behavior when you remove a file is for svn diff to print the same differences that you would see if you had left the file but removed all the content." msgstr "" #.(option) -#: ../source/book.xml:16802 +#: ../source/book.xml:16790 msgid "--no-ignore" msgstr "" #.(para) -#: ../source/book.xml:16805 +#: ../source/book.xml:16793 msgid "Shows files in the status listing that would normally be omitted since they match a pattern in the global-ignores configuration option or the svn:ignore property. See and for more information." msgstr "" #.(option) -#: ../source/book.xml:16814 +#: ../source/book.xml:16802 msgid "--no-unlock" msgstr "" #.(para) -#: ../source/book.xml:16817 +#: ../source/book.xml:16805 msgid "Don't automatically unlock files (the default commit behavior is to unlock all files listed as part of the commit). See for more information." msgstr "" #.(option) -#: ../source/book.xml:16825 ../source/book.xml:22692 +#: ../source/book.xml:16813 ../source/book.xml:22692 msgid "--non-interactive" msgstr "" #.(para) -#: ../source/book.xml:16828 ../source/book.xml:22695 +#: ../source/book.xml:16816 ../source/book.xml:22695 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 of an automated script and it's more appropriate to have Subversion fail than to prompt for more information." msgstr "" #.(term) -#: ../source/book.xml:16837 +#: ../source/book.xml:16825 msgid " ()" msgstr "" #.(para) -#: ../source/book.xml:16839 +#: ../source/book.xml:16827 msgid "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 "" #.(option) -#: ../source/book.xml:16848 +#: ../source/book.xml:16836 msgid "--notice-ancestry" msgstr "" #.(para) -#: ../source/book.xml:16851 +#: ../source/book.xml:16839 msgid "Pay attention to ancestry when calculating differences." msgstr "" #.(option) -#: ../source/book.xml:16857 +#: ../source/book.xml:16845 msgid "--old" msgstr "" #.(para) -#: ../source/book.xml:16861 +#: ../source/book.xml:16849 msgid "Uses ARG as the older target (for use with svn diff)." msgstr "" #.(option) -#: ../source/book.xml:16867 ../source/book.xml:22705 +#: ../source/book.xml:16855 ../source/book.xml:22705 msgid "--password" msgstr "" #.(replaceable) -#: ../source/book.xml:16868 ../source/book.xml:22706 +#: ../source/book.xml:16856 ../source/book.xml:22706 msgid "PASS" msgstr "" #.(para) -#: ../source/book.xml:16871 ../source/book.xml:22709 +#: ../source/book.xml:16859 ../source/book.xml:22709 msgid "Indicates that you are providing your password for authentication on the command line—otherwise, if it is needed, Subversion will prompt you for it." msgstr "" #.(term) -#: ../source/book.xml:16878 +#: ../source/book.xml:16866 msgid " ()" msgstr "" #.(para) -#: ../source/book.xml:16880 +#: ../source/book.xml:16868 msgid "Requests that the client print only essential information while performing an operation." msgstr "" #.(term) -#: ../source/book.xml:16885 +#: ../source/book.xml:16873 msgid " ()" msgstr "" #.(para) -#: ../source/book.xml:16887 +#: ../source/book.xml:16875 msgid "Makes a subcommand recurse into subdirectories. Most subcommands recurse by default." msgstr "" #.(option) -#: ../source/book.xml:16893 +#: ../source/book.xml:16881 msgid "--relocate" msgstr "" #.(replaceable) -#: ../source/book.xml:16894 +#: ../source/book.xml:16882 msgid "FROM TO [PATH...]" msgstr "" #.(para) -#: ../source/book.xml:16898 +#: ../source/book.xml:16886 msgid "Used with the svn switch 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 svn switch for an example." msgstr "" #.(term) -#: ../source/book.xml:16908 +#: ../source/book.xml:16896 msgid " () REV" msgstr "" #.(para) -#: ../source/book.xml:16912 +#: ../source/book.xml:16900 msgid "Indicates that you're going to supply a revision (or range of revisions) for a particular operation. You can provide revision numbers, revision keywords or dates (in curly braces), as arguments to the revision option. If you wish to provide a range of revisions, you can provide two revisions separated by a colon. For example:" msgstr "" #.(screen) -#: ../source/book.xml:16919 +#: ../source/book.xml:16907 #, 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 "" #.(para) -#: ../source/book.xml:16926 +#: ../source/book.xml:16914 msgid "See for more information." msgstr "" #.(option) -#: ../source/book.xml:16932 ../source/book.xml:21773 +#: ../source/book.xml:16920 ../source/book.xml:21773 msgid "--revprop" msgstr "" #.(para) -#: ../source/book.xml:16935 ../source/book.xml:21776 +#: ../source/book.xml:16923 ../source/book.xml:21776 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." msgstr "" #.(term) -#: ../source/book.xml:16943 +#: ../source/book.xml:16931 msgid " ()" msgstr "" #.(para) -#: ../source/book.xml:16945 +#: ../source/book.xml:16933 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 run svn update." msgstr "" #.(option) -#: ../source/book.xml:16955 +#: ../source/book.xml:16943 msgid "--stop-on-copy" msgstr "" #.(para) -#: ../source/book.xml:16958 +#: ../source/book.xml:16946 msgid "Causes a Subversion subcommand which is traversing 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 "" #.(option) -#: ../source/book.xml:16968 +#: ../source/book.xml:16956 msgid "--strict" msgstr "" #.(para) -#: ../source/book.xml:16971 +#: ../source/book.xml:16959 msgid "Causes Subversion to use strict semantics, a notion which is rather vague unless talking about specific subcommands (namely, svn propget)." msgstr "" #.(option) -#: ../source/book.xml:16978 +#: ../source/book.xml:16966 msgid "--targets" msgstr "" #.(replaceable) -#: ../source/book.xml:16979 +#: ../source/book.xml:16967 msgid "FILENAME" msgstr "" #.(para) -#: ../source/book.xml:16982 +#: ../source/book.xml:16970 msgid "Tells Subversion to get the list of files that you wish to operate on from the filename you provide instead of listing all the files on the command line." msgstr "" #.(option) -#: ../source/book.xml:16990 ../source/book.xml:22717 +#: ../source/book.xml:16978 ../source/book.xml:22717 msgid "--username" msgstr "" #.(replaceable) -#: ../source/book.xml:16991 ../source/book.xml:22718 +#: ../source/book.xml:16979 ../source/book.xml:22718 msgid "NAME" msgstr "" #.(para) -#: ../source/book.xml:16994 ../source/book.xml:22721 +#: ../source/book.xml:16982 ../source/book.xml:22721 msgid "Indicates that you are providing your username for authentication on the command line—otherwise, if it is needed, Subversion will prompt you for it." msgstr "" #.(term) -#: ../source/book.xml:17001 +#: ../source/book.xml:16989 msgid " ()" msgstr "" #.(para) -#: ../source/book.xml:17003 +#: ../source/book.xml:16991 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 "" #.(option) -#: ../source/book.xml:17012 ../source/book.xml:23037 ../source/book.xml:23184 +#: ../source/book.xml:17000 ../source/book.xml:23037 ../source/book.xml:23184 msgid "--version" msgstr "" #.(para) -#: ../source/book.xml:17015 +#: ../source/book.xml:17003 msgid "Prints the client version info. This information not only includes 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 () it prints only the version number in a compact form." msgstr "" #.(option) -#: ../source/book.xml:17026 +#: ../source/book.xml:17014 msgid "--xml" msgstr "" #.(para) -#: ../source/book.xml:17029 +#: ../source/book.xml:17017 msgid "Prints output in XML format." msgstr "" #.(title) -#: ../source/book.xml:17037 +#: ../source/book.xml:17025 msgid "svn Subcommands" msgstr "" #.(para) -#: ../source/book.xml:17039 ../source/book.xml:22734 +#: ../source/book.xml:17027 ../source/book.xml:22734 msgid "Here are the various subcommands:" msgstr "" #.(secondary) -#: ../source/book.xml:17043 ../source/book.xml:17146 ../source/book.xml:17250 ../source/book.xml:17335 ../source/book.xml:17466 ../source/book.xml:17542 ../source/book.xml:17670 ../source/book.xml:17826 ../source/book.xml:17936 ../source/book.xml:18189 ../source/book.xml:18301 ../source/book.xml:18354 ../source/book.xml:18458 ../source/book.xml:18659 ../source/book.xml:18777 ../source/book.xml:18871 ../source/book.xml:19095 ../source/book.xml:19217 ../source/book.xml:19302 ../source/book.xml:19409 ../source/book.xml:19488 ../source/book.xml:19567 ../source/book.xml:19648 ../source/book.xml:19736 ../source/book.xml:19861 ../source/book.xml:19950 ../source/book.xml:20056 ../source/book.xml:20401 ../source/book.xml:20563 ../source/book.xml:20650 ../source/book.xml:20944 ../source/book.xml:21003 ../source/book.xml:21042 ../source/book.xml:21145 ../source/book.xml:21178 ../source/book.xml:21224 ../source/book.xml:21256 ../source/book.xml:21302 ../source/book.xml:21365 ../source/book.xml:21411 ../source/book.xml:21449 ../source/book.xml:21526 ../source/book.xml:21570 ../source/book.xml:21618 ../source/book.xml:21675 ../source/book.xml:21810 ../source/book.xml:21854 ../source/book.xml:21909 ../source/book.xml:21999 ../source/book.xml:22043 ../source/book.xml:22112 ../source/book.xml:22157 ../source/book.xml:22189 ../source/book.xml:22252 ../source/book.xml:22300 ../source/book.xml:22349 ../source/book.xml:22393 ../source/book.xml:22446 ../source/book.xml:22508 ../source/book.xml:22561 ../source/book.xml:22599 ../source/book.xml:22738 ../source/book.xml:22804 ../source/book.xml:22875 +#: ../source/book.xml:17031 ../source/book.xml:17134 ../source/book.xml:17238 ../source/book.xml:17323 ../source/book.xml:17454 ../source/book.xml:17530 ../source/book.xml:17658 ../source/book.xml:17814 ../source/book.xml:17924 ../source/book.xml:18177 ../source/book.xml:18289 ../source/book.xml:18342 ../source/book.xml:18446 ../source/book.xml:18647 ../source/book.xml:18765 ../source/book.xml:18859 ../source/book.xml:19083 ../source/book.xml:19205 ../source/book.xml:19290 ../source/book.xml:19397 ../source/book.xml:19476 ../source/book.xml:19555 ../source/book.xml:19636 ../source/book.xml:19724 ../source/book.xml:19849 ../source/book.xml:19938 ../source/book.xml:20044 ../source/book.xml:20389 ../source/book.xml:20551 ../source/book.xml:20638 ../source/book.xml:20932 ../source/book.xml:20991 ../source/book.xml:21030 ../source/book.xml:21133 ../source/book.xml:21166 ../source/book.xml:21212 ../source/book.xml:21244 ../source/book.xml:21290 ../source/book.xml:21353 ../source/book.xml:21399 ../source/book.xml:21437 ../source/book.xml:21514 ../source/book.xml:21558 ../source/book.xml:21606 ../source/book.xml:21663 ../source/book.xml:21810 ../source/book.xml:21854 ../source/book.xml:21909 ../source/book.xml:21999 ../source/book.xml:22043 ../source/book.xml:22112 ../source/book.xml:22157 ../source/book.xml:22189 ../source/book.xml:22252 ../source/book.xml:22300 ../source/book.xml:22349 ../source/book.xml:22393 ../source/book.xml:22446 ../source/book.xml:22508 ../source/book.xml:22561 ../source/book.xml:22599 ../source/book.xml:22738 ../source/book.xml:22804 ../source/book.xml:22875 msgid "subcommands" msgstr "" #.(tertiary) -#: ../source/book.xml:17044 +#: ../source/book.xml:17032 msgid "add" msgstr "" #.(refpurpose) -#: ../source/book.xml:17048 +#: ../source/book.xml:17036 msgid "Add files, directories, or symbolic links." msgstr "" #.(title) -#: ../source/book.xml:17052 ../source/book.xml:17156 ../source/book.xml:17260 ../source/book.xml:17344 ../source/book.xml:17475 ../source/book.xml:17551 ../source/book.xml:17680 ../source/book.xml:17836 ../source/book.xml:17945 ../source/book.xml:18198 ../source/book.xml:18310 ../source/book.xml:18364 ../source/book.xml:18468 ../source/book.xml:18668 ../source/book.xml:18788 ../source/book.xml:18880 ../source/book.xml:19105 ../source/book.xml:19226 ../source/book.xml:19311 ../source/book.xml:19418 ../source/book.xml:19498 ../source/book.xml:19576 ../source/book.xml:19657 ../source/book.xml:19745 ../source/book.xml:19871 ../source/book.xml:19959 ../source/book.xml:20065 ../source/book.xml:20410 ../source/book.xml:20572 ../source/book.xml:20659 ../source/book.xml:20953 ../source/book.xml:21012 ../source/book.xml:21051 ../source/book.xml:21154 ../source/book.xml:21187 ../source/book.xml:21236 ../source/book.xml:21267 ../source/book.xml:21313 ../source/book.xml:21374 ../source/book.xml:21420 ../source/book.xml:21462 ../source/book.xml:21536 ../source/book.xml:21579 ../source/book.xml:21627 ../source/book.xml:21684 ../source/book.xml:21819 ../source/book.xml:21863 ../source/book.xml:21918 ../source/book.xml:22008 ../source/book.xml:22052 ../source/book.xml:22121 ../source/book.xml:22166 ../source/book.xml:22200 ../source/book.xml:22262 ../source/book.xml:22310 ../source/book.xml:22359 ../source/book.xml:22403 ../source/book.xml:22456 ../source/book.xml:22517 ../source/book.xml:22571 ../source/book.xml:22608 ../source/book.xml:22749 ../source/book.xml:22814 ../source/book.xml:22885 ../source/book.xml:23129 +#: ../source/book.xml:17040 ../source/book.xml:17144 ../source/book.xml:17248 ../source/book.xml:17332 ../source/book.xml:17463 ../source/book.xml:17539 ../source/book.xml:17668 ../source/book.xml:17824 ../source/book.xml:17933 ../source/book.xml:18186 ../source/book.xml:18298 ../source/book.xml:18352 ../source/book.xml:18456 ../source/book.xml:18656 ../source/book.xml:18776 ../source/book.xml:18868 ../source/book.xml:19093 ../source/book.xml:19214 ../source/book.xml:19299 ../source/book.xml:19406 ../source/book.xml:19486 ../source/book.xml:19564 ../source/book.xml:19645 ../source/book.xml:19733 ../source/book.xml:19859 ../source/book.xml:19947 ../source/book.xml:20053 ../source/book.xml:20398 ../source/book.xml:20560 ../source/book.xml:20647 ../source/book.xml:20941 ../source/book.xml:21000 ../source/book.xml:21039 ../source/book.xml:21142 ../source/book.xml:21175 ../source/book.xml:21224 ../source/book.xml:21255 ../source/book.xml:21301 ../source/book.xml:21362 ../source/book.xml:21408 ../source/book.xml:21450 ../source/book.xml:21524 ../source/book.xml:21567 ../source/book.xml:21615 ../source/book.xml:21672 ../source/book.xml:21819 ../source/book.xml:21863 ../source/book.xml:21918 ../source/book.xml:22008 ../source/book.xml:22052 ../source/book.xml:22121 ../source/book.xml:22166 ../source/book.xml:22200 ../source/book.xml:22262 ../source/book.xml:22310 ../source/book.xml:22359 ../source/book.xml:22403 ../source/book.xml:22456 ../source/book.xml:22517 ../source/book.xml:22571 ../source/book.xml:22608 ../source/book.xml:22749 ../source/book.xml:22814 ../source/book.xml:22885 ../source/book.xml:23129 msgid "Synopsis" msgstr "" #.(programlisting) -#: ../source/book.xml:17054 +#: ../source/book.xml:17042 #, no-wrap msgid "svn add PATH..." msgstr "" #.(title), (entry) -#: ../source/book.xml:17058 ../source/book.xml:17162 ../source/book.xml:17266 ../source/book.xml:17350 ../source/book.xml:17481 ../source/book.xml:17557 ../source/book.xml:17686 ../source/book.xml:17843 ../source/book.xml:17953 ../source/book.xml:18205 ../source/book.xml:18316 ../source/book.xml:18370 ../source/book.xml:18474 ../source/book.xml:18674 ../source/book.xml:18794 ../source/book.xml:18888 ../source/book.xml:19113 ../source/book.xml:19233 ../source/book.xml:19317 ../source/book.xml:19425 ../source/book.xml:19505 ../source/book.xml:19583 ../source/book.xml:19664 ../source/book.xml:19752 ../source/book.xml:19877 ../source/book.xml:19965 ../source/book.xml:20071 ../source/book.xml:20417 ../source/book.xml:20578 ../source/book.xml:20665 ../source/book.xml:20959 ../source/book.xml:21018 ../source/book.xml:21057 ../source/book.xml:21160 ../source/book.xml:21193 ../source/book.xml:21242 ../source/book.xml:21273 ../source/book.xml:21319 ../source/book.xml:21380 ../source/book.xml:21426 ../source/book.xml:21468 ../source/book.xml:21542 ../source/book.xml:21585 ../source/book.xml:21633 ../source/book.xml:21690 ../source/book.xml:21825 ../source/book.xml:21869 ../source/book.xml:21924 ../source/book.xml:22014 ../source/book.xml:22058 ../source/book.xml:22127 ../source/book.xml:22172 ../source/book.xml:22206 ../source/book.xml:22268 ../source/book.xml:22316 ../source/book.xml:22365 ../source/book.xml:22409 ../source/book.xml:22462 ../source/book.xml:22523 ../source/book.xml:22577 ../source/book.xml:22614 ../source/book.xml:22755 ../source/book.xml:22820 ../source/book.xml:22891 ../source/book.xml:23135 ../source/book.xml:23265 ../source/book.xml:23564 ../source/book.xml:23611 ../source/book.xml:23660 ../source/book.xml:23707 ../source/book.xml:23770 ../source/book.xml:23831 ../source/book.xml:23882 ../source/book.xml:23928 ../source/book.xml:23981 ../source/book.xml:24994 +#: ../source/book.xml:17046 ../source/book.xml:17150 ../source/book.xml:17254 ../source/book.xml:17338 ../source/book.xml:17469 ../source/book.xml:17545 ../source/book.xml:17674 ../source/book.xml:17831 ../source/book.xml:17941 ../source/book.xml:18193 ../source/book.xml:18304 ../source/book.xml:18358 ../source/book.xml:18462 ../source/book.xml:18662 ../source/book.xml:18782 ../source/book.xml:18876 ../source/book.xml:19101 ../source/book.xml:19221 ../source/book.xml:19305 ../source/book.xml:19413 ../source/book.xml:19493 ../source/book.xml:19571 ../source/book.xml:19652 ../source/book.xml:19740 ../source/book.xml:19865 ../source/book.xml:19953 ../source/book.xml:20059 ../source/book.xml:20405 ../source/book.xml:20566 ../source/book.xml:20653 ../source/book.xml:20947 ../source/book.xml:21006 ../source/book.xml:21045 ../source/book.xml:21148 ../source/book.xml:21181 ../source/book.xml:21230 ../source/book.xml:21261 ../source/book.xml:21307 ../source/book.xml:21368 ../source/book.xml:21414 ../source/book.xml:21456 ../source/book.xml:21530 ../source/book.xml:21573 ../source/book.xml:21621 ../source/book.xml:21678 ../source/book.xml:21825 ../source/book.xml:21869 ../source/book.xml:21924 ../source/book.xml:22014 ../source/book.xml:22058 ../source/book.xml:22127 ../source/book.xml:22172 ../source/book.xml:22206 ../source/book.xml:22268 ../source/book.xml:22316 ../source/book.xml:22365 ../source/book.xml:22409 ../source/book.xml:22462 ../source/book.xml:22523 ../source/book.xml:22577 ../source/book.xml:22614 ../source/book.xml:22755 ../source/book.xml:22820 ../source/book.xml:22891 ../source/book.xml:23135 ../source/book.xml:23265 ../source/book.xml:23564 ../source/book.xml:23611 ../source/book.xml:23660 ../source/book.xml:23707 ../source/book.xml:23770 ../source/book.xml:23831 ../source/book.xml:23882 ../source/book.xml:23928 ../source/book.xml:23981 ../source/book.xml:24994 msgid "Description" msgstr "" #.(para) -#: ../source/book.xml:17060 +#: ../source/book.xml:17048 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 svn revert." msgstr "" #.(title) -#: ../source/book.xml:17070 ../source/book.xml:17171 ../source/book.xml:17274 ../source/book.xml:17362 ../source/book.xml:17499 ../source/book.xml:17582 ../source/book.xml:17728 ../source/book.xml:17858 ../source/book.xml:18059 ../source/book.xml:18224 ../source/book.xml:18323 ../source/book.xml:18382 ../source/book.xml:18560 ../source/book.xml:18715 ../source/book.xml:18805 ../source/book.xml:18917 ../source/book.xml:19147 ../source/book.xml:19247 ../source/book.xml:19350 ../source/book.xml:19436 ../source/book.xml:19516 ../source/book.xml:19594 ../source/book.xml:19675 ../source/book.xml:19770 ../source/book.xml:19890 ../source/book.xml:19978 ../source/book.xml:20314 ../source/book.xml:20437 ../source/book.xml:20590 ../source/book.xml:20717 ../source/book.xml:21170 ../source/book.xml:22181 ../source/book.xml:22416 ../source/book.xml:22469 ../source/book.xml:22773 ../source/book.xml:22834 ../source/book.xml:22904 +#: ../source/book.xml:17058 ../source/book.xml:17159 ../source/book.xml:17262 ../source/book.xml:17350 ../source/book.xml:17487 ../source/book.xml:17570 ../source/book.xml:17716 ../source/book.xml:17846 ../source/book.xml:18047 ../source/book.xml:18212 ../source/book.xml:18311 ../source/book.xml:18370 ../source/book.xml:18548 ../source/book.xml:18703 ../source/book.xml:18793 ../source/book.xml:18905 ../source/book.xml:19135 ../source/book.xml:19235 ../source/book.xml:19338 ../source/book.xml:19424 ../source/book.xml:19504 ../source/book.xml:19582 ../source/book.xml:19663 ../source/book.xml:19758 ../source/book.xml:19878 ../source/book.xml:19966 ../source/book.xml:20302 ../source/book.xml:20425 ../source/book.xml:20578 ../source/book.xml:20705 ../source/book.xml:21158 ../source/book.xml:22181 ../source/book.xml:22416 ../source/book.xml:22469 ../source/book.xml:22773 ../source/book.xml:22834 ../source/book.xml:22904 msgid "Alternate Names" msgstr "" #.(para) -#: ../source/book.xml:17072 ../source/book.xml:17276 ../source/book.xml:17501 ../source/book.xml:18226 ../source/book.xml:18384 ../source/book.xml:18562 ../source/book.xml:18807 ../source/book.xml:18919 ../source/book.xml:19149 ../source/book.xml:19249 ../source/book.xml:19892 ../source/book.xml:19980 ../source/book.xml:20592 ../source/book.xml:21388 ../source/book.xml:21550 ../source/book.xml:22327 ../source/book.xml:22775 +#: ../source/book.xml:17060 ../source/book.xml:17264 ../source/book.xml:17489 ../source/book.xml:18214 ../source/book.xml:18372 ../source/book.xml:18550 ../source/book.xml:18795 ../source/book.xml:18907 ../source/book.xml:19137 ../source/book.xml:19237 ../source/book.xml:19880 ../source/book.xml:19968 ../source/book.xml:20580 ../source/book.xml:21376 ../source/book.xml:21538 ../source/book.xml:22327 ../source/book.xml:22775 msgid "None" msgstr "" #.(title) -#: ../source/book.xml:17076 ../source/book.xml:17177 ../source/book.xml:17280 ../source/book.xml:17368 ../source/book.xml:17505 ../source/book.xml:17590 ../source/book.xml:17734 ../source/book.xml:17864 ../source/book.xml:18065 ../source/book.xml:18230 ../source/book.xml:18332 ../source/book.xml:18388 ../source/book.xml:18566 ../source/book.xml:18721 ../source/book.xml:18811 ../source/book.xml:18923 ../source/book.xml:19153 ../source/book.xml:19253 ../source/book.xml:19356 ../source/book.xml:19442 ../source/book.xml:19522 ../source/book.xml:19600 ../source/book.xml:19681 ../source/book.xml:19776 ../source/book.xml:19896 ../source/book.xml:19984 ../source/book.xml:20320 ../source/book.xml:20443 ../source/book.xml:20596 ../source/book.xml:20723 +#: ../source/book.xml:17064 ../source/book.xml:17165 ../source/book.xml:17268 ../source/book.xml:17356 ../source/book.xml:17493 ../source/book.xml:17578 ../source/book.xml:17722 ../source/book.xml:17852 ../source/book.xml:18053 ../source/book.xml:18218 ../source/book.xml:18320 ../source/book.xml:18376 ../source/book.xml:18554 ../source/book.xml:18709 ../source/book.xml:18799 ../source/book.xml:18911 ../source/book.xml:19141 ../source/book.xml:19241 ../source/book.xml:19344 ../source/book.xml:19430 ../source/book.xml:19510 ../source/book.xml:19588 ../source/book.xml:19669 ../source/book.xml:19764 ../source/book.xml:19884 ../source/book.xml:19972 ../source/book.xml:20308 ../source/book.xml:20431 ../source/book.xml:20584 ../source/book.xml:20711 msgid "Changes" msgstr "" #.(para) -#: ../source/book.xml:17078 +#: ../source/book.xml:17066 msgid "Working Copy" msgstr "" #.(title) -#: ../source/book.xml:17082 ../source/book.xml:17183 ../source/book.xml:17286 ../source/book.xml:17374 ../source/book.xml:17511 ../source/book.xml:17596 ../source/book.xml:17741 ../source/book.xml:17871 ../source/book.xml:18071 ../source/book.xml:18236 ../source/book.xml:18338 ../source/book.xml:18394 ../source/book.xml:18572 ../source/book.xml:18727 ../source/book.xml:18817 ../source/book.xml:18929 ../source/book.xml:19159 ../source/book.xml:19259 ../source/book.xml:19362 ../source/book.xml:19448 ../source/book.xml:19528 ../source/book.xml:19606 ../source/book.xml:19687 ../source/book.xml:19782 ../source/book.xml:19902 ../source/book.xml:19990 ../source/book.xml:20326 ../source/book.xml:20449 ../source/book.xml:20602 ../source/book.xml:20729 +#: ../source/book.xml:17070 ../source/book.xml:17171 ../source/book.xml:17274 ../source/book.xml:17362 ../source/book.xml:17499 ../source/book.xml:17584 ../source/book.xml:17729 ../source/book.xml:17859 ../source/book.xml:18059 ../source/book.xml:18224 ../source/book.xml:18326 ../source/book.xml:18382 ../source/book.xml:18560 ../source/book.xml:18715 ../source/book.xml:18805 ../source/book.xml:18917 ../source/book.xml:19147 ../source/book.xml:19247 ../source/book.xml:19350 ../source/book.xml:19436 ../source/book.xml:19516 ../source/book.xml:19594 ../source/book.xml:19675 ../source/book.xml:19770 ../source/book.xml:19890 ../source/book.xml:19978 ../source/book.xml:20314 ../source/book.xml:20437 ../source/book.xml:20590 ../source/book.xml:20717 msgid "Accesses Repository" msgstr "" #.(para) -#: ../source/book.xml:17084 ../source/book.xml:17513 ../source/book.xml:18340 ../source/book.xml:19904 ../source/book.xml:19992 +#: ../source/book.xml:17072 ../source/book.xml:17501 ../source/book.xml:18328 ../source/book.xml:19892 ../source/book.xml:19980 msgid "No" msgstr "" #.(title) -#: ../source/book.xml:17088 ../source/book.xml:17189 ../source/book.xml:17292 ../source/book.xml:17380 ../source/book.xml:17517 ../source/book.xml:17602 ../source/book.xml:17748 ../source/book.xml:17877 ../source/book.xml:18078 ../source/book.xml:18242 ../source/book.xml:18344 ../source/book.xml:18400 ../source/book.xml:18578 ../source/book.xml:18733 ../source/book.xml:18823 ../source/book.xml:18935 ../source/book.xml:19165 ../source/book.xml:19265 ../source/book.xml:19368 ../source/book.xml:19454 ../source/book.xml:19534 ../source/book.xml:19612 ../source/book.xml:19693 ../source/book.xml:19788 ../source/book.xml:19908 ../source/book.xml:19996 ../source/book.xml:20332 ../source/book.xml:20455 ../source/book.xml:20608 ../source/book.xml:20735 ../source/book.xml:20973 ../source/book.xml:21031 ../source/book.xml:21106 ../source/book.xml:21207 ../source/book.xml:21327 ../source/book.xml:21386 ../source/book.xml:21475 ../source/book.xml:21548 ../source/book.xml:21592 ../source/book.xml:21652 ../source/book.xml:21832 ../source/book.xml:21875 ../source/book.xml:21968 ../source/book.xml:22021 ../source/book.xml:22065 ../source/book.xml:22135 ../source/book.xml:22214 ../source/book.xml:22275 ../source/book.xml:22325 ../source/book.xml:22371 ../source/book.xml:22422 ../source/book.xml:22475 ../source/book.xml:22532 ../source/book.xml:22779 ../source/book.xml:22840 ../source/book.xml:22910 ../source/book.xml:23157 +#: ../source/book.xml:17076 ../source/book.xml:17177 ../source/book.xml:17280 ../source/book.xml:17368 ../source/book.xml:17505 ../source/book.xml:17590 ../source/book.xml:17736 ../source/book.xml:17865 ../source/book.xml:18066 ../source/book.xml:18230 ../source/book.xml:18332 ../source/book.xml:18388 ../source/book.xml:18566 ../source/book.xml:18721 ../source/book.xml:18811 ../source/book.xml:18923 ../source/book.xml:19153 ../source/book.xml:19253 ../source/book.xml:19356 ../source/book.xml:19442 ../source/book.xml:19522 ../source/book.xml:19600 ../source/book.xml:19681 ../source/book.xml:19776 ../source/book.xml:19896 ../source/book.xml:19984 ../source/book.xml:20320 ../source/book.xml:20443 ../source/book.xml:20596 ../source/book.xml:20723 ../source/book.xml:20961 ../source/book.xml:21019 ../source/book.xml:21094 ../source/book.xml:21195 ../source/book.xml:21315 ../source/book.xml:21374 ../source/book.xml:21463 ../source/book.xml:21536 ../source/book.xml:21580 ../source/book.xml:21640 ../source/book.xml:21832 ../source/book.xml:21875 ../source/book.xml:21968 ../source/book.xml:22021 ../source/book.xml:22065 ../source/book.xml:22135 ../source/book.xml:22214 ../source/book.xml:22275 ../source/book.xml:22325 ../source/book.xml:22371 ../source/book.xml:22422 ../source/book.xml:22475 ../source/book.xml:22532 ../source/book.xml:22779 ../source/book.xml:22840 ../source/book.xml:22910 ../source/book.xml:23157 msgid "Options" msgstr "" #.(screen) -#: ../source/book.xml:17090 +#: ../source/book.xml:17078 #, no-wrap msgid "\n--targets FILENAME\n--non-recursive (-N)\n--quiet (-q)\n--config-dir DIR\n--no-ignore\n--auto-props\n--no-auto-props\n--force\n" msgstr "" #.(title) -#: ../source/book.xml:17103 ../source/book.xml:17229 ../source/book.xml:17305 ../source/book.xml:17396 ../source/book.xml:17526 ../source/book.xml:17622 ../source/book.xml:17767 ../source/book.xml:17897 ../source/book.xml:18102 ../source/book.xml:18260 ../source/book.xml:18422 ../source/book.xml:18595 ../source/book.xml:18750 ../source/book.xml:18841 ../source/book.xml:18955 ../source/book.xml:19186 ../source/book.xml:19283 ../source/book.xml:19388 ../source/book.xml:19470 ../source/book.xml:19550 ../source/book.xml:19628 ../source/book.xml:19710 ../source/book.xml:19808 ../source/book.xml:19919 ../source/book.xml:20007 ../source/book.xml:20350 ../source/book.xml:20472 ../source/book.xml:20622 ../source/book.xml:20754 ../source/book.xml:20984 ../source/book.xml:21117 ../source/book.xml:21285 ../source/book.xml:21435 ../source/book.xml:21483 ../source/book.xml:21600 ../source/book.xml:21661 ../source/book.xml:21706 ../source/book.xml:21841 ../source/book.xml:21884 ../source/book.xml:21977 ../source/book.xml:22030 ../source/book.xml:22076 ../source/book.xml:22144 ../source/book.xml:22223 ../source/book.xml:22284 ../source/book.xml:22331 ../source/book.xml:22380 ../source/book.xml:22432 ../source/book.xml:22486 ../source/book.xml:22542 ../source/book.xml:22588 ../source/book.xml:22620 ../source/book.xml:22791 ../source/book.xml:22852 ../source/book.xml:22922 ../source/book.xml:23195 +#: ../source/book.xml:17091 ../source/book.xml:17217 ../source/book.xml:17293 ../source/book.xml:17384 ../source/book.xml:17514 ../source/book.xml:17610 ../source/book.xml:17755 ../source/book.xml:17885 ../source/book.xml:18090 ../source/book.xml:18248 ../source/book.xml:18410 ../source/book.xml:18583 ../source/book.xml:18738 ../source/book.xml:18829 ../source/book.xml:18943 ../source/book.xml:19174 ../source/book.xml:19271 ../source/book.xml:19376 ../source/book.xml:19458 ../source/book.xml:19538 ../source/book.xml:19616 ../source/book.xml:19698 ../source/book.xml:19796 ../source/book.xml:19907 ../source/book.xml:19995 ../source/book.xml:20338 ../source/book.xml:20460 ../source/book.xml:20610 ../source/book.xml:20742 ../source/book.xml:20972 ../source/book.xml:21105 ../source/book.xml:21273 ../source/book.xml:21423 ../source/book.xml:21471 ../source/book.xml:21588 ../source/book.xml:21649 ../source/book.xml:21694 ../source/book.xml:21841 ../source/book.xml:21884 ../source/book.xml:21977 ../source/book.xml:22030 ../source/book.xml:22076 ../source/book.xml:22144 ../source/book.xml:22223 ../source/book.xml:22284 ../source/book.xml:22331 ../source/book.xml:22380 ../source/book.xml:22432 ../source/book.xml:22486 ../source/book.xml:22542 ../source/book.xml:22588 ../source/book.xml:22620 ../source/book.xml:22791 ../source/book.xml:22852 ../source/book.xml:22922 ../source/book.xml:23195 msgid "Examples" msgstr "" #.(para) -#: ../source/book.xml:17105 +#: ../source/book.xml:17093 msgid "To add a file to your working copy:" msgstr "" #.(screen) -#: ../source/book.xml:17106 +#: ../source/book.xml:17094 #, no-wrap msgid "\n$ svn add foo.c \nA foo.c\n" msgstr "" #.(para) -#: ../source/book.xml:17110 +#: ../source/book.xml:17098 msgid "When adding a directory, the default behavior of svn add is to recurse:" msgstr "" #.(screen) -#: ../source/book.xml:17112 +#: ../source/book.xml:17100 #, no-wrap msgid "\n$ svn add testdir\nA testdir\nA testdir/a\nA testdir/b\nA testdir/c\nA testdir/d\n" msgstr "" #.(para) -#: ../source/book.xml:17120 +#: ../source/book.xml:17108 msgid "You can add a directory without adding its contents:" msgstr "" #.(screen) -#: ../source/book.xml:17122 +#: ../source/book.xml:17110 #, no-wrap msgid "\n$ svn add --non-recursive otherdir\nA otherdir\n" msgstr "" #.(para) -#: ../source/book.xml:17126 +#: ../source/book.xml:17114 msgid "Normally, the command svn add * 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 down. Passing the option makes svn add recurse into versioned directories:" msgstr "" #.(screen) -#: ../source/book.xml:17134 +#: ../source/book.xml:17122 #, no-wrap msgid "\n$ svn add * --force\nA foo.c\nA somedir/bar.c\nA otherdir/docs/baz.doc\n…\n" msgstr "" #.(tertiary) -#: ../source/book.xml:17147 +#: ../source/book.xml:17135 msgid "blame" msgstr "" #.(refname) -#: ../source/book.xml:17150 +#: ../source/book.xml:17138 msgid "svn blame" msgstr "" #.(refpurpose) -#: ../source/book.xml:17151 +#: ../source/book.xml:17139 msgid "Show author and revision information in-line for the specified files or URLs." msgstr "" #.(programlisting) -#: ../source/book.xml:17158 +#: ../source/book.xml:17146 #, no-wrap msgid "svn blame TARGET[@REV]..." msgstr "" #.(para) -#: ../source/book.xml:17164 +#: ../source/book.xml:17152 msgid "Show author and revision information in-line 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 "" #.(para) -#: ../source/book.xml:17173 +#: ../source/book.xml:17161 msgid "praise, annotate, ann" msgstr "" #.(para) -#: ../source/book.xml:17179 ../source/book.xml:17282 ../source/book.xml:18067 ../source/book.xml:18334 ../source/book.xml:18568 ../source/book.xml:18723 ../source/book.xml:18925 ../source/book.xml:20322 +#: ../source/book.xml:17167 ../source/book.xml:17270 ../source/book.xml:18055 ../source/book.xml:18322 ../source/book.xml:18556 ../source/book.xml:18711 ../source/book.xml:18913 ../source/book.xml:20310 msgid "Nothing" msgstr "" #.(para) -#: ../source/book.xml:17185 ../source/book.xml:17288 ../source/book.xml:17376 ../source/book.xml:17598 ../source/book.xml:18396 ../source/book.xml:18729 ../source/book.xml:18819 ../source/book.xml:18931 ../source/book.xml:20451 ../source/book.xml:20604 ../source/book.xml:20731 +#: ../source/book.xml:17173 ../source/book.xml:17276 ../source/book.xml:17364 ../source/book.xml:17586 ../source/book.xml:18384 ../source/book.xml:18717 ../source/book.xml:18807 ../source/book.xml:18919 ../source/book.xml:20439 ../source/book.xml:20592 ../source/book.xml:20719 msgid "Yes" msgstr "" #.(screen) -#: ../source/book.xml:17191 +#: ../source/book.xml:17179 #, no-wrap msgid "\n--revision (-r) ARG\n--verbose (-v)\n--incremental\n--xml\n--extensions (-x) ARG\n--force\n--username ARG\n--password ARG\n--no-auth-cache\n--non-interactive\n--config-dir ARG\n" msgstr "" #.(para) -#: ../source/book.xml:17231 +#: ../source/book.xml:17219 msgid "If you want to see blame annotated source for readme.txt in your test repository:" msgstr "" #.(screen) -#: ../source/book.xml:17234 +#: ../source/book.xml:17222 #, 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 "" #.(para) -#: ../source/book.xml:17239 +#: ../source/book.xml:17227 msgid "Even if svn blame says that Harry last modified readme.txt in revision 5, you'll have to examine exactly what the revision changed to be sure that Harry changed the context of the line—he may have just adjusted the whitespace." msgstr "" #.(tertiary) -#: ../source/book.xml:17251 ../source/book.xml:21855 +#: ../source/book.xml:17239 ../source/book.xml:21855 msgid "cat" msgstr "" #.(refpurpose) -#: ../source/book.xml:17255 +#: ../source/book.xml:17243 msgid "Output the contents of the specified files or URLs." msgstr "" #.(programlisting) -#: ../source/book.xml:17262 +#: ../source/book.xml:17250 #, no-wrap msgid "svn cat TARGET[@REV]..." msgstr "" #.(para) -#: ../source/book.xml:17268 +#: ../source/book.xml:17256 msgid "Output the contents of the specified files or URLs. For listing the contents of directories, see svn list." msgstr "" #.(screen) -#: ../source/book.xml:17294 +#: ../source/book.xml:17282 #, no-wrap msgid "\n--revision (-r) REV\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:17307 +#: ../source/book.xml:17295 msgid "If you want to view readme.txt in your repository without checking it out:" msgstr "" #.(screen) -#: ../source/book.xml:17309 +#: ../source/book.xml:17297 #, no-wrap msgid "\n$ svn cat http://svn.red-bean.com/repos/test/readme.txt\nThis is a README file.\nYou should read this.\n" msgstr "" #.(para) -#: ../source/book.xml:17315 +#: ../source/book.xml:17303 msgid "If your working copy is out of date (or you have local modifications) and you want to see the HEAD revision of a file in your working copy, svn cat -r HEAD will automatically fetch the HEAD revision when you give it a path:" msgstr "" #.(screen) -#: ../source/book.xml:17322 +#: ../source/book.xml:17310 #, no-wrap msgid "\n$ cat foo.c\nThis file is in my local working copy \nand has changes that I've made.\n\n$ svn cat -r HEAD foo.c\nLatest revision fresh from the repository!\n" msgstr "" #.(tertiary) -#: ../source/book.xml:17336 +#: ../source/book.xml:17324 msgid "checkout" msgstr "" #.(refname) -#: ../source/book.xml:17339 +#: ../source/book.xml:17327 msgid "svn checkout" msgstr "" #.(refpurpose) -#: ../source/book.xml:17340 +#: ../source/book.xml:17328 msgid "Check out a working copy from a repository." msgstr "" #.(programlisting) -#: ../source/book.xml:17346 +#: ../source/book.xml:17334 #, no-wrap msgid "svn checkout URL[@REV]... [PATH]" msgstr "" #.(para) -#: ../source/book.xml:17352 +#: ../source/book.xml:17340 msgid "Check out a working copy from a repository. If PATH 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 PATH, with the name of the subdirectory being the basename of the URL." msgstr "" #.(para) -#: ../source/book.xml:17364 +#: ../source/book.xml:17352 msgid "co" msgstr "" #.(para) -#: ../source/book.xml:17370 +#: ../source/book.xml:17358 msgid "Creates a working copy." msgstr "" #.(screen) -#: ../source/book.xml:17382 +#: ../source/book.xml:17370 #, no-wrap msgid "\n--revision (-r) REV\n--quiet (-q)\n--non-recursive (-N)\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--ignore-externals\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:17398 +#: ../source/book.xml:17386 msgid "Check out a working copy into a directory called mine:" msgstr "" #.(screen) -#: ../source/book.xml:17400 +#: ../source/book.xml:17388 #, no-wrap msgid "\n$ svn checkout file:///tmp/repos/test mine\nA mine/a\nA mine/b\nChecked out revision 2.\n$ ls\nmine\n" msgstr "" #.(para) -#: ../source/book.xml:17408 +#: ../source/book.xml:17396 msgid "Check out two different directories into two separate working copies:" msgstr "" #.(screen) -#: ../source/book.xml:17410 +#: ../source/book.xml:17398 #, no-wrap msgid "\n$ svn checkout file:///tmp/repos/test file:///tmp/repos/quiz\nA test/a\nA test/b\nChecked out revision 2.\nA quiz/l\nA quiz/m\nChecked out revision 2.\n$ ls\nquiz test\n" msgstr "" #.(para) -#: ../source/book.xml:17421 +#: ../source/book.xml:17409 msgid "Check out two different directories into two separate working copies, but place both into a directory called working-copies:" msgstr "" #.(screen) -#: ../source/book.xml:17424 +#: ../source/book.xml:17412 #, no-wrap msgid "\n$ svn checkout file:///tmp/repos/test file:///tmp/repos/quiz working-copies\nA working-copies/test/a\nA working-copies/test/b\nChecked out revision 2.\nA working-copies/quiz/l\nA working-copies/quiz/m\nChecked out revision 2.\n$ ls\nworking-copies\n" msgstr "" #.(para) -#: ../source/book.xml:17435 +#: ../source/book.xml:17423 msgid "If you interrupt a checkout (or something else interrupts your checkout, like loss of connectivity, etc.), you can restart it either by issuing the identical checkout command again, or by updating the incomplete working copy:" msgstr "" #.(screen) -#: ../source/book.xml:17440 +#: ../source/book.xml:17428 #, no-wrap msgid "\n$ svn checkout file:///tmp/repos/test test\nA test/a\nA test/b\n^C\nsvn: The operation was interrupted\nsvn: caught SIGINT\n\n$ svn checkout file:///tmp/repos/test test\nA test/c\nA test/d\n^C\nsvn: The operation was interrupted\nsvn: caught SIGINT\n\n$ cd test\n$ svn update\nA test/e\nA test/f\nUpdated to revision 3.\n" msgstr "" #.(tertiary) -#: ../source/book.xml:17467 +#: ../source/book.xml:17455 msgid "cleanup" msgstr "" #.(refname) -#: ../source/book.xml:17470 +#: ../source/book.xml:17458 msgid "svn cleanup" msgstr "" #.(refpurpose) -#: ../source/book.xml:17471 +#: ../source/book.xml:17459 msgid "Recursively clean up the working copy." msgstr "" #.(programlisting) -#: ../source/book.xml:17477 +#: ../source/book.xml:17465 #, no-wrap msgid "svn cleanup [PATH...]" msgstr "" #.(para) -#: ../source/book.xml:17483 +#: ../source/book.xml:17471 msgid "Recursively clean up the working copy, removing working copy locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again." msgstr "" #.(para) -#: ../source/book.xml:17488 +#: ../source/book.xml:17476 msgid "If, for some reason, an svn update fails due to a problem running an external diff program (e.g. user input or network failure), pass the to allow cleanup to complete any merging with your external diff program. You can also specify any configuration directory with the option, but you should need these options extremely infrequently." msgstr "" #.(para) -#: ../source/book.xml:17507 ../source/book.xml:19155 ../source/book.xml:19898 ../source/book.xml:19986 ../source/book.xml:20445 ../source/book.xml:20725 +#: ../source/book.xml:17495 ../source/book.xml:19143 ../source/book.xml:19886 ../source/book.xml:19974 ../source/book.xml:20433 ../source/book.xml:20713 msgid "Working copy" msgstr "" #.(screen) -#: ../source/book.xml:17519 +#: ../source/book.xml:17507 #, no-wrap msgid "\n--diff3-cmd CMD\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:17528 +#: ../source/book.xml:17516 msgid "Well, there's not much to the examples here as svn cleanup generates no output. If you pass no PATH, . is used." msgstr "" #.(screen) -#: ../source/book.xml:17532 +#: ../source/book.xml:17520 #, no-wrap msgid "\n$ svn cleanup\n\n$ svn cleanup /path/to/working-copy\n" msgstr "" #.(tertiary) -#: ../source/book.xml:17543 +#: ../source/book.xml:17531 msgid "commit" msgstr "" #.(refpurpose) -#: ../source/book.xml:17547 +#: ../source/book.xml:17535 msgid "Send changes from your working copy to the repository." msgstr "" #.(programlisting) -#: ../source/book.xml:17553 +#: ../source/book.xml:17541 #, no-wrap msgid "svn commit [PATH...]" msgstr "" #.(para) -#: ../source/book.xml:17559 +#: ../source/book.xml:17547 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 or option, svn will launch your editor for you to compose a commit message. See the editor-cmd section in ." msgstr "" #.(para) -#: ../source/book.xml:17566 +#: ../source/book.xml:17554 msgid "svn commit will send any lock tokens that it finds and will release locks on all PATHS committed (recursively), unless is passed." msgstr "" #.(para) -#: ../source/book.xml:17571 +#: ../source/book.xml:17559 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 "" #.(para) -#: ../source/book.xml:17584 +#: ../source/book.xml:17572 msgid "ci (short for check in; not co, which is short for checkout)" msgstr "" #.(para) -#: ../source/book.xml:17592 +#: ../source/book.xml:17580 msgid "Working copy, repository" msgstr "" #.(screen) -#: ../source/book.xml:17604 +#: ../source/book.xml:17592 #, no-wrap msgid "\n--message (-m) TEXT\n--file (-F) FILE\n--quiet (-q)\n--no-unlock\n--non-recursive (-N)\n--targets FILENAME\n--force-log\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--encoding ENC\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:17624 +#: ../source/book.xml:17612 msgid "Commit a simple modification to a file with the commit message on the command line and an implicit target of your current directory (.):" msgstr "" #.(screen) -#: ../source/book.xml:17628 +#: ../source/book.xml:17616 #, no-wrap msgid "\n$ svn commit -m \"added howto section.\"\nSending a\nTransmitting file data .\nCommitted revision 3.\n" msgstr "" #.(para) -#: ../source/book.xml:17634 +#: ../source/book.xml:17622 msgid "Commit a modification to the file foo.c (explicitly specified on the command line) with the commit message in a file named msg:" msgstr "" #.(screen) -#: ../source/book.xml:17638 +#: ../source/book.xml:17626 #, no-wrap msgid "\n$ svn commit -F msg foo.c\nSending foo.c\nTransmitting file data .\nCommitted revision 5.\n" msgstr "" #.(para) -#: ../source/book.xml:17644 +#: ../source/book.xml:17632 msgid "If you want to use a file that's under version control for your commit message with , you need to pass the option:" msgstr "" #.(screen) -#: ../source/book.xml:17648 +#: ../source/book.xml:17636 #, no-wrap msgid "\n$ svn commit --file file_under_vc.txt foo.c\nsvn: The log message file is under version control\nsvn: 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\nSending foo.c\nTransmitting file data .\nCommitted revision 6.\n" msgstr "" #.(para) -#: ../source/book.xml:17658 +#: ../source/book.xml:17646 msgid "To commit a file scheduled for deletion:" msgstr "" #.(screen) -#: ../source/book.xml:17659 +#: ../source/book.xml:17647 #, no-wrap msgid "\n$ svn commit -m \"removed file 'c'.\"\nDeleting c\n\nCommitted revision 7.\n" msgstr "" #.(tertiary) -#: ../source/book.xml:17671 +#: ../source/book.xml:17659 msgid "copy" msgstr "" #.(refpurpose) -#: ../source/book.xml:17675 +#: ../source/book.xml:17663 msgid "Copy a file or directory in a working copy or in the repository." msgstr "" #.(programlisting) -#: ../source/book.xml:17682 +#: ../source/book.xml:17670 #, no-wrap msgid "svn copy SRC DST" msgstr "" #.(para) -#: ../source/book.xml:17688 +#: ../source/book.xml:17676 msgid "Copy a file in a working copy or in the repository. SRC and DST can each be either a working copy (WC) path or URL:" msgstr "" #.(term) -#: ../source/book.xml:17694 ../source/book.xml:19334 +#: ../source/book.xml:17682 ../source/book.xml:19322 msgid "WC -> WC" msgstr "" #.(para) -#: ../source/book.xml:17696 +#: ../source/book.xml:17684 msgid "Copy and schedule an item for addition (with history)." msgstr "" #.(term) -#: ../source/book.xml:17701 +#: ../source/book.xml:17689 msgid "WC -> URL" msgstr "" #.(para) -#: ../source/book.xml:17703 +#: ../source/book.xml:17691 msgid "Immediately commit a copy of WC to URL." msgstr "" #.(term) -#: ../source/book.xml:17707 +#: ../source/book.xml:17695 msgid "URL -> WC" msgstr "" #.(para) -#: ../source/book.xml:17709 +#: ../source/book.xml:17697 msgid "Check out URL into WC, and schedule it for addition." msgstr "" #.(term) -#: ../source/book.xml:17714 ../source/book.xml:19341 +#: ../source/book.xml:17702 ../source/book.xml:19329 msgid "URL -> URL" msgstr "" #.(para) -#: ../source/book.xml:17716 +#: ../source/book.xml:17704 msgid "Complete server-side copy. This is usually used to branch and tag." msgstr "" #.(para) -#: ../source/book.xml:17722 +#: ../source/book.xml:17710 msgid "You can only copy files within a single repository. Subversion does not support cross-repository copying." msgstr "" #.(para) -#: ../source/book.xml:17730 +#: ../source/book.xml:17718 msgid "cp" msgstr "" #.(para) -#: ../source/book.xml:17736 +#: ../source/book.xml:17724 msgid "Repository if destination is a URL." msgstr "" #.(para) -#: ../source/book.xml:17737 +#: ../source/book.xml:17725 msgid "Working copy if destination is a WC path." msgstr "" #.(para) -#: ../source/book.xml:17743 +#: ../source/book.xml:17731 msgid "If source or destination is in the repository, or if needed to look up the source revision number." msgstr "" #.(screen) -#: ../source/book.xml:17750 +#: ../source/book.xml:17738 #, no-wrap msgid "\n--message (-m) TEXT\n--file (-F) FILE\n--revision (-r) REV\n--quiet (-q)\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--force-log\n--editor-cmd EDITOR\n--encoding ENC\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:17769 +#: ../source/book.xml:17757 msgid "Copy an item within your working copy (just schedules the copy—nothing goes into the repository until you commit):" msgstr "" #.(screen) -#: ../source/book.xml:17772 +#: ../source/book.xml:17760 #, no-wrap msgid "\n$ svn copy foo.txt bar.txt\nA bar.txt\n$ svn status\nA + bar.txt\n" msgstr "" #.(para) -#: ../source/book.xml:17778 +#: ../source/book.xml:17766 msgid "Copy an item in your working copy to a URL in the repository (an immediate commit, so you must supply a commit message):" msgstr "" #.(screen) -#: ../source/book.xml:17781 +#: ../source/book.xml:17769 #, no-wrap msgid "\n$ svn copy near.txt file:///tmp/repos/test/far-away.txt -m \"Remote copy.\"\n\nCommitted revision 8.\n" msgstr "" #.(para) -#: ../source/book.xml:17786 +#: ../source/book.xml:17774 msgid "Copy an item from the repository to your working copy (just schedules the copy—nothing goes into the repository until you commit):" msgstr "" #.(para) -#: ../source/book.xml:17790 +#: ../source/book.xml:17778 msgid "This is the recommended way to resurrect a dead file in your repository!" msgstr "" #.(screen) -#: ../source/book.xml:17793 +#: ../source/book.xml:17781 #, no-wrap msgid "\n$ svn copy file:///tmp/repos/test/far-away near-here\nA near-here\n" msgstr "" #.(para) -#: ../source/book.xml:17797 +#: ../source/book.xml:17785 msgid "And finally, copying between two URLs:" msgstr "" #.(screen) -#: ../source/book.xml:17798 +#: ../source/book.xml:17786 #, no-wrap msgid "\n$ svn copy file:///tmp/repos/test/far-away file:///tmp/repos/test/over-there -m \"remote copy.\"\n\nCommitted revision 9.\n" msgstr "" #.(para) -#: ../source/book.xml:17804 +#: ../source/book.xml:17792 msgid "This is the easiest way to tag a revision in your repository—just svn copy that revision (usually HEAD) into your tags directory." msgstr "" #.(screen) -#: ../source/book.xml:17809 +#: ../source/book.xml:17797 #, no-wrap msgid "\n$ svn copy file:///tmp/repos/test/trunk file:///tmp/repos/test/tags/0.6.32-prerelease -m \"tag tree\"\n\nCommitted revision 12.\n" msgstr "" #.(para) -#: ../source/book.xml:17814 +#: ../source/book.xml:17802 msgid "And don't worry if you forgot to tag—you can always specify an older revision and tag anytime:" msgstr "" #.(screen) -#: ../source/book.xml:17816 +#: ../source/book.xml:17804 #, no-wrap msgid "\n$ svn copy -r 11 file:///tmp/repos/test/trunk file:///tmp/repos/test/tags/0.6.32-prerelease -m \"Forgot to tag at rev 11\"\n\nCommitted revision 13.\n" msgstr "" #.(tertiary) -#: ../source/book.xml:17827 +#: ../source/book.xml:17815 msgid "delete" msgstr "" #.(refpurpose) -#: ../source/book.xml:17831 +#: ../source/book.xml:17819 msgid "Delete an item from a working copy or the repository." msgstr "" #.(programlisting) -#: ../source/book.xml:17838 +#: ../source/book.xml:17826 #, no-wrap msgid "svn delete PATH..." msgstr "" #.(programlisting) -#: ../source/book.xml:17839 +#: ../source/book.xml:17827 #, no-wrap msgid "svn delete URL..." msgstr "" #.(para) -#: ../source/book.xml:17845 +#: ../source/book.xml:17833 msgid "Items specified by PATH are scheduled for deletion upon the next commit. Files (and directories that have not been committed) are immediately removed from the working copy. The command will not remove any unversioned or modified items; use the option to override this behavior." msgstr "" #.(para) -#: ../source/book.xml:17852 +#: ../source/book.xml:17840 msgid "Items specified by URL are deleted from the repository via an immediate commit. Multiple URLs are committed atomically." msgstr "" #.(para) -#: ../source/book.xml:17860 +#: ../source/book.xml:17848 msgid "del, remove, rm" msgstr "" #.(para) -#: ../source/book.xml:17866 +#: ../source/book.xml:17854 msgid "Working copy if operating on files, repository if operating on URLs" msgstr "" #.(para) -#: ../source/book.xml:17873 ../source/book.xml:18574 +#: ../source/book.xml:17861 ../source/book.xml:18562 msgid "Only if operating on URLs" msgstr "" #.(screen) -#: ../source/book.xml:17879 +#: ../source/book.xml:17867 #, no-wrap msgid "\n--force\n--force-log\n--message (-m) TEXT\n--file (-F) FILE\n--quiet (-q)\n--targets FILENAME\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--editor-cmd EDITOR\n--encoding ENC\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:17899 +#: ../source/book.xml:17887 msgid "Using svn to delete a file from your working copy deletes your local copy of the file, but merely schedules it to be deleted from the repository. When you commit, the file is deleted in the repository." msgstr "" #.(screen) -#: ../source/book.xml:17904 +#: ../source/book.xml:17892 #, no-wrap msgid "\n$ svn delete myfile\nD myfile\n\n$ svn commit -m \"Deleted file 'myfile'.\"\nDeleting myfile\nTransmitting file data .\nCommitted revision 14.\n" msgstr "" #.(para) -#: ../source/book.xml:17913 +#: ../source/book.xml:17901 msgid "Deleting a URL, however, is immediate, so you have to supply a log message:" msgstr "" #.(screen) -#: ../source/book.xml:17915 +#: ../source/book.xml:17903 #, no-wrap msgid "\n$ svn delete -m \"Deleting file 'yourfile'\" file:///tmp/repos/test/yourfile\n\nCommitted revision 15.\n" msgstr "" #.(para) -#: ../source/book.xml:17920 +#: ../source/book.xml:17908 msgid "Here's an example of how to force deletion of a file that has local mods:" msgstr "" #.(screen) -#: ../source/book.xml:17922 +#: ../source/book.xml:17910 #, no-wrap msgid "\n$ svn delete over-there \nsvn: Attempting restricted operation for modified resource\nsvn: Use --force to override this restriction\nsvn: 'over-there' has local modifications\n\n$ svn delete --force over-there \nD over-there\n" msgstr "" #.(tertiary) -#: ../source/book.xml:17937 ../source/book.xml:22044 +#: ../source/book.xml:17925 ../source/book.xml:22044 msgid "diff" msgstr "" #.(refpurpose) -#: ../source/book.xml:17941 +#: ../source/book.xml:17929 msgid "Display the differences between two revisions or paths." msgstr "" #.(programlisting) -#: ../source/book.xml:17947 +#: ../source/book.xml:17935 #, no-wrap msgid "diff [-c M | -r N[:M]] [TARGET[@REV]...]" msgstr "" #.(programlisting) -#: ../source/book.xml:17948 +#: ../source/book.xml:17936 #, no-wrap msgid "diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] [PATH...]" msgstr "" #.(programlisting) -#: ../source/book.xml:17949 +#: ../source/book.xml:17937 #, no-wrap msgid "diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]" msgstr "" #.(para) -#: ../source/book.xml:17955 +#: ../source/book.xml:17943 msgid "Display the differences between two paths. The ways you can use svn diff are:" msgstr "" #.(para) -#: ../source/book.xml:17957 +#: ../source/book.xml:17945 msgid "Use just svn diff'to display local modifications in a working copy." msgstr "" #.(para) -#: ../source/book.xml:17959 +#: ../source/book.xml:17947 msgid "Display the changes made to TARGETs as they are seen in REV between two revisions. TARGETs may be all working copy paths or all URLs. If TARGETs are working copy paths, N defaults to BASE and M to the working copy; if URLs, N must be specified and M defaults to HEAD. The -c M option is equivalent to -r N:M where N = M-1. Using -c -M does the reverse: -r M:N where N = M-1." msgstr "" #.(para) -#: ../source/book.xml:17975 +#: ../source/book.xml:17963 msgid "Display the differences between OLD-TGT as it was seen in OLDREV and NEW-TGT as it was seen ain NEWREV. PATHs, if given, are relative to OLD-TGT and NEW-TGT and restrict the output to differences for those paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default to N, -r N:M makes OLDREV default to N and NEWREV default to M." msgstr "" #.(para) -#: ../source/book.xml:17994 +#: ../source/book.xml:17982 msgid "Shorthand for svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]" msgstr "" #.(para) -#: ../source/book.xml:17996 +#: ../source/book.xml:17984 msgid "svn diff -r N:M URL is shorthand for svn diff -r N:M --old=URL --new=URL." msgstr "" #.(para) -#: ../source/book.xml:17999 +#: ../source/book.xml:17987 msgid "svn diff [-r N[:M]] URL1[@N] URL2[@M] is shorthand for svn diff [-r N[:M]] --old=URL1 --new=URL2." msgstr "" #.(para) -#: ../source/book.xml:18002 +#: ../source/book.xml:17990 msgid "If TARGET is a URL, then revs N and M can be given either via the or by using @ notation as described earlier." msgstr "" #.(para) -#: ../source/book.xml:18006 +#: ../source/book.xml:17994 msgid "If TARGET is a working copy path, then the option means:" msgstr "" #.(option) -#: ../source/book.xml:18012 +#: ../source/book.xml:18000 msgid "--revision N:M" msgstr "" #.(para) -#: ../source/book.xml:18015 +#: ../source/book.xml:18003 msgid "The server compares TARGET@N and TARGET@M." msgstr "" #.(option) -#: ../source/book.xml:18023 +#: ../source/book.xml:18011 msgid "--revision N" msgstr "" #.(para) -#: ../source/book.xml:18026 +#: ../source/book.xml:18014 msgid "The client compares TARGET@N against working copy." msgstr "" #.(term) -#: ../source/book.xml:18032 +#: ../source/book.xml:18020 msgid "(no )" msgstr "" #.(para) -#: ../source/book.xml:18034 +#: ../source/book.xml:18022 msgid "The client compares base and working copies of TARGET." msgstr "" #.(para) -#: ../source/book.xml:18039 +#: ../source/book.xml:18027 msgid "If the alternate syntax is used, the server compares URL1 and URL2 at revisions N and M respectively. If either N or M are omitted, a value of HEAD is assumed." msgstr "" #.(para) -#: ../source/book.xml:18047 +#: ../source/book.xml:18035 msgid "By default, svn diff ignores the ancestry of files and merely compares the contents of the two files being compared. If you use , the ancestry of the paths in question will be taken into consideration when comparing revisions (that is, if you run svn diff 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 "" #.(para) -#: ../source/book.xml:18061 +#: ../source/book.xml:18049 msgid "di" msgstr "" #.(para) -#: ../source/book.xml:18073 +#: ../source/book.xml:18061 msgid "For obtaining differences against anything but BASE revision in your working copy" msgstr "" #.(screen) -#: ../source/book.xml:18080 +#: ../source/book.xml:18068 #, no-wrap msgid "\n--revision (-r) ARG\n--change (-c) ARG\n--old ARG\n--new ARG\n--non-recursive (-N)\n--diff-cmd CMD\n--extensions (-x) \"ARGS\"\n--no-diff-deleted\n--notice-ancestry\n--summarize\n--force\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n\n" msgstr "" #.(para) -#: ../source/book.xml:18104 +#: ../source/book.xml:18092 msgid "Compare BASE and your working copy (one of the most popular uses of svn diff):" msgstr "" #.(screen) -#: ../source/book.xml:18107 +#: ../source/book.xml:18095 #, no-wrap msgid "\n$ svn diff COMMITTERS \nIndex: COMMITTERS\n===================================================================\n--- COMMITTERS\t(revision 4404)\n+++ COMMITTERS\t(working copy)\n" msgstr "" #.(para) -#: ../source/book.xml:18114 +#: ../source/book.xml:18102 msgid "See what changed in the file COMMITTERS revision 9115:" msgstr "" #.(screen) -#: ../source/book.xml:18116 +#: ../source/book.xml:18104 #, no-wrap msgid "\n$ svn diff -c 9115 COMMITTERS \nIndex: COMMITTERS\n===================================================================\n--- COMMITTERS\t(revision 3900)\n+++ COMMITTERS\t(working copy)\n" msgstr "" #.(para) -#: ../source/book.xml:18123 +#: ../source/book.xml:18111 msgid "See how your working copy's modifications compare against an older revision:" msgstr "" #.(screen) -#: ../source/book.xml:18125 +#: ../source/book.xml:18113 #, no-wrap msgid "\n$ svn diff -r 3900 COMMITTERS \nIndex: COMMITTERS\n===================================================================\n--- COMMITTERS\t(revision 3900)\n+++ COMMITTERS\t(working copy)\n" msgstr "" #.(para) -#: ../source/book.xml:18132 +#: ../source/book.xml:18120 msgid "Compare revision 3000 to revision 3500 using @ syntax:" msgstr "" #.(screen) -#: ../source/book.xml:18134 +#: ../source/book.xml:18122 #, no-wrap msgid "\n$ svn diff http://svn.collab.net/repos/svn/trunk/COMMITTERS@3000 http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500\nIndex: COMMITTERS\n===================================================================\n--- COMMITTERS\t(revision 3000)\n+++ COMMITTERS\t(revision 3500)\n…\n" msgstr "" #.(para) -#: ../source/book.xml:18142 +#: ../source/book.xml:18130 msgid "Compare revision 3000 to revision 3500 using range notation (you only pass the one URL in this case):" msgstr "" #.(screen) -#: ../source/book.xml:18145 +#: ../source/book.xml:18133 #, no-wrap msgid "\n$ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk/COMMITTERS\nIndex: COMMITTERS\n===================================================================\n--- COMMITTERS\t(revision 3000)\n+++ COMMITTERS\t(revision 3500)\n" msgstr "" #.(para) -#: ../source/book.xml:18152 +#: ../source/book.xml:18140 msgid "Compare revision 3000 to revision 3500 of all files in trunk using range notation:" msgstr "" #.(screen) -#: ../source/book.xml:18154 +#: ../source/book.xml:18142 #, no-wrap msgid "\n$ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk\n " msgstr "" #.(para) -#: ../source/book.xml:18157 +#: ../source/book.xml:18145 msgid "Compare revision 3000 to revision 3500 of only three files in trunk using range notation:" msgstr "" #.(screen) -#: ../source/book.xml:18160 +#: ../source/book.xml:18148 #, no-wrap msgid "\n$ svn diff -r 3000:3500 --old http://svn.collab.net/repos/svn/trunk COMMITTERS README HACKING\n " msgstr "" #.(para) -#: ../source/book.xml:18163 +#: ../source/book.xml:18151 msgid "If you have a working copy, you can obtain the differences without typing in the long URLs:" msgstr "" #.(screen) -#: ../source/book.xml:18165 +#: ../source/book.xml:18153 #, no-wrap msgid "\n$ svn diff -r 3000:3500 COMMITTERS \nIndex: COMMITTERS\n===================================================================\n--- COMMITTERS\t(revision 3000)\n+++ COMMITTERS\t(revision 3500)\n" msgstr "" #.(para) -#: ../source/book.xml:18172 +#: ../source/book.xml:18160 msgid "Use CMD to pass arguments directly to the external diff program" msgstr "" #.(screen) -#: ../source/book.xml:18176 +#: ../source/book.xml:18164 #, no-wrap msgid "\n$ svn diff --diff-cmd /usr/bin/diff -x \"-i -b\" COMMITTERS \nIndex: COMMITTERS\n===================================================================\n0a1,2\n> This is a test\n> \n" msgstr "" #.(tertiary) -#: ../source/book.xml:18190 +#: ../source/book.xml:18178 msgid "export" msgstr "" #.(refname) -#: ../source/book.xml:18193 +#: ../source/book.xml:18181 msgid "svn export" msgstr "" #.(refpurpose) -#: ../source/book.xml:18194 +#: ../source/book.xml:18182 msgid "Export a clean directory tree." msgstr "" #.(programlisting) -#: ../source/book.xml:18200 +#: ../source/book.xml:18188 #, no-wrap msgid "svn export [-r REV] URL[@PEGREV] [PATH]" msgstr "" #.(programlisting) -#: ../source/book.xml:18201 +#: ../source/book.xml:18189 #, no-wrap msgid "svn export [-r REV] PATH1[@PEGREV] [PATH2]" msgstr "" #.(para) -#: ../source/book.xml:18207 +#: ../source/book.xml:18195 msgid "The first form exports a clean directory tree from the repository specified by URL, at revision REV if it is given, otherwise at HEAD, into PATH. If PATH is omitted, the last component of the URL is used for the local directory name." msgstr "" #.(para) -#: ../source/book.xml:18215 +#: ../source/book.xml:18203 msgid "The second form exports a clean directory tree from the working copy specified by PATH1 into PATH2. All local changes will be preserved, but files not under version control will not be copied." msgstr "" #.(para) -#: ../source/book.xml:18232 +#: ../source/book.xml:18220 msgid "Local disk" msgstr "" #.(para) -#: ../source/book.xml:18238 +#: ../source/book.xml:18226 msgid "Only if exporting from a URL" msgstr "" #.(screen) -#: ../source/book.xml:18244 +#: ../source/book.xml:18232 #, no-wrap msgid "\n--revision (-r) REV\n--quiet (-q)\n--force\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--non-recursive (-N)\n--config-dir DIR\n--native-eol EOL\n--ignore-externals\n" msgstr "" #.(para) -#: ../source/book.xml:18262 +#: ../source/book.xml:18250 msgid "Export from your working copy (doesn't print every file and directory):" msgstr "" #.(screen) -#: ../source/book.xml:18264 +#: ../source/book.xml:18252 #, no-wrap msgid "\n$ svn export a-wc my-export\nExport complete.\n" msgstr "" #.(para) -#: ../source/book.xml:18268 +#: ../source/book.xml:18256 msgid "Export directly from the repository (prints every file and directory):" msgstr "" #.(screen) -#: ../source/book.xml:18270 +#: ../source/book.xml:18258 #, no-wrap msgid "\n$ svn export file:///tmp/repos my-export\nA my-export/test\nA my-export/quiz\n…\nExported revision 15.\n" msgstr "" #.(para) -#: ../source/book.xml:18277 +#: ../source/book.xml:18265 msgid "When rolling operating-system-specific release packages, it can be useful to export a tree which uses a specific EOL character for line endings. The option will do this, but it only affects files that have svn:eol-style = native properties attached to them. For example, to export a tree with all CRLF line endings (possibly for a Windows .zip file distribution):" msgstr "" #.(screen) -#: ../source/book.xml:18285 +#: ../source/book.xml:18273 #, no-wrap msgid "\n$ svn export file:///tmp/repos my-export --native-eol CRLF\nA my-export/test\nA my-export/quiz\n…\nExported revision 15.\n" msgstr "" #.(para) -#: ../source/book.xml:18292 +#: ../source/book.xml:18280 msgid "You can specify LR, CR, or CRLF as a line ending type with the option." msgstr "" #.(tertiary) -#: ../source/book.xml:18302 ../source/book.xml:21146 ../source/book.xml:22158 +#: ../source/book.xml:18290 ../source/book.xml:21134 ../source/book.xml:22158 msgid "help" msgstr "" #.(refname) -#: ../source/book.xml:18305 +#: ../source/book.xml:18293 msgid "svn help" msgstr "" #.(programlisting) -#: ../source/book.xml:18312 +#: ../source/book.xml:18300 #, no-wrap msgid "svn help [SUBCOMMAND...]" msgstr "" #.(para) -#: ../source/book.xml:18318 +#: ../source/book.xml:18306 msgid "This is your best friend when you're using Subversion and this book isn't within reach!" msgstr "" #.(para) -#: ../source/book.xml:18325 ../source/book.xml:21172 ../source/book.xml:22183 +#: ../source/book.xml:18313 ../source/book.xml:21160 ../source/book.xml:22183 msgid "?, h" msgstr "" #.(para) -#: ../source/book.xml:18326 +#: ../source/book.xml:18314 msgid "The options , and have the same effect as using the help subcommand." msgstr "" #.(screen) -#: ../source/book.xml:18346 +#: ../source/book.xml:18334 #, no-wrap msgid "\n--config-dir DIR\n" msgstr "" #.(tertiary) -#: ../source/book.xml:18355 +#: ../source/book.xml:18343 msgid "import" msgstr "" #.(refpurpose) -#: ../source/book.xml:18359 +#: ../source/book.xml:18347 msgid "Commit an unversioned file or tree into the repository." msgstr "" #.(programlisting) -#: ../source/book.xml:18366 +#: ../source/book.xml:18354 #, no-wrap msgid "svn import [PATH] URL" msgstr "" #.(para) -#: ../source/book.xml:18372 +#: ../source/book.xml:18360 msgid "Recursively commit a copy of PATH to URL. If PATH is omitted . is assumed. Parent directories are created in the repository as necessary." msgstr "" #.(para) -#: ../source/book.xml:18390 +#: ../source/book.xml:18378 msgid "Repository" msgstr "" #.(screen) -#: ../source/book.xml:18402 +#: ../source/book.xml:18390 #, no-wrap msgid "\n--message (-m) TEXT\n--file (-F) FILE\n--quiet (-q)\n--non-recursive (-N)\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--force-log\n--editor-cmd EDITOR\n--encoding ENC\n--config-dir DIR\n--auto-props\n--no-auto-props\n--ignore-externals\n" msgstr "" #.(para) -#: ../source/book.xml:18424 +#: ../source/book.xml:18412 msgid "This imports the local directory myproj into trunk/misc in your repository. The directory trunk/misc need not exist before you import into it—svn import will recursively create directories for you." msgstr "" #.(screen) -#: ../source/book.xml:18431 +#: ../source/book.xml:18419 #, no-wrap msgid "\n$ svn import -m \"New import\" myproj http://svn.red-bean.com/repos/trunk/misc\nAdding myproj/sample.txt\n…\nTransmitting file data .........\nCommitted revision 16.\n" msgstr "" #.(para) -#: ../source/book.xml:18438 +#: ../source/book.xml:18426 msgid "Be aware that this will not create a directory named myproj in the repository. If that's what you want, simply add myproj to the end of the URL:" msgstr "" #.(screen) -#: ../source/book.xml:18442 +#: ../source/book.xml:18430 #, no-wrap msgid "\n$ svn import -m \"New import\" myproj http://svn.red-bean.com/repos/trunk/misc/myproj\nAdding myproj/sample.txt\n…\nTransmitting file data .........\nCommitted revision 16.\n" msgstr "" #.(para) -#: ../source/book.xml:18449 +#: ../source/book.xml:18437 msgid "After importing data, note that the original tree is not under version control. To start working, you still need to svn checkout a fresh working copy of the tree." msgstr "" #.(tertiary) -#: ../source/book.xml:18459 ../source/book.xml:22253 +#: ../source/book.xml:18447 ../source/book.xml:22253 msgid "info" msgstr "" #.(refname) -#: ../source/book.xml:18462 +#: ../source/book.xml:18450 msgid "svn info" msgstr "" #.(refpurpose) -#: ../source/book.xml:18463 +#: ../source/book.xml:18451 msgid "Display information about a local or remote item." msgstr "" #.(programlisting) -#: ../source/book.xml:18470 +#: ../source/book.xml:18458 #, no-wrap msgid "svn info [TARGET[@REV]...]" msgstr "" #.(para) -#: ../source/book.xml:18476 +#: ../source/book.xml:18464 msgid "Print information about the working copy paths or URLs specified. The information shown for both may include:" msgstr "" #.(para) -#: ../source/book.xml:18481 +#: ../source/book.xml:18469 msgid "Path" msgstr "" #.(para) -#: ../source/book.xml:18484 +#: ../source/book.xml:18472 msgid "Name" msgstr "" #.(para) -#: ../source/book.xml:18487 +#: ../source/book.xml:18475 msgid "URL" msgstr "" #.(para) -#: ../source/book.xml:18490 +#: ../source/book.xml:18478 msgid "Repository Root" msgstr "" #.(para) -#: ../source/book.xml:18493 +#: ../source/book.xml:18481 msgid "Repository UUID" msgstr "" #.(para) -#: ../source/book.xml:18499 +#: ../source/book.xml:18487 msgid "Node Kind" msgstr "" #.(para) -#: ../source/book.xml:18502 +#: ../source/book.xml:18490 msgid "Last Changed Author" msgstr "" #.(para) -#: ../source/book.xml:18505 +#: ../source/book.xml:18493 msgid "Last Changed Revision" msgstr "" #.(para) -#: ../source/book.xml:18508 +#: ../source/book.xml:18496 msgid "Last Changed Date" msgstr "" #.(para) -#: ../source/book.xml:18511 +#: ../source/book.xml:18499 msgid "Lock Token" msgstr "" #.(para) -#: ../source/book.xml:18514 +#: ../source/book.xml:18502 msgid "Lock Owner" msgstr "" #.(para) -#: ../source/book.xml:18517 +#: ../source/book.xml:18505 msgid "Lock Created (date)" msgstr "" #.(para) -#: ../source/book.xml:18520 +#: ../source/book.xml:18508 msgid "Lock Expires (date)" msgstr "" #.(para) -#: ../source/book.xml:18523 +#: ../source/book.xml:18511 msgid "Additional kinds of information available only for working copy paths are:" msgstr "" #.(para) -#: ../source/book.xml:18527 +#: ../source/book.xml:18515 msgid "Schedule" msgstr "" #.(para) -#: ../source/book.xml:18530 +#: ../source/book.xml:18518 msgid "Copied From URL" msgstr "" #.(para) -#: ../source/book.xml:18533 +#: ../source/book.xml:18521 msgid "Copied From Rev" msgstr "" #.(para) -#: ../source/book.xml:18536 +#: ../source/book.xml:18524 msgid "Text Last Updated" msgstr "" #.(para) -#: ../source/book.xml:18539 +#: ../source/book.xml:18527 msgid "Properties Last Updated" msgstr "" #.(para) -#: ../source/book.xml:18542 +#: ../source/book.xml:18530 msgid "Checksum" msgstr "" #.(para) -#: ../source/book.xml:18545 +#: ../source/book.xml:18533 msgid "Conflict Previous Base File" msgstr "" #.(para) -#: ../source/book.xml:18548 +#: ../source/book.xml:18536 msgid "Conflict Previous Working File" msgstr "" #.(para) -#: ../source/book.xml:18551 +#: ../source/book.xml:18539 msgid "Conflict Current Base File" msgstr "" #.(para) -#: ../source/book.xml:18554 +#: ../source/book.xml:18542 msgid "Conflict Properties File" msgstr "" #.(screen) -#: ../source/book.xml:18580 +#: ../source/book.xml:18568 #, no-wrap msgid "\n--revision (-r) REV\n--recursive (-R)\n--targets FILENAME\n--incremental\n--xml\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:18597 +#: ../source/book.xml:18585 msgid "svn info will show you all the useful information that it has for items in your working copy. It will show information for files:" msgstr "" #.(screen) -#: ../source/book.xml:18600 +#: ../source/book.xml:18588 #, no-wrap msgid "\n$ svn info foo.c\nPath: foo.c\nName: foo.c\nURL: http://svn.red-bean.com/repos/test/foo.c\nRepository Root: http://svn.red-bean.com/repos/test\nRepository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25\nRevision: 4417\nNode Kind: file\nSchedule: normal\nLast Changed Author: sally\nLast Changed Rev: 20\nLast Changed Date: 2003-01-13 16:43:13 -0600 (Mon, 13 Jan 2003)\nText Last Updated: 2003-01-16 21:18:16 -0600 (Thu, 16 Jan 2003)\nProperties Last Updated: 2003-01-13 21:50:19 -0600 (Mon, 13 Jan 2003)\nChecksum: d6aeb60b0662ccceb6bce4bac344cb66\n" msgstr "" #.(para) -#: ../source/book.xml:18617 +#: ../source/book.xml:18605 msgid "It will also show information for directories:" msgstr "" #.(screen) -#: ../source/book.xml:18618 +#: ../source/book.xml:18606 #, no-wrap msgid "\n$ svn info vendors\nPath: vendors\nURL: http://svn.red-bean.com/repos/test/vendors\nRepository Root: http://svn.red-bean.com/repos/test\nRepository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25\nRevision: 19\nNode Kind: directory\nSchedule: normal\nLast Changed Author: harry\nLast Changed Rev: 19\nLast Changed Date: 2003-01-16 23:21:19 -0600 (Thu, 16 Jan 2003)\nProperties Last Updated: 2003-01-16 23:39:02 -0600 (Thu, 16 Jan 2003)\n" msgstr "" #.(para) -#: ../source/book.xml:18632 +#: ../source/book.xml:18620 msgid "svn info also acts on URLs (also note that the file readme.doc in this example is locked, so lock information is also provided):" msgstr "" #.(screen) -#: ../source/book.xml:18635 +#: ../source/book.xml:18623 #, no-wrap msgid "\n$ svn info http://svn.red-bean.com/repos/test/readme.doc\nPath: readme.doc\nName: readme.doc\nURL: http://svn.red-bean.com/repos/test/readme.doc\nRepository Root: http://svn.red-bean.com/repos/test\nRepository UUID: 5e7d134a-54fb-0310-bd04-b611643e5c25\nRevision: 1\nNode Kind: file\nSchedule: normal\nLast Changed Author: sally\nLast Changed Rev: 42\nLast Changed Date: 2003-01-14 23:21:19 -0600 (Tue, 14 Jan 2003)\nLock Token: opaquelocktoken:14011d4b-54fb-0310-8541-dbd16bd471b2\nLock Owner: harry\nLock Created: 2003-01-15 17:35:12 -0600 (Wed, 15 Jan 2003)\nLock Comment (1 line):\nMy test lock comment\n" msgstr "" #.(tertiary) -#: ../source/book.xml:18660 +#: ../source/book.xml:18648 msgid "list" msgstr "" #.(refpurpose) -#: ../source/book.xml:18664 +#: ../source/book.xml:18652 msgid "List directory entries in the repository." msgstr "" #.(programlisting) -#: ../source/book.xml:18670 +#: ../source/book.xml:18658 #, no-wrap msgid "svn list [TARGET[@REV]...]" msgstr "" #.(para) -#: ../source/book.xml:18676 +#: ../source/book.xml:18664 msgid "List each TARGET file and the contents of each TARGET directory as they exist in the repository. If TARGET is a working copy path, the corresponding repository URL will be used." msgstr "" #.(para) -#: ../source/book.xml:18681 +#: ../source/book.xml:18669 msgid "The default TARGET is ., meaning the repository URL of the current working copy directory." msgstr "" #.(para) -#: ../source/book.xml:18685 +#: ../source/book.xml:18673 msgid "With , svn list shows the following fields for each item:" msgstr "" #.(para) -#: ../source/book.xml:18690 +#: ../source/book.xml:18678 msgid "Revision number of the last commit" msgstr "" #.(para) -#: ../source/book.xml:18694 +#: ../source/book.xml:18682 msgid "Author of the last commit" msgstr "" #.(para) -#: ../source/book.xml:18697 +#: ../source/book.xml:18685 msgid "If locked, the letter O (See for details)." msgstr "" #.(para) -#: ../source/book.xml:18700 +#: ../source/book.xml:18688 msgid "Size (in bytes)" msgstr "" #.(para) -#: ../source/book.xml:18703 +#: ../source/book.xml:18691 msgid "Date and time of the last commit" msgstr "" #.(para) -#: ../source/book.xml:18707 +#: ../source/book.xml:18695 msgid "With , output is in XML format (with a header and an enclosing document element unless is also specified). All of the information is present; the option is not accepted." msgstr "" #.(para) -#: ../source/book.xml:18717 +#: ../source/book.xml:18705 msgid "ls" msgstr "" #.(screen) -#: ../source/book.xml:18735 +#: ../source/book.xml:18723 #, no-wrap msgid "\n--revision (-r) REV\n--verbose (-v)\n--recursive (-R)\n--incremental\n--xml\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:18752 +#: ../source/book.xml:18740 msgid "svn list is most useful if you want to see what files a repository has without downloading a working copy:" msgstr "" #.(screen) -#: ../source/book.xml:18755 +#: ../source/book.xml:18743 #, no-wrap msgid "\n$ svn list http://svn.red-bean.com/repos/test/support\nREADME.txt\nINSTALL\nexamples/\n…\n" msgstr "" #.(para) -#: ../source/book.xml:18762 +#: ../source/book.xml:18750 msgid "You can pass the option for additional information, rather like the UNIX command ls -l:" msgstr "" #.(screen) -#: ../source/book.xml:18765 +#: ../source/book.xml:18753 #, no-wrap msgid "\n$ svn list --verbose file:///tmp/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 "" #.(para) -#: ../source/book.xml:18771 +#: ../source/book.xml:18759 msgid "For further details, see ." msgstr "" #.(tertiary) -#: ../source/book.xml:18778 ../source/book.xml:22301 +#: ../source/book.xml:18766 ../source/book.xml:22301 msgid "lock" msgstr "" #.(refname) -#: ../source/book.xml:18781 +#: ../source/book.xml:18769 msgid "svn lock" msgstr "" #.(refpurpose) -#: ../source/book.xml:18782 +#: ../source/book.xml:18770 msgid "Lock working copy paths or URLs in the repository, so that no other user can commit changes to them." msgstr "" #.(programlisting) -#: ../source/book.xml:18790 +#: ../source/book.xml:18778 #, no-wrap msgid "svn lock TARGET..." msgstr "" #.(para) -#: ../source/book.xml:18796 +#: ../source/book.xml:18784 msgid "Lock each TARGET. If any TARGET is already locked by another user, print a warning and continue locking the rest of the TARGETs. Use to steal a lock from another user or working copy." msgstr "" #.(para) -#: ../source/book.xml:18813 ../source/book.xml:20598 +#: ../source/book.xml:18801 ../source/book.xml:20586 msgid "Working Copy, Repository" msgstr "" #.(screen) -#: ../source/book.xml:18825 +#: ../source/book.xml:18813 #, no-wrap msgid "\n--targets FILENAME\n--message (-m) TEXT\n--file (-F) FILE\n--force-log\n--encoding ENC\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n--force\n" msgstr "" #.(para) -#: ../source/book.xml:18843 +#: ../source/book.xml:18831 msgid "Lock two files in your working copy:" msgstr "" #.(screen) -#: ../source/book.xml:18844 +#: ../source/book.xml:18832 #, no-wrap msgid "\n\n$ svn lock tree.jpg house.jpg\n'tree.jpg' locked by user 'harry'.\n'house.jpg' locked by user 'harry'.\n" msgstr "" #.(para) -#: ../source/book.xml:18850 +#: ../source/book.xml:18838 msgid "Lock a file in your working copy that is currently locked by another user:" msgstr "" #.(screen) -#: ../source/book.xml:18852 +#: ../source/book.xml:18840 #, no-wrap msgid "\n$ svn lock tree.jpg\nsvn: warning: Path '/tree.jpg is already locked by user 'sally in \\\n filesystem '/svn/repos/db'\n\n$ svn lock --force tree.jpg\n'tree.jpg' locked by user 'harry'.\n" msgstr "" #.(para) -#: ../source/book.xml:18860 +#: ../source/book.xml:18848 msgid "Lock a file without a working copy:" msgstr "" #.(screen) -#: ../source/book.xml:18861 +#: ../source/book.xml:18849 #, no-wrap msgid "\n$ svn lock http://svn.red-bean.com/repos/test/tree.jpg\n'tree.jpg' locked by user 'harry'.\n" msgstr "" #.(para) -#: ../source/book.xml:18865 ../source/book.xml:20644 +#: ../source/book.xml:18853 ../source/book.xml:20632 msgid "For further details, see ." msgstr "" #.(tertiary) -#: ../source/book.xml:18872 ../source/book.xml:22350 +#: ../source/book.xml:18860 ../source/book.xml:22350 msgid "log" msgstr "" #.(refpurpose) -#: ../source/book.xml:18876 +#: ../source/book.xml:18864 msgid "Display commit log messages." msgstr "" #.(programlisting) -#: ../source/book.xml:18882 +#: ../source/book.xml:18870 #, no-wrap msgid "svn log [PATH]" msgstr "" #.(programlisting) -#: ../source/book.xml:18883 +#: ../source/book.xml:18871 #, no-wrap msgid "svn log URL [PATH...]" msgstr "" #.(programlisting) -#: ../source/book.xml:18884 +#: ../source/book.xml:18872 #, no-wrap msgid "svn log URL[@REV] [PATH...]" msgstr "" #.(para) -#: ../source/book.xml:18890 +#: ../source/book.xml:18878 msgid "Shows log messages from the repository. If no arguments are supplied, svn log shows the log messages for all files and directories inside of (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 BASE:1." msgstr "" #.(para) -#: ../source/book.xml:18898 +#: ../source/book.xml:18886 msgid "If you specify a URL alone, then it prints log messages for everything that 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 HEAD:1." msgstr "" #.(para) -#: ../source/book.xml:18903 +#: ../source/book.xml:18891 msgid "With , svn log will also print all affected paths with each log message. With , svn log will not print the log message body itself (this is compatible with )." msgstr "" #.(para) -#: ../source/book.xml:18908 +#: ../source/book.xml:18896 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 to disable this behavior, which can be useful for determining branch points." msgstr "" #.(screen) -#: ../source/book.xml:18937 +#: ../source/book.xml:18925 #, no-wrap msgid "\n--revision (-r) REV\n--quiet (-q)\n--verbose (-v)\n--targets FILENAME\n--stop-on-copy\n--incremental\n--limit NUM\n--xml\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:18957 +#: ../source/book.xml:18945 msgid "You can see the log messages for all the paths that changed in your working copy by running svn log from the top:" msgstr "" #.(screen) -#: ../source/book.xml:18960 +#: ../source/book.xml:18948 #, no-wrap msgid "\n$ svn log\n------------------------------------------------------------------------\nr20 | harry | 2003-01-17 22:56:19 -0600 (Fri, 17 Jan 2003) | 1 line\n\nTweak.\n------------------------------------------------------------------------\nr17 | sally | 2003-01-16 23:21:19 -0600 (Thu, 16 Jan 2003) | 2 lines\n…\n" msgstr "" #.(para) -#: ../source/book.xml:18970 +#: ../source/book.xml:18958 msgid "Examine all log messages for a particular file in your working copy:" msgstr "" #.(screen) -#: ../source/book.xml:18972 +#: ../source/book.xml:18960 #, no-wrap msgid "\n$ svn log foo.c\n------------------------------------------------------------------------\nr32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n\nAdded defines.\n------------------------------------------------------------------------\nr28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n…\n" msgstr "" #.(para) -#: ../source/book.xml:18982 +#: ../source/book.xml:18970 msgid "If you don't have a working copy handy, you can log a URL:" msgstr "" #.(screen) -#: ../source/book.xml:18984 +#: ../source/book.xml:18972 #, no-wrap msgid "\n$ svn log http://svn.red-bean.com/repos/test/foo.c\n------------------------------------------------------------------------\nr32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n\nAdded defines.\n------------------------------------------------------------------------\nr28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n…\n" msgstr "" #.(para) -#: ../source/book.xml:18994 +#: ../source/book.xml:18982 msgid "If you want several distinct paths underneath the same URL, you can use the URL [PATH...] syntax." msgstr "" #.(screen) -#: ../source/book.xml:18997 +#: ../source/book.xml:18985 #, no-wrap msgid "\n$ svn log http://svn.red-bean.com/repos/test/ foo.c bar.c\n------------------------------------------------------------------------\nr32 | sally | 2003-01-13 00:43:13 -0600 (Mon, 13 Jan 2003) | 1 line\n\nAdded defines.\n------------------------------------------------------------------------\nr31 | harry | 2003-01-10 12:25:08 -0600 (Fri, 10 Jan 2003) | 1 line\n\nAdded new file bar.c\n------------------------------------------------------------------------\nr28 | sally | 2003-01-07 21:48:33 -0600 (Tue, 07 Jan 2003) | 3 lines\n…\n" msgstr "" #.(para) -#: ../source/book.xml:19011 +#: ../source/book.xml:18999 msgid "When you're concatenating the results of multiple calls to the log command, you may want to use the option. svn log 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 svn log on a range of two revisions, you would get this:" msgstr "" #.(screen) -#: ../source/book.xml:19019 +#: ../source/book.xml:19007 #, no-wrap msgid "\n$ svn log -r 14:15\n------------------------------------------------------------------------\nr14 | …\n\n------------------------------------------------------------------------\nr15 | …\n\n------------------------------------------------------------------------\n" msgstr "" #.(para) -#: ../source/book.xml:19029 +#: ../source/book.xml:19017 msgid "However, if you wanted to gather 2 non-sequential log messages into a file, you might do something like this:" msgstr "" #.(screen) -#: ../source/book.xml:19032 +#: ../source/book.xml:19020 #, 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------------------------------------------------------------------------\nr14 | …\n\n------------------------------------------------------------------------\n------------------------------------------------------------------------\nr19 | …\n\n------------------------------------------------------------------------\n------------------------------------------------------------------------\nr27 | …\n\n------------------------------------------------------------------------\n" msgstr "" #.(para) -#: ../source/book.xml:19050 +#: ../source/book.xml:19038 msgid "You can avoid the clutter of the double dashed lines in your output by using the incremental option:" msgstr "" #.(screen) -#: ../source/book.xml:19052 +#: ../source/book.xml:19040 #, 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------------------------------------------------------------------------\nr14 | …\n\n------------------------------------------------------------------------\nr19 | …\n\n------------------------------------------------------------------------\nr27 | …\n" msgstr "" #.(para) -#: ../source/book.xml:19066 +#: ../source/book.xml:19054 msgid "The option provides similar output control when using the option." msgstr "" #.(para) -#: ../source/book.xml:19070 +#: ../source/book.xml:19058 msgid "If you run svn log on a specific path and provide a specific revision and get no output at all" msgstr "" #.(screen) -#: ../source/book.xml:19073 +#: ../source/book.xml:19061 #, no-wrap msgid "\n$ svn log -r 20 http://svn.red-bean.com/untouched.txt\n------------------------------------------------------------------------\n" msgstr "" #.(para) -#: ../source/book.xml:19077 +#: ../source/book.xml:19065 msgid "That just means that 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 "" #.(screen) -#: ../source/book.xml:19081 +#: ../source/book.xml:19069 #, no-wrap msgid "\n$ svn log -r 20 touched.txt \n------------------------------------------------------------------------\nr20 | sally | 2003-01-17 22:56:19 -0600 (Fri, 17 Jan 2003) | 1 line\n\nMade a change.\n------------------------------------------------------------------------\n" msgstr "" #.(tertiary) -#: ../source/book.xml:19096 +#: ../source/book.xml:19084 msgid "merge" msgstr "" #.(refname) -#: ../source/book.xml:19099 +#: ../source/book.xml:19087 msgid "svn merge" msgstr "" #.(refpurpose) -#: ../source/book.xml:19100 +#: ../source/book.xml:19088 msgid "Apply the differences between two sources to a working copy path." msgstr "" #.(programlisting) -#: ../source/book.xml:19107 +#: ../source/book.xml:19095 #, no-wrap msgid "svn merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]" msgstr "" #.(programlisting) -#: ../source/book.xml:19108 +#: ../source/book.xml:19096 #, no-wrap msgid "svn merge sourceURL1[@N] sourceURL2[@M] [WCPATH]" msgstr "" #.(programlisting) -#: ../source/book.xml:19109 +#: ../source/book.xml:19097 #, no-wrap msgid "svn merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]" msgstr "" #.(para) -#: ../source/book.xml:19115 +#: ../source/book.xml:19103 msgid "In the first and second forms, the source paths (URLs in the first form, working copy paths in the second) are specified at revisions N and M. These are the two sources to be compared. The revisions default to HEAD if omitted." msgstr "" #.(para) -#: ../source/book.xml:19121 +#: ../source/book.xml:19109 msgid "The -c M option is equivalent to -r N:M where N = M-1. Using -c -M does the reverse: -r M:N where N = M-1." msgstr "" #.(para) -#: ../source/book.xml:19126 +#: ../source/book.xml:19114 msgid "In the third form, SOURCE can be a URL or working copy item, in which case the corresponding URL is used. This URL, at revisions N and M, defines the two sources to be compared." msgstr "" #.(para) -#: ../source/book.xml:19132 +#: ../source/book.xml:19120 msgid "WCPATH is the working copy path that will receive the changes. If WCPATH is omitted, a default value of . is assumed, unless the sources have identical basenames that match a file within .: in which case, the differences will be applied to that file." msgstr "" #.(para) -#: ../source/book.xml:19139 +#: ../source/book.xml:19127 msgid "Unlike svn diff, 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 "" #.(para) -#: ../source/book.xml:19161 +#: ../source/book.xml:19149 msgid "Only if working with URLs" msgstr "" #.(screen) -#: ../source/book.xml:19167 +#: ../source/book.xml:19155 #, no-wrap msgid "\n--revision (-r) REV\n--change (-c) REV\n--non-recursive (-N)\n--quiet (-q)\n--force\n--dry-run\n--diff3-cmd CMD\n--extensions (-x) ARG\n--ignore-ancestry\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:19188 +#: ../source/book.xml:19176 msgid "Merge a branch back into the trunk (assuming that you have a working copy of the trunk, and that the branch was created in revision 250):" msgstr "" #.(screen) -#: ../source/book.xml:19191 +#: ../source/book.xml:19179 #, no-wrap msgid "\n$ svn merge -r 250:HEAD http://svn.red-bean.com/repos/branches/my-branch\nU myproj/tiny.txt\nU myproj/thhgttg.txt\nU myproj/win.txt\nU myproj/flo.txt\n" msgstr "" #.(para) -#: ../source/book.xml:19198 +#: ../source/book.xml:19186 msgid "If you branched at revision 23, and you want to merge changes on trunk into your branch, you could do this from inside the working copy of your branch:" msgstr "" #.(screen) -#: ../source/book.xml:19201 +#: ../source/book.xml:19189 #, no-wrap msgid "\n$ svn merge -r 23:30 file:///tmp/repos/trunk/vendors\nU myproj/thhgttg.txt\n…\n" msgstr "" #.(para) -#: ../source/book.xml:19206 +#: ../source/book.xml:19194 msgid "To merge changes to a single file:" msgstr "" #.(screen) -#: ../source/book.xml:19207 +#: ../source/book.xml:19195 #, no-wrap msgid "\n$ cd myproj\n$ svn merge -r 30:31 thhgttg.txt \nU thhgttg.txt\n" msgstr "" #.(tertiary) -#: ../source/book.xml:19218 +#: ../source/book.xml:19206 msgid "mkdir" msgstr "" #.(refname) -#: ../source/book.xml:19221 +#: ../source/book.xml:19209 msgid "svn mkdir" msgstr "" #.(refpurpose) -#: ../source/book.xml:19222 +#: ../source/book.xml:19210 msgid "Create a new directory under version control." msgstr "" #.(programlisting) -#: ../source/book.xml:19228 +#: ../source/book.xml:19216 #, no-wrap msgid "svn mkdir PATH..." msgstr "" #.(programlisting) -#: ../source/book.xml:19229 +#: ../source/book.xml:19217 #, no-wrap msgid "svn mkdir URL..." msgstr "" #.(para) -#: ../source/book.xml:19235 +#: ../source/book.xml:19223 msgid "Create a directory with a name given by the final component of the PATH or URL. A directory specified by a working copy PATH 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." msgstr "" #.(para) -#: ../source/book.xml:19255 ../source/book.xml:19358 +#: ../source/book.xml:19243 ../source/book.xml:19346 msgid "Working copy, repository if operating on a URL" msgstr "" #.(para) -#: ../source/book.xml:19261 ../source/book.xml:19364 ../source/book.xml:19450 ../source/book.xml:19530 ../source/book.xml:19608 ../source/book.xml:19689 ../source/book.xml:19784 +#: ../source/book.xml:19249 ../source/book.xml:19352 ../source/book.xml:19438 ../source/book.xml:19518 ../source/book.xml:19596 ../source/book.xml:19677 ../source/book.xml:19772 msgid "Only if operating on a URL" msgstr "" #.(screen) -#: ../source/book.xml:19267 +#: ../source/book.xml:19255 #, no-wrap msgid "\n--message (-m) TEXT\n--file (-F) FILE\n--quiet (-q)\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--editor-cmd EDITOR\n--encoding ENC\n--force-log\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:19285 +#: ../source/book.xml:19273 msgid "Create a directory in your working copy:" msgstr "" #.(screen) -#: ../source/book.xml:19286 +#: ../source/book.xml:19274 #, no-wrap msgid "\n$ svn mkdir newdir\nA newdir\n" msgstr "" #.(para) -#: ../source/book.xml:19290 +#: ../source/book.xml:19278 msgid "Create one in the repository (instant commit, so a log message is required):" msgstr "" #.(screen) -#: ../source/book.xml:19292 +#: ../source/book.xml:19280 #, no-wrap msgid "\n$ svn mkdir -m \"Making a new dir.\" http://svn.red-bean.com/repos/newdir\n\nCommitted revision 26.\n" msgstr "" #.(tertiary) -#: ../source/book.xml:19303 +#: ../source/book.xml:19291 msgid "move" msgstr "" #.(refpurpose) -#: ../source/book.xml:19307 +#: ../source/book.xml:19295 msgid "Move a file or directory." msgstr "" #.(programlisting) -#: ../source/book.xml:19313 +#: ../source/book.xml:19301 #, no-wrap msgid "svn move SRC DST" msgstr "" #.(para) -#: ../source/book.xml:19319 +#: ../source/book.xml:19307 msgid "This command moves a file or directory in your working copy or in the repository." msgstr "" #.(para) -#: ../source/book.xml:19322 +#: ../source/book.xml:19310 msgid "This command is equivalent to an svn copy followed by svn delete." msgstr "" #.(para) -#: ../source/book.xml:19327 +#: ../source/book.xml:19315 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." msgstr "" #.(para) -#: ../source/book.xml:19336 +#: ../source/book.xml:19324 msgid "Move and schedule a file or directory for addition (with history)." msgstr "" #.(para) -#: ../source/book.xml:19343 +#: ../source/book.xml:19331 msgid "Complete server-side rename." msgstr "" #.(para) -#: ../source/book.xml:19352 +#: ../source/book.xml:19340 msgid "mv, rename, ren" msgstr "" #.(emphasis) -#: ../source/book.xml:19373 +#: ../source/book.xml:19361 msgid "Deprecated" msgstr "" #.(screen) -#: ../source/book.xml:19370 +#: ../source/book.xml:19358 #, no-wrap msgid "\n--message (-m) TEXT\n--file (-F) FILE\n--revision (-r) REV ()\n--quiet (-q)\n--force\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--editor-cmd EDITOR\n--encoding ENC\n--force-log\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:19390 +#: ../source/book.xml:19378 msgid "Move a file in your working copy:" msgstr "" #.(screen) -#: ../source/book.xml:19391 +#: ../source/book.xml:19379 #, no-wrap msgid "\n$ svn move foo.c bar.c\nA bar.c\nD foo.c\n" msgstr "" #.(para) -#: ../source/book.xml:19396 +#: ../source/book.xml:19384 msgid "Move a file in the repository (an immediate commit, so it requires a commit message):" msgstr "" #.(screen) -#: ../source/book.xml:19398 +#: ../source/book.xml:19386 #, 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\nCommitted revision 27.\n" msgstr "" #.(tertiary) -#: ../source/book.xml:19410 +#: ../source/book.xml:19398 msgid "propdel" msgstr "" #.(refname) -#: ../source/book.xml:19413 +#: ../source/book.xml:19401 msgid "svn propdel" msgstr "" #.(refpurpose) -#: ../source/book.xml:19414 +#: ../source/book.xml:19402 msgid "Remove a property from an item." msgstr "" #.(programlisting) -#: ../source/book.xml:19420 +#: ../source/book.xml:19408 #, no-wrap msgid "svn propdel PROPNAME [PATH...]" msgstr "" #.(programlisting) -#: ../source/book.xml:19421 +#: ../source/book.xml:19409 #, no-wrap msgid "svn propdel PROPNAME --revprop -r REV [TARGET]" msgstr "" #.(para) -#: ../source/book.xml:19427 +#: ../source/book.xml:19415 msgid "This removes properties from files, directories, or revisions. The first form removes versioned properties in your working copy, while the second removes unversioned remote properties on a repository revision (TARGET only determines which repository to access)." msgstr "" #.(para) -#: ../source/book.xml:19438 +#: ../source/book.xml:19426 msgid "pdel, pd" msgstr "" #.(para) -#: ../source/book.xml:19444 ../source/book.xml:19524 ../source/book.xml:19602 ../source/book.xml:19683 ../source/book.xml:19778 +#: ../source/book.xml:19432 ../source/book.xml:19512 ../source/book.xml:19590 ../source/book.xml:19671 ../source/book.xml:19766 msgid "Working copy, repository only if operating on a URL" msgstr "" #.(screen) -#: ../source/book.xml:19456 +#: ../source/book.xml:19444 #, no-wrap msgid "\n--quiet (-q)\n--recursive (-R)\n--revision (-r) REV\n--revprop\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:19472 +#: ../source/book.xml:19460 msgid "Delete a property from a file in your working copy" msgstr "" #.(screen) -#: ../source/book.xml:19474 +#: ../source/book.xml:19462 #, no-wrap msgid "\n$ svn propdel svn:mime-type some-script\nproperty 'svn:mime-type' deleted from 'some-script'.\n" msgstr "" #.(para) -#: ../source/book.xml:19478 +#: ../source/book.xml:19466 msgid "Delete a revision property:" msgstr "" #.(screen) -#: ../source/book.xml:19479 +#: ../source/book.xml:19467 #, no-wrap msgid "\n$ svn propdel --revprop -r 26 release-date \nproperty 'release-date' deleted from repository revision '26'\n" msgstr "" #.(tertiary) -#: ../source/book.xml:19489 +#: ../source/book.xml:19477 msgid "propedit" msgstr "" #.(refname) -#: ../source/book.xml:19492 +#: ../source/book.xml:19480 msgid "svn propedit" msgstr "" #.(refpurpose) -#: ../source/book.xml:19493 +#: ../source/book.xml:19481 msgid "Edit the property of one or more items under version control." msgstr "" #.(programlisting) -#: ../source/book.xml:19500 +#: ../source/book.xml:19488 #, no-wrap msgid "svn propedit PROPNAME PATH..." msgstr "" #.(programlisting) -#: ../source/book.xml:19501 +#: ../source/book.xml:19489 #, no-wrap msgid "svn propedit PROPNAME --revprop -r REV [TARGET]" msgstr "" #.(para) -#: ../source/book.xml:19507 +#: ../source/book.xml:19495 msgid "Edit one or more properties using your favorite editor. The first form edits versioned properties in your working copy, while the second edits unversioned remote properties on a repository revision (TARGET only determines which repository to access)." msgstr "" #.(para) -#: ../source/book.xml:19518 +#: ../source/book.xml:19506 msgid "pedit, pe" msgstr "" #.(screen) -#: ../source/book.xml:19536 +#: ../source/book.xml:19524 #, no-wrap msgid "\n--revision (-r) REV\n--revprop\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--encoding ENC\n--editor-cmd EDITOR\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:19552 +#: ../source/book.xml:19540 msgid "svn propedit makes it easy to modify properties that have multiple values:" msgstr "" #.(screen) -#: ../source/book.xml:19554 +#: ../source/book.xml:19542 #, 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.>\nSet new value for property 'svn:keywords' on 'foo.c'\n" msgstr "" #.(tertiary) -#: ../source/book.xml:19568 ../source/book.xml:22394 +#: ../source/book.xml:19556 ../source/book.xml:22394 msgid "propget" msgstr "" #.(refname) -#: ../source/book.xml:19571 +#: ../source/book.xml:19559 msgid "svn propget" msgstr "" #.(refpurpose) -#: ../source/book.xml:19572 +#: ../source/book.xml:19560 msgid "Print the value of a property." msgstr "" #.(programlisting) -#: ../source/book.xml:19578 +#: ../source/book.xml:19566 #, no-wrap msgid "svn propget PROPNAME [TARGET[@REV]...]" msgstr "" #.(programlisting) -#: ../source/book.xml:19579 +#: ../source/book.xml:19567 #, no-wrap msgid "svn propget PROPNAME --revprop -r REV [URL]" msgstr "" #.(para) -#: ../source/book.xml:19585 +#: ../source/book.xml:19573 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, while the second prints unversioned remote property on a repository revision. See for more information on properties." msgstr "" #.(para) -#: ../source/book.xml:19596 +#: ../source/book.xml:19584 msgid "pget, pg" msgstr "" #.(screen) -#: ../source/book.xml:19614 +#: ../source/book.xml:19602 #, no-wrap msgid "\n--recursive (-R)\n--revision (-r) REV\n--revprop\n--strict\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:19630 +#: ../source/book.xml:19618 msgid "Examine a property of a file in your working copy:" msgstr "" #.(screen) -#: ../source/book.xml:19632 +#: ../source/book.xml:19620 #, no-wrap msgid "\n$ svn propget svn:keywords foo.c\nAuthor\nDate\nRev\n" msgstr "" #.(para) -#: ../source/book.xml:19638 +#: ../source/book.xml:19626 msgid "The same goes for a revision property:" msgstr "" #.(screen) -#: ../source/book.xml:19639 +#: ../source/book.xml:19627 #, no-wrap msgid "\n$ svn propget svn:log --revprop -r 20 \nBegan journal.\n" msgstr "" #.(tertiary) -#: ../source/book.xml:19649 ../source/book.xml:22447 +#: ../source/book.xml:19637 ../source/book.xml:22447 msgid "proplist" msgstr "" #.(refname) -#: ../source/book.xml:19652 +#: ../source/book.xml:19640 msgid "svn proplist" msgstr "" #.(refpurpose) -#: ../source/book.xml:19653 +#: ../source/book.xml:19641 msgid "List all properties." msgstr "" #.(programlisting) -#: ../source/book.xml:19659 +#: ../source/book.xml:19647 #, no-wrap msgid "svn proplist [TARGET[@REV]...]" msgstr "" #.(programlisting) -#: ../source/book.xml:19660 +#: ../source/book.xml:19648 #, no-wrap msgid "svn proplist --revprop -r REV [TARGET]" msgstr "" #.(para) -#: ../source/book.xml:19666 +#: ../source/book.xml:19654 msgid "List all properties on files, directories, or revisions. The first form lists versioned properties in your working copy, while the second lists unversioned remote properties on a repository revision (TARGET only determines which repository to access)." msgstr "" #.(para) -#: ../source/book.xml:19677 +#: ../source/book.xml:19665 msgid "plist, pl" msgstr "" #.(screen) -#: ../source/book.xml:19695 +#: ../source/book.xml:19683 #, no-wrap msgid "\n--verbose (-v)\n--recursive (-R)\n--revision (-r) REV\n--quiet (-q)\n--revprop\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:19712 +#: ../source/book.xml:19700 msgid "You can use proplist to see the properties on an item in your working copy:" msgstr "" #.(screen) -#: ../source/book.xml:19714 +#: ../source/book.xml:19702 #, no-wrap msgid "\n$ svn proplist foo.c\nProperties on 'foo.c':\n svn:mime-type\n svn:keywords\n owner\n" msgstr "" #.(para) -#: ../source/book.xml:19721 +#: ../source/book.xml:19709 msgid "But with the flag, svn proplist is extremely handy as it also shows you the values for the properties:" msgstr "" #.(screen) -#: ../source/book.xml:19724 +#: ../source/book.xml:19712 #, no-wrap msgid "\n$ svn proplist --verbose foo.c\nProperties on 'foo.c':\n svn:mime-type : text/plain\n svn:keywords : Author Date Rev\n owner : sally\n" msgstr "" #.(tertiary) -#: ../source/book.xml:19737 +#: ../source/book.xml:19725 msgid "propset" msgstr "" #.(refname) -#: ../source/book.xml:19740 +#: ../source/book.xml:19728 msgid "svn propset" msgstr "" #.(refpurpose) -#: ../source/book.xml:19741 +#: ../source/book.xml:19729 msgid "Set PROPNAME to PROPVAL on files, directories, or revisions." msgstr "" #.(programlisting) -#: ../source/book.xml:19747 +#: ../source/book.xml:19735 #, no-wrap msgid "svn propset PROPNAME [PROPVAL | -F VALFILE] PATH..." msgstr "" #.(programlisting) -#: ../source/book.xml:19748 +#: ../source/book.xml:19736 #, no-wrap msgid "svn propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [TARGET]" msgstr "" #.(para) -#: ../source/book.xml:19754 +#: ../source/book.xml:19742 msgid "Set PROPNAME to PROPVAL 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 (TARGET only determines which repository to access)." msgstr "" #.(para) -#: ../source/book.xml:19763 +#: ../source/book.xml:19751 msgid "Subversion has a number of special properties that affect its behavior. See for more on these properties." msgstr "" #.(para) -#: ../source/book.xml:19772 +#: ../source/book.xml:19760 msgid "pset, ps" msgstr "" #.(screen) -#: ../source/book.xml:19790 +#: ../source/book.xml:19778 #, no-wrap msgid "\n--file (-F) FILE\n--quiet (-q)\n--revision (-r) REV\n--targets FILENAME\n--recursive (-R)\n--revprop\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--encoding ENC\n--force\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:19810 +#: ../source/book.xml:19798 msgid "Set the mime type on a file:" msgstr "" #.(screen) -#: ../source/book.xml:19811 +#: ../source/book.xml:19799 #, no-wrap msgid "\n$ svn propset svn:mime-type image/jpeg foo.jpg \nproperty 'svn:mime-type' set on 'foo.jpg'\n" msgstr "" #.(para) -#: ../source/book.xml:19815 +#: ../source/book.xml:19803 msgid "On a UNIX system, if you want a file to have the executable permission set:" msgstr "" #.(screen) -#: ../source/book.xml:19817 +#: ../source/book.xml:19805 #, no-wrap msgid "\n$ svn propset svn:executable ON somescript\nproperty 'svn:executable' set on 'somescript'\n" msgstr "" #.(para) -#: ../source/book.xml:19821 +#: ../source/book.xml:19809 msgid "Perhaps you have an internal policy to set certain properties for the benefit of your coworkers:" msgstr "" #.(screen) -#: ../source/book.xml:19823 +#: ../source/book.xml:19811 #, no-wrap msgid "\n$ svn propset owner sally foo.c\nproperty 'owner' set on 'foo.c'\n" msgstr "" #.(para) -#: ../source/book.xml:19827 +#: ../source/book.xml:19815 msgid "If you made a mistake in a log message for a particular revision and want to change it, use and set svn:log to the new log message:" msgstr "" #.(screen) -#: ../source/book.xml:19831 +#: ../source/book.xml:19819 #, no-wrap msgid "\n$ svn propset --revprop -r 25 svn:log \"Journaled about trip to New York.\"\nproperty 'svn:log' set on repository revision '25'\n" msgstr "" #.(para) -#: ../source/book.xml:19835 +#: ../source/book.xml:19823 msgid "Or, if you don't have a working copy, you can provide a URL." msgstr "" #.(screen) -#: ../source/book.xml:19837 +#: ../source/book.xml:19825 #, no-wrap msgid "\n$ svn propset --revprop -r 26 svn:log \"Document nap.\" http://svn.red-bean.com/repos\nproperty 'svn:log' set on repository revision '25'\n" msgstr "" #.(para) -#: ../source/book.xml:19841 +#: ../source/book.xml:19829 msgid "Lastly, you can tell propset to take its input from a file. You could even use this to set the contents of a property to something binary:" msgstr "" #.(screen) -#: ../source/book.xml:19844 +#: ../source/book.xml:19832 #, no-wrap msgid "\n$ svn propset owner-pic -F sally.jpg moo.c \nproperty 'owner-pic' set on 'moo.c'\n" msgstr "" #.(para) -#: ../source/book.xml:19849 +#: ../source/book.xml:19837 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 pre-revprop-change. See for more information on hook scripts." msgstr "" #.(tertiary) -#: ../source/book.xml:19862 +#: ../source/book.xml:19850 msgid "resolved" msgstr "" #.(quote) -#: ../source/book.xml:19866 +#: ../source/book.xml:19854 msgid "conflicted" msgstr "" #.(refpurpose) -#: ../source/book.xml:19866 +#: ../source/book.xml:19854 msgid "Remove state on working copy files or directories." msgstr "" #.(programlisting) -#: ../source/book.xml:19873 +#: ../source/book.xml:19861 #, no-wrap msgid "svn resolved PATH..." msgstr "" #.(para) -#: ../source/book.xml:19879 +#: ../source/book.xml:19867 msgid "Remove conflicted state on working copy files or directories. This routine does not semantically resolve conflict markers; it merely removes conflict-related artifact files and allows PATH to be committed again; that is, it tells Subversion that the conflicts have been resolved. See for an in-depth look at resolving conflicts." msgstr "" #.(screen) -#: ../source/book.xml:19910 ../source/book.xml:19998 +#: ../source/book.xml:19898 ../source/book.xml:19986 #, no-wrap msgid "\n--targets FILENAME\n--recursive (-R)\n--quiet (-q)\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:19921 +#: ../source/book.xml:19909 msgid "If you get a conflict on an update, your working copy will sprout three new files:" msgstr "" #.(screen) -#: ../source/book.xml:19923 +#: ../source/book.xml:19911 #, no-wrap msgid "\n$ svn update\nC foo.c\nUpdated to revision 31.\n$ ls\nfoo.c\nfoo.c.mine\nfoo.c.r30\nfoo.c.r31\n" msgstr "" #.(para) -#: ../source/book.xml:19933 +#: ../source/book.xml:19921 msgid "Once you've resolved the conflict and foo.c is ready to be committed, run svn resolved to let your working copy know you've taken care of everything." msgstr "" #.(para) -#: ../source/book.xml:19938 +#: ../source/book.xml:19926 msgid "You can just remove the conflict files and commit, but svn resolved 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 "" #.(tertiary) -#: ../source/book.xml:19951 +#: ../source/book.xml:19939 msgid "revert" msgstr "" #.(refpurpose) -#: ../source/book.xml:19955 +#: ../source/book.xml:19943 msgid "Undo all local edits." msgstr "" #.(programlisting) -#: ../source/book.xml:19961 +#: ../source/book.xml:19949 #, no-wrap msgid "svn revert PATH..." msgstr "" #.(para) -#: ../source/book.xml:19967 +#: ../source/book.xml:19955 msgid "Reverts any local changes to a file or directory and resolves any conflicted states. svn revert will not only revert 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 done (e.g. files scheduled for addition or deletion can be unscheduled)." msgstr "" #.(para) -#: ../source/book.xml:20009 +#: ../source/book.xml:19997 msgid "Discard changes to a file:" msgstr "" #.(screen) -#: ../source/book.xml:20010 +#: ../source/book.xml:19998 #, no-wrap msgid "\n$ svn revert foo.c\nReverted foo.c\n" msgstr "" #.(para) -#: ../source/book.xml:20014 +#: ../source/book.xml:20002 msgid "If you want to revert a whole directory of files, use the flag:" msgstr "" #.(screen) -#: ../source/book.xml:20016 +#: ../source/book.xml:20004 #, no-wrap msgid "\n$ svn revert --recursive .\nReverted newdir/afile\nReverted foo.c\nReverted bar.txt\n" msgstr "" #.(para) -#: ../source/book.xml:20022 +#: ../source/book.xml:20010 msgid "Lastly, you can undo any scheduling operations:" msgstr "" #.(screen) -#: ../source/book.xml:20024 +#: ../source/book.xml:20012 #, no-wrap msgid "\n$ svn add mistake.txt whoops\nA mistake.txt\nA whoops\nA whoops/oopsie.c\n\n$ svn revert mistake.txt whoops\nReverted mistake.txt\nReverted whoops\n\n$ svn status\n? mistake.txt\n? whoops\n" msgstr "" #.(para) -#: ../source/book.xml:20039 +#: ../source/book.xml:20027 msgid "svn revert is inherently dangerous, since its entire purpose is to throw away data—namely, your uncommitted changes. Once you've reverted, Subversion provides no way to get back those uncommitted changes." msgstr "" #.(para) -#: ../source/book.xml:20045 +#: ../source/book.xml:20033 msgid "If you provide no targets to svn revert, it will do nothing—to protect you from accidentally losing changes in your working copy, svn revert requires you to provide at least one target." msgstr "" #.(tertiary) -#: ../source/book.xml:20057 +#: ../source/book.xml:20045 msgid "status" msgstr "" #.(refpurpose) -#: ../source/book.xml:20061 +#: ../source/book.xml:20049 msgid "Print the status of working copy files and directories." msgstr "" #.(programlisting) -#: ../source/book.xml:20067 +#: ../source/book.xml:20055 #, no-wrap msgid "svn status [PATH...]" msgstr "" #.(para) -#: ../source/book.xml:20073 +#: ../source/book.xml:20061 msgid "Print the status of working copy files and directories. With no arguments, it prints only locally modified items (no repository access). With , it adds working revision and server out-of-date information. With , it prints full revision information on every item." msgstr "" #.(para) -#: ../source/book.xml:20080 +#: ../source/book.xml:20068 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 "" #.(para) -#: ../source/book.xml:20083 +#: ../source/book.xml:20071 msgid "The first column indicates that an item was added, deleted, or otherwise changed." msgstr "" #.(term) -#: ../source/book.xml:20087 ../source/book.xml:20168 ../source/book.xml:20194 ../source/book.xml:20210 ../source/book.xml:20226 ../source/book.xml:20241 ../source/book.xml:20289 +#: ../source/book.xml:20075 ../source/book.xml:20156 ../source/book.xml:20182 ../source/book.xml:20198 ../source/book.xml:20214 ../source/book.xml:20229 ../source/book.xml:20277 msgid "' '" msgstr "" #.(para) -#: ../source/book.xml:20089 ../source/book.xml:20170 +#: ../source/book.xml:20077 ../source/book.xml:20158 msgid "No modifications." msgstr "" #.(term) -#: ../source/book.xml:20093 +#: ../source/book.xml:20081 msgid "'A'" msgstr "" #.(para) -#: ../source/book.xml:20095 +#: ../source/book.xml:20083 msgid "Item is scheduled for Addition." msgstr "" #.(term) -#: ../source/book.xml:20099 +#: ../source/book.xml:20087 msgid "'D'" msgstr "" #.(para) -#: ../source/book.xml:20101 +#: ../source/book.xml:20089 msgid "Item is scheduled for Deletion." msgstr "" #.(term) -#: ../source/book.xml:20105 ../source/book.xml:20174 +#: ../source/book.xml:20093 ../source/book.xml:20162 msgid "'M'" msgstr "" #.(para) -#: ../source/book.xml:20107 +#: ../source/book.xml:20095 msgid "Item has been modified." msgstr "" #.(term) -#: ../source/book.xml:20111 +#: ../source/book.xml:20099 msgid "'R'" msgstr "" #.(para) -#: ../source/book.xml:20113 +#: ../source/book.xml:20101 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 "" #.(term) -#: ../source/book.xml:20120 ../source/book.xml:20181 +#: ../source/book.xml:20108 ../source/book.xml:20169 msgid "'C'" msgstr "" #.(para) -#: ../source/book.xml:20122 +#: ../source/book.xml:20110 msgid "The contents (as opposed to the properties) of the item conflict with updates received from the repository." msgstr "" #.(term) -#: ../source/book.xml:20128 +#: ../source/book.xml:20116 msgid "'X'" msgstr "" #.(para) -#: ../source/book.xml:20130 +#: ../source/book.xml:20118 msgid "Item is present because of an externals definition." msgstr "" #.(term) -#: ../source/book.xml:20134 +#: ../source/book.xml:20122 msgid "'I'" msgstr "" #.(para) -#: ../source/book.xml:20136 +#: ../source/book.xml:20124 msgid "Item is being ignored (e.g. with the svn:ignore property)." msgstr "" #.(term) -#: ../source/book.xml:20141 +#: ../source/book.xml:20129 msgid "'?'" msgstr "" #.(para) -#: ../source/book.xml:20143 +#: ../source/book.xml:20131 msgid "Item is not under version control." msgstr "" #.(term) -#: ../source/book.xml:20147 +#: ../source/book.xml:20135 msgid "'!'" msgstr "" #.(para) -#: ../source/book.xml:20149 +#: ../source/book.xml:20137 msgid "Item is missing (e.g. you moved or deleted it without using svn). This also indicates that a directory is incomplete (a checkout or update was interrupted)." msgstr "" #.(term) -#: ../source/book.xml:20156 +#: ../source/book.xml:20144 msgid "'~'" msgstr "" #.(para) -#: ../source/book.xml:20158 +#: ../source/book.xml:20146 msgid "Item is versioned as one kind of object (file, directory, link), but has been replaced by different kind of object." msgstr "" #.(para) -#: ../source/book.xml:20164 +#: ../source/book.xml:20152 msgid "The second column tells the status of a file's or directory's properties." msgstr "" #.(para) -#: ../source/book.xml:20176 +#: ../source/book.xml:20164 msgid "Properties for this item have been modified." msgstr "" #.(para) -#: ../source/book.xml:20183 +#: ../source/book.xml:20171 msgid "Properties for this item are in conflict with property updates received from the repository." msgstr "" #.(para) -#: ../source/book.xml:20189 +#: ../source/book.xml:20177 msgid "The third column is populated only if the working copy directory is locked. (See .)" msgstr "" #.(para) -#: ../source/book.xml:20196 +#: ../source/book.xml:20184 msgid "Item is not locked." msgstr "" #.(term) -#: ../source/book.xml:20200 +#: ../source/book.xml:20188 msgid "'L'" msgstr "" #.(para) -#: ../source/book.xml:20202 +#: ../source/book.xml:20190 msgid "Item is locked." msgstr "" #.(para) -#: ../source/book.xml:20206 +#: ../source/book.xml:20194 msgid "The fourth column is populated only if the item is scheduled for addition-with-history." msgstr "" #.(para) -#: ../source/book.xml:20212 +#: ../source/book.xml:20200 msgid "No history scheduled with commit." msgstr "" #.(term) -#: ../source/book.xml:20216 +#: ../source/book.xml:20204 msgid "'+'" msgstr "" #.(para) -#: ../source/book.xml:20218 +#: ../source/book.xml:20206 msgid "History scheduled with commit." msgstr "" #.(para) -#: ../source/book.xml:20222 +#: ../source/book.xml:20210 msgid "The fifth column is populated only if the item is switched relative to its parent (see )." msgstr "" #.(para) -#: ../source/book.xml:20228 +#: ../source/book.xml:20216 msgid "Item is a child of its parent directory." msgstr "" #.(term) -#: ../source/book.xml:20232 +#: ../source/book.xml:20220 msgid "'S'" msgstr "" #.(para) -#: ../source/book.xml:20234 +#: ../source/book.xml:20222 msgid "Item is switched." msgstr "" #.(para) -#: ../source/book.xml:20238 +#: ../source/book.xml:20226 msgid "The sixth column is populated with lock information." msgstr "" #.(para) -#: ../source/book.xml:20243 +#: ../source/book.xml:20231 msgid "When is used, the file is not locked. If is not used, this merely means that the file is not locked in this working copy." msgstr "" #.(term) -#: ../source/book.xml:20251 +#: ../source/book.xml:20239 msgid "K" msgstr "" #.(para) -#: ../source/book.xml:20253 +#: ../source/book.xml:20241 msgid "File is locked in this working copy." msgstr "" #.(term) -#: ../source/book.xml:20257 +#: ../source/book.xml:20245 msgid "O" msgstr "" #.(para) -#: ../source/book.xml:20259 +#: ../source/book.xml:20247 msgid "File is locked either by another user or in another working copy. This only appears when is used." msgstr "" #.(term) -#: ../source/book.xml:20265 +#: ../source/book.xml:20253 msgid "T" msgstr "" #.(para) -#: ../source/book.xml:20267 +#: ../source/book.xml:20255 msgid "File was locked in this working copy, but the lock has been stolen and is invalid. The file is currently locked in the repository. This only appears when is used." msgstr "" #.(term) -#: ../source/book.xml:20275 +#: ../source/book.xml:20263 msgid "B" msgstr "" #.(para) -#: ../source/book.xml:20277 +#: ../source/book.xml:20265 msgid "File was locked in this working copy, but the lock has been broken and is invalid. The file is no longer locked This only appears when is used." msgstr "" #.(para) -#: ../source/book.xml:20284 +#: ../source/book.xml:20272 msgid "The out-of-date information appears in the seventh column (only if you pass the option)." msgstr "" #.(para) -#: ../source/book.xml:20291 +#: ../source/book.xml:20279 msgid "The item in your working copy is up-to-date." msgstr "" #.(term) -#: ../source/book.xml:20295 +#: ../source/book.xml:20283 msgid "'*'" msgstr "" #.(para) -#: ../source/book.xml:20297 +#: ../source/book.xml:20285 msgid "A newer revision of the item exists on the server." msgstr "" #.(para) -#: ../source/book.xml:20302 +#: ../source/book.xml:20290 msgid "The remaining fields are variable width and delimited by spaces. The working revision is the next field if the or options are passed." msgstr "" #.(para) -#: ../source/book.xml:20306 +#: ../source/book.xml:20294 msgid "If the option is passed, the last committed revision and last committed author are displayed next." msgstr "" #.(para) -#: ../source/book.xml:20309 +#: ../source/book.xml:20297 msgid "The working copy path is always the final field, so it can include spaces." msgstr "" #.(para) -#: ../source/book.xml:20316 +#: ../source/book.xml:20304 msgid "stat, st" msgstr "" #.(para) -#: ../source/book.xml:20328 +#: ../source/book.xml:20316 msgid "Only if using " msgstr "" #.(screen) -#: ../source/book.xml:20334 +#: ../source/book.xml:20322 #, no-wrap msgid "\n--show-updates (-u)\n--verbose (-v)\n--non-recursive (-N)\n--quiet (-q)\n--no-ignore\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n--ignore-externals\n" msgstr "" #.(para) -#: ../source/book.xml:20352 +#: ../source/book.xml:20340 msgid "This is the easiest way to find out what changes you have made to your working copy:" msgstr "" #.(screen) -#: ../source/book.xml:20354 +#: ../source/book.xml:20342 #, no-wrap msgid "\n$ svn status wc\n M wc/bar.c\nA + wc/qax.c\n" msgstr "" #.(para) -#: ../source/book.xml:20359 +#: ../source/book.xml:20347 msgid "If you want to find out what files in your working copy are out-of-date, pass the option (this will not make any changes to your working copy). Here you can see that wc/foo.c has changed in the repository since we last updated our working copy:" msgstr "" #.(screen) -#: ../source/book.xml:20367 +#: ../source/book.xml:20355 #, no-wrap msgid "\n$ svn status --show-updates wc\n M 965 wc/bar.c\n * 965 wc/foo.c\nA + 965 wc/qax.c\nStatus against revision: 981\n" msgstr "" #.(para) -#: ../source/book.xml:20375 +#: ../source/book.xml:20363 msgid "only places an asterisk next to items that are out of date (that is, items that will be updated from the repository if you run svn update). does not 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)." msgstr "" #.(para) -#: ../source/book.xml:20384 +#: ../source/book.xml:20372 msgid "And finally, the most information you can get out of the status subcommand:" msgstr "" #.(screen) -#: ../source/book.xml:20386 +#: ../source/book.xml:20374 #, no-wrap msgid "\n$ svn status --show-updates --verbose wc\n M 965 938 sally wc/bar.c\n * 965 922 harry wc/foo.c\nA + 965 687 harry wc/qax.c\n 965 687 harry wc/zig.c\nHead revision: 981\n" msgstr "" #.(para) -#: ../source/book.xml:20394 +#: ../source/book.xml:20382 msgid "For many more examples of svn status, see ." msgstr "" #.(tertiary) -#: ../source/book.xml:20402 +#: ../source/book.xml:20390 msgid "switch" msgstr "" #.(refname) -#: ../source/book.xml:20405 +#: ../source/book.xml:20393 msgid "svn switch" msgstr "" #.(refpurpose) -#: ../source/book.xml:20406 +#: ../source/book.xml:20394 msgid "Update working copy to a different URL." msgstr "" #.(programlisting) -#: ../source/book.xml:20412 +#: ../source/book.xml:20400 #, no-wrap msgid "svn switch URL [PATH]" msgstr "" #.(programlisting) -#: ../source/book.xml:20413 +#: ../source/book.xml:20401 #, no-wrap msgid "switch --relocate FROM TO [PATH...]" msgstr "" #.(para) -#: ../source/book.xml:20419 +#: ../source/book.xml:20407 msgid "The first variant of this subcommand (without the option) updates your working copy to point to a new URL—usually a URL which 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. See for an in-depth look at switching." msgstr "" #.(para) -#: ../source/book.xml:20426 +#: ../source/book.xml:20414 msgid "The option causes svn switch to do something different: it updates your working copy to point to the same 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 "" #.(para) -#: ../source/book.xml:20439 +#: ../source/book.xml:20427 msgid "sw" msgstr "" #.(screen) -#: ../source/book.xml:20457 +#: ../source/book.xml:20445 #, no-wrap msgid "\n--revision (-r) REV\n--non-recursive (-N)\n--quiet (-q)\n--diff3-cmd CMD\n--relocate FROM TO\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n" msgstr "" #.(para) -#: ../source/book.xml:20474 +#: ../source/book.xml:20462 msgid "If you're currently inside the directory vendors, which was branched to vendors-with-fix, and you'd like to switch your working copy to that branch:" msgstr "" #.(screen) -#: ../source/book.xml:20478 +#: ../source/book.xml:20466 #, no-wrap msgid "\n$ svn switch http://svn.red-bean.com/repos/branches/vendors-with-fix .\nU myproj/foo.txt\nU myproj/bar.txt\nU myproj/baz.c\nU myproj/qux.c\nUpdated to revision 31.\n" msgstr "" #.(para) -#: ../source/book.xml:20486 +#: ../source/book.xml:20474 msgid "And to switch back, just provide the URL to the location in the repository from which you originally checked out your working copy:" msgstr "" #.(screen) -#: ../source/book.xml:20489 +#: ../source/book.xml:20477 #, no-wrap msgid "\n$ svn switch http://svn.red-bean.com/repos/trunk/vendors .\nU myproj/foo.txt\nU myproj/bar.txt\nU myproj/baz.c\nU myproj/qux.c\nUpdated to revision 31.\n" msgstr "" #.(para) -#: ../source/book.xml:20498 +#: ../source/book.xml:20486 msgid "You can just switch part of your working copy to a branch if you don't want to switch your entire working copy." msgstr "" #.(para) -#: ../source/book.xml:20502 +#: ../source/book.xml:20490 msgid "Sometimes an administrator might change the base location of your repository—in other words, the contents of the repository doesn't change, but the main URL used to reach the root of the repository does. For example, the hostname may change, the URL scheme may change, or any part of the URL which leads to the repository itself may change. Rather than check out a new working copy, you can have the svn switch command rewrite the beginnings of all the URLs in your working copy. Use the option to do the substitution. No file contents are changed, nor is the repository contacted. It's similar to running a Perl script over your working copy .svn/ directories which runs s/OldRoot/NewRoot/." msgstr "" #.(screen) -#: ../source/book.xml:20517 +#: ../source/book.xml:20505 #, no-wrap msgid "\n$ svn checkout file:///tmp/repos test\nA test/a\nA test/b\n…\n\n$ mv repos newlocation\n$ cd test/\n\n$ svn update\nsvn: Unable to open an ra_local session to URL\nsvn: Unable to open repository 'file:///tmp/repos'\n\n$ svn switch --relocate file:///tmp/repos file:///tmp/newlocation .\n$ svn update\nAt revision 3.\n" msgstr "" #.(para) -#: ../source/book.xml:20535 +#: ../source/book.xml:20523 msgid "Be careful when using the 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 . Here's the rule of thumb:" msgstr "" #.(para) -#: ../source/book.xml:20545 +#: ../source/book.xml:20533 msgid "If the working copy needs to reflect a new directory within the repository, then use just svn switch." msgstr "" #.(para) -#: ../source/book.xml:20551 +#: ../source/book.xml:20539 msgid "If the working copy still reflects the same repository directory, but the location of the repository itself has changed, then use svn switch --relocate." msgstr "" #.(tertiary) -#: ../source/book.xml:20564 +#: ../source/book.xml:20552 msgid "unlock" msgstr "" #.(refname) -#: ../source/book.xml:20567 +#: ../source/book.xml:20555 msgid "svn unlock" msgstr "" #.(refpurpose) -#: ../source/book.xml:20568 +#: ../source/book.xml:20556 msgid "Unlock working copy paths or URLs." msgstr "" #.(programlisting) -#: ../source/book.xml:20574 +#: ../source/book.xml:20562 #, no-wrap msgid "svn unlock TARGET..." msgstr "" #.(para) -#: ../source/book.xml:20580 +#: ../source/book.xml:20568 msgid "Unlock each TARGET. If any TARGET is either locked by another user or no valid lock token exists in the working copy, print a warning and continue unlocking the rest of the TARGETs. Use to break a lock belonging to another user or working copy." msgstr "" #.(screen) -#: ../source/book.xml:20610 +#: ../source/book.xml:20598 #, no-wrap msgid "\n--targets FILENAME\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n--force\n" msgstr "" #.(para) -#: ../source/book.xml:20624 +#: ../source/book.xml:20612 msgid "Unlock two files in your working copy:" msgstr "" #.(screen) -#: ../source/book.xml:20625 +#: ../source/book.xml:20613 #, no-wrap msgid "\n\n$ svn unlock tree.jpg house.jpg\n'tree.jpg' unlocked.\n'house.jpg' unlocked.\n" msgstr "" #.(para) -#: ../source/book.xml:20631 +#: ../source/book.xml:20619 msgid "Unlock a file in your working copy that is currently locked by another user:" msgstr "" #.(screen) -#: ../source/book.xml:20633 +#: ../source/book.xml:20621 #, no-wrap msgid "\n$ svn unlock tree.jpg\nsvn: 'tree.jpg' is not locked in this working copy\n$ svn unlock --force tree.jpg\n'tree.jpg' unlocked.\n" msgstr "" #.(para) -#: ../source/book.xml:20639 +#: ../source/book.xml:20627 msgid "Unlock a file without a working copy:" msgstr "" #.(screen) -#: ../source/book.xml:20640 +#: ../source/book.xml:20628 #, no-wrap msgid "\n$ svn unlock http://svn.red-bean.com/repos/test/tree.jpg\n'tree.jpg unlocked.\n" msgstr "" #.(tertiary) -#: ../source/book.xml:20651 +#: ../source/book.xml:20639 msgid "update" msgstr "" #.(refpurpose) -#: ../source/book.xml:20655 +#: ../source/book.xml:20643 msgid "Update your working copy." msgstr "" #.(programlisting) -#: ../source/book.xml:20661 +#: ../source/book.xml:20649 #, no-wrap msgid "svn update [PATH...]" msgstr "" #.(para) -#: ../source/book.xml:20667 +#: ../source/book.xml:20655 msgid "svn update brings changes from the repository into your working copy. If no revision is given, it brings your working copy up-to-date with the HEAD revision. Otherwise, it synchronizes the working copy to the revision given by the option. As part of the synchronization, svn update also removes any stale locks (see ) found in the working copy." msgstr "" #.(para) -#: ../source/book.xml:20676 +#: ../source/book.xml:20664 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 "" #.(term) -#: ../source/book.xml:20681 +#: ../source/book.xml:20669 msgid "A" msgstr "" #.(para) -#: ../source/book.xml:20683 +#: ../source/book.xml:20671 msgid "Added" msgstr "" #.(term) -#: ../source/book.xml:20687 +#: ../source/book.xml:20675 msgid "D" msgstr "" #.(para) -#: ../source/book.xml:20689 +#: ../source/book.xml:20677 msgid "Deleted" msgstr "" #.(term) -#: ../source/book.xml:20693 +#: ../source/book.xml:20681 msgid "U" msgstr "" #.(para) -#: ../source/book.xml:20695 +#: ../source/book.xml:20683 msgid "Updated" msgstr "" #.(term) -#: ../source/book.xml:20699 +#: ../source/book.xml:20687 msgid "C" msgstr "" #.(para) -#: ../source/book.xml:20701 +#: ../source/book.xml:20689 msgid "Conflicted" msgstr "" #.(term) -#: ../source/book.xml:20705 +#: ../source/book.xml:20693 msgid "G" msgstr "" #.(para) -#: ../source/book.xml:20707 +#: ../source/book.xml:20695 msgid "Merged" msgstr "" #.(para) -#: ../source/book.xml:20711 +#: ../source/book.xml:20699 msgid "A character in the first column signifies an update to the actual file, while updates to the file's properties are shown in the second column." msgstr "" #.(para) -#: ../source/book.xml:20719 +#: ../source/book.xml:20707 msgid "up" msgstr "" #.(screen) -#: ../source/book.xml:20737 +#: ../source/book.xml:20725 #, no-wrap msgid "\n--revision (-r) REV\n--non-recursive (-N)\n--quiet (-q)\n--no-ignore\n--incremental\n--diff3-cmd CMD\n--username USER\n--password PASS\n--no-auth-cache\n--non-interactive\n--config-dir DIR\n--ignore-externals\n" msgstr "" #.(para) -#: ../source/book.xml:20756 +#: ../source/book.xml:20744 msgid "Pick up repository changes that have happened since your last update:" msgstr "" #.(screen) -#: ../source/book.xml:20758 +#: ../source/book.xml:20746 #, no-wrap msgid "\n$ svn update\nA newdir/toggle.c\nA newdir/disclose.c\nA newdir/launch.c\nD newdir/README\nUpdated to revision 32.\n" msgstr "" #.(para) -#: ../source/book.xml:20766 +#: ../source/book.xml:20754 msgid "You can also update your working copy to an older revision (Subversion doesn't have the concept of sticky files like CVS does; see ):" msgstr "" #.(screen) -#: ../source/book.xml:20769 +#: ../source/book.xml:20757 #, no-wrap msgid "\n$ svn update -r30\nA newdir/README\nD newdir/toggle.c\nD newdir/disclose.c\nD newdir/launch.c\nU foo.c\nUpdated to revision 30.\n" msgstr "" #.(para) -#: ../source/book.xml:20779 +#: ../source/book.xml:20767 msgid "If you want to examine an older revision of a single file, you may want to use svn cat instead—it won't change your working copy." msgstr "" #.(para) -#: ../source/book.xml:20796 +#: ../source/book.xml:20784 msgid "svnadmin is the administrative tool for monitoring and repairing your Subversion repository. For detailed information, see ." msgstr "" #.(para) -#: ../source/book.xml:20799 +#: ../source/book.xml:20787 msgid "Since svnadmin 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 "" #.(title) -#: ../source/book.xml:20805 +#: ../source/book.xml:20793 msgid "svnadmin Options" msgstr "" #.(option) -#: ../source/book.xml:20810 +#: ../source/book.xml:20798 msgid "--bdb-log-keep" msgstr "" #.(para) -#: ../source/book.xml:20813 +#: ../source/book.xml:20801 msgid "(Berkeley DB specific) Disable automatic log removal of database log files. Having these log files around can be convenient if you need to restore from a catastrophic repository failure." msgstr "" #.(option) -#: ../source/book.xml:20821 +#: ../source/book.xml:20809 msgid "--bdb-txn-nosync" msgstr "" #.(para) -#: ../source/book.xml:20824 +#: ../source/book.xml:20812 msgid "(Berkeley DB specific) Disables fsync when committing database transactions. Used with the svnadmin create command to create a Berkeley DB backed repository with DB_TXN_NOSYNC enabled (which improves speed but has some risks associated with it)." msgstr "" #.(option) -#: ../source/book.xml:20834 +#: ../source/book.xml:20822 msgid "--bypass-hooks" msgstr "" #.(para) -#: ../source/book.xml:20837 +#: ../source/book.xml:20825 msgid "Bypass the repository hook system." msgstr "" #.(option) -#: ../source/book.xml:20842 +#: ../source/book.xml:20830 msgid "--clean-logs" msgstr "" #.(para) -#: ../source/book.xml:20845 +#: ../source/book.xml:20833 msgid "Removes unused Berkeley DB logs." msgstr "" #.(option) -#: ../source/book.xml:20851 +#: ../source/book.xml:20839 msgid "--force-uuid" msgstr "" #.(para) -#: ../source/book.xml:20854 +#: ../source/book.xml:20842 msgid "By default, when loading data into repository that already contains revisions, svnadmin will ignore the UUID from the dump stream. This option will cause the repository's UUID to be set to the UUID from the stream." msgstr "" #.(option) -#: ../source/book.xml:20864 +#: ../source/book.xml:20852 msgid "--ignore-uuid" msgstr "" #.(para) -#: ../source/book.xml:20867 +#: ../source/book.xml:20855 msgid "By default, when loading an empty repository, svnadmin will ignore the UUID from the dump stream. This option will force that UUID to be ignored (useful for overriding your configuration file if it has set)." msgstr "" #.(para) -#: ../source/book.xml:20880 +#: ../source/book.xml:20868 msgid "Dump a revision only as a diff against the previous revision, instead of the usual fulltext." msgstr "" #.(option) -#: ../source/book.xml:20887 +#: ../source/book.xml:20875 msgid "--parent-dir " msgstr "" #.(para) -#: ../source/book.xml:20891 +#: ../source/book.xml:20879 msgid "When loading a dump file, root paths at DIR instead of /." msgstr "" #.(term) -#: ../source/book.xml:20897 +#: ../source/book.xml:20885 msgid " () ARG" msgstr "" #.(para) -#: ../source/book.xml:20900 +#: ../source/book.xml:20888 msgid "Specify a particular revision to operate on." msgstr "" #.(option) -#: ../source/book.xml:20906 +#: ../source/book.xml:20894 msgid "--quiet" msgstr "" #.(para) -#: ../source/book.xml:20909 +#: ../source/book.xml:20897 msgid "Do not show normal progress—show only errors." msgstr "" #.(option) -#: ../source/book.xml:20915 +#: ../source/book.xml:20903 msgid "--use-post-commit-hook" msgstr "" #.(para) -#: ../source/book.xml:20918 +#: ../source/book.xml:20906 msgid "When loading a dump file, run the repository's post-commit hook after finalizing each newly loaded revision." msgstr "" #.(option) -#: ../source/book.xml:20925 +#: ../source/book.xml:20913 msgid "--use-pre-commit-hook" msgstr "" #.(para) -#: ../source/book.xml:20928 +#: ../source/book.xml:20916 msgid "When loading a dump file, run the repository's pre-commit hook before finalizing each newly loaded revision. If the hook fails, abort the commit and terminate the load process." msgstr "" #.(title) -#: ../source/book.xml:20939 +#: ../source/book.xml:20927 msgid "svnadmin Subcommands" msgstr "" #.(tertiary) -#: ../source/book.xml:20945 +#: ../source/book.xml:20933 msgid "create" msgstr "" #.(refname) -#: ../source/book.xml:20948 +#: ../source/book.xml:20936 msgid "svnadmin create" msgstr "" #.(refpurpose) -#: ../source/book.xml:20949 +#: ../source/book.xml:20937 msgid "Create a new, empty repository." msgstr "" #.(programlisting) -#: ../source/book.xml:20955 +#: ../source/book.xml:20943 #, no-wrap msgid "svnadmin create REPOS_PATH" msgstr "" #.(para) -#: ../source/book.xml:20963 +#: ../source/book.xml:20951 msgid "Remember, svnadmin works only with local paths, not URLs." msgstr "" #.(para) -#: ../source/book.xml:20961 +#: ../source/book.xml:20949 msgid "Create a new, empty repository at the path provided. If the provided directory does not exist, it will be created for you. As of Subversion 1.2, svnadmin creates new repositories with the fsfs filesystem backend by default." msgstr "" #.(screen) -#: ../source/book.xml:20975 +#: ../source/book.xml:20963 #, no-wrap msgid "\n--bdb-txn-nosync\n--bdb-log-keep\n--config-dir DIR\n--fs-type TYPE\n" msgstr "" #.(para) -#: ../source/book.xml:20986 +#: ../source/book.xml:20974 msgid "Creating a new repository is just this easy:" msgstr "" #.(screen) -#: ../source/book.xml:20987 +#: ../source/book.xml:20975 #, no-wrap msgid "\n$ svnadmin create /usr/local/svn/repos\n" msgstr "" #.(para) -#: ../source/book.xml:20990 +#: ../source/book.xml:20978 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:" msgstr "" #.(screen) -#: ../source/book.xml:20995 +#: ../source/book.xml:20983 #, no-wrap msgid "\n$ svnadmin create /usr/local/svn/repos --fs-type fsfs\n" msgstr "" #.(tertiary) -#: ../source/book.xml:21004 +#: ../source/book.xml:20992 msgid "deltify" msgstr "" #.(refname) -#: ../source/book.xml:21007 +#: ../source/book.xml:20995 msgid "svnadmin deltify" msgstr "" #.(refpurpose) -#: ../source/book.xml:21008 +#: ../source/book.xml:20996 msgid "Deltify changed paths in a revision range." msgstr "" #.(programlisting) -#: ../source/book.xml:21014 +#: ../source/book.xml:21002 #, no-wrap msgid "svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH" msgstr "" #.(para) -#: ../source/book.xml:21020 +#: ../source/book.xml:21008 msgid "svnadmin deltify exists in current versions of Subversion only for historical reasons. This command is deprecated and no longer needed." msgstr "" #.(para) -#: ../source/book.xml:21023 +#: ../source/book.xml:21011 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 very little gain, and this feature was deprecated." msgstr "" #.(screen) -#: ../source/book.xml:21033 +#: ../source/book.xml:21021 #, no-wrap msgid "\n--revision (-r) REV\n--quiet (-q)\n" msgstr "" #.(tertiary) -#: ../source/book.xml:21043 +#: ../source/book.xml:21031 msgid "dump" msgstr "" #.(refname) -#: ../source/book.xml:21046 +#: ../source/book.xml:21034 msgid "svnadmin dump" msgstr "" #.(refpurpose) -#: ../source/book.xml:21047 +#: ../source/book.xml:21035 msgid "Dump the contents of filesystem to stdout." msgstr "" #.(programlisting) -#: ../source/book.xml:21053 +#: ../source/book.xml:21041 #, no-wrap msgid "svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]" msgstr "" #.(para) -#: ../source/book.xml:21059 +#: ../source/book.xml:21047 msgid "Dump the contents of filesystem to stdout in a dumpfile portable format, sending feedback to stderr. Dump revisions LOWER rev through UPPER rev. If no revisions are given, dump all revision trees. If only LOWER is given, dump that one revision tree. See for a practical use." msgstr "" #.(para) -#: ../source/book.xml:21068 +#: ../source/book.xml:21056 msgid "By default, the Subversion dumpfile 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 if 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 which were modified in those revisions. For a modified file, the complete fulltext representation of its contents, as well as all of its properties, are presented in the dumpfile; for a directory, all of its properties are presented." msgstr "" #.(para) -#: ../source/book.xml:21079 +#: ../source/book.xml:21067 msgid "There are two useful options which modify the dumpfile generator's behavior. The first is the option, which simply causes that first revision in the dumpfile 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 dumpfile is presented. This is useful for generating a relatively small dumpfile to be loaded into another repository which already has the files and directories that exist in the original repository." msgstr "" #.(para) -#: ../source/book.xml:21090 +#: ../source/book.xml:21078 msgid "The second useful option is . This option causes svnadmin dump to, instead of emitting fulltext 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 dumpfile that svnadmin dump creates. There are, however, disadvantages to using this option—deltified dumpfiles are more CPU intensive to create, cannot be operated on by svndumpfilter, and tend not to compress as well as their non-deltified counterparts when using third-party tools like gzip and bzip2." msgstr "" #.(screen) -#: ../source/book.xml:21108 +#: ../source/book.xml:21096 #, no-wrap msgid "\n--revision (-r) REV\n--incremental\n--quiet (-q)\n--deltas\n" msgstr "" #.(para) -#: ../source/book.xml:21119 +#: ../source/book.xml:21107 msgid "Dump your whole repository:" msgstr "" #.(screen) -#: ../source/book.xml:21120 +#: ../source/book.xml:21108 #, no-wrap msgid "\n$ svnadmin dump /usr/local/svn/repos\nSVN-fs-dump-format-version: 1\nRevision-number: 0\n* Dumped revision 0.\nProp-content-length: 56\nContent-length: 56\n…\n" msgstr "" #.(para) -#: ../source/book.xml:21129 +#: ../source/book.xml:21117 msgid "Incrementally dump a single transaction from your repository:" msgstr "" #.(screen) -#: ../source/book.xml:21131 +#: ../source/book.xml:21119 #, no-wrap msgid "\n$ svnadmin dump /usr/local/svn/repos -r 21 --incremental \n* Dumped revision 21.\nSVN-fs-dump-format-version: 1\nRevision-number: 21\nProp-content-length: 101\nContent-length: 101\n…\n" msgstr "" #.(refname) -#: ../source/book.xml:21149 +#: ../source/book.xml:21137 msgid "svnadmin help" msgstr "" #.(programlisting) -#: ../source/book.xml:21156 +#: ../source/book.xml:21144 #, no-wrap msgid "svnadmin help [SUBCOMMAND...]" msgstr "" #.(para) -#: ../source/book.xml:21162 +#: ../source/book.xml:21150 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 "" #.(tertiary) -#: ../source/book.xml:21179 +#: ../source/book.xml:21167 msgid "hotcopy" msgstr "" #.(refname) -#: ../source/book.xml:21182 +#: ../source/book.xml:21170 msgid "svnadmin hotcopy" msgstr "" #.(refpurpose) -#: ../source/book.xml:21183 +#: ../source/book.xml:21171 msgid "Make a hot copy of a repository." msgstr "" #.(programlisting) -#: ../source/book.xml:21189 +#: ../source/book.xml:21177 #, no-wrap msgid "svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH" msgstr "" #.(para) -#: ../source/book.xml:21195 +#: ../source/book.xml:21183 msgid "This subcommand makes a full hot backup of your repository, including all hooks, configuration files, and, of course, database files. If you pass the option, svnadmin will perform a hotcopy 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 "" #.(screen) -#: ../source/book.xml:21209 +#: ../source/book.xml:21197 #, no-wrap msgid "\n--clean-logs\n" msgstr "" #.(para) -#: ../source/book.xml:21213 +#: ../source/book.xml:21201 msgid "As described in , hot-copied Berkeley DB repositories are not portable across operating systems, nor will they work on machines with a different endianness than the machine where they were created." msgstr "" #.(tertiary) -#: ../source/book.xml:21225 +#: ../source/book.xml:21213 msgid "list-dblogs" msgstr "" #.(refname) -#: ../source/book.xml:21228 +#: ../source/book.xml:21216 msgid "svnadmin list-dblogs" msgstr "" #.(literal) -#: ../source/book.xml:21232 ../source/book.xml:21263 ../source/book.xml:21456 +#: ../source/book.xml:21220 ../source/book.xml:21251 ../source/book.xml:21444 msgid "bdb" msgstr "" #.(refpurpose) -#: ../source/book.xml:21229 +#: ../source/book.xml:21217 msgid "Ask Berkeley DB which log files exist for a given Subversion repository (applies only to repositories using the backend)." msgstr "" #.(programlisting) -#: ../source/book.xml:21238 +#: ../source/book.xml:21226 #, no-wrap msgid "svnadmin list-dblogs REPOS_PATH" msgstr "" #.(para) -#: ../source/book.xml:21244 ../source/book.xml:21275 +#: ../source/book.xml:21232 ../source/book.xml:21263 msgid "Berkeley DB creates logs of all changes to the repository, which allow it to recover in the face of catastrophe. Unless you enable DB_LOG_AUTOREMOVE, the log files accumulate, although most are no longer used and can be deleted to reclaim disk space. See for more information." msgstr "" #.(tertiary) -#: ../source/book.xml:21257 +#: ../source/book.xml:21245 msgid "list-unused-dblogs" msgstr "" #.(refname) -#: ../source/book.xml:21260 +#: ../source/book.xml:21248 msgid "svnadmin list-unused-dblogs" msgstr "" #.(refpurpose) -#: ../source/book.xml:21261 +#: ../source/book.xml:21249 msgid "Ask Berkeley DB which log files can be safely deleted (applies only to repositories using the backend)." msgstr "" #.(programlisting) -#: ../source/book.xml:21269 +#: ../source/book.xml:21257 #, no-wrap msgid "svnadmin list-unused-dblogs REPOS_PATH" msgstr "" #.(para) -#: ../source/book.xml:21287 +#: ../source/book.xml:21275 msgid "Remove all unused log files from a repository:" msgstr "" #.(screen) -#: ../source/book.xml:21288 +#: ../source/book.xml:21276 #, no-wrap msgid "\n$ svnadmin list-unused-dblogs /path/to/repos\n/path/to/repos/log.0000000031\n/path/to/repos/log.0000000032\n/path/to/repos/log.0000000033\n\n$ svnadmin list-unused-dblogs /path/to/repos | xargs rm\n## disk space reclaimed!\n" msgstr "" #.(tertiary) -#: ../source/book.xml:21303 +#: ../source/book.xml:21291 msgid "load" msgstr "" #.(refname) -#: ../source/book.xml:21306 +#: ../source/book.xml:21294 msgid "svnadmin load" msgstr "" #.(quote) -#: ../source/book.xml:21308 +#: ../source/book.xml:21296 msgid "dumpfile" msgstr "" #.(refpurpose) -#: ../source/book.xml:21307 +#: ../source/book.xml:21295 msgid "Read a -formatted stream from stdin." msgstr "" #.(programlisting) -#: ../source/book.xml:21315 +#: ../source/book.xml:21303 #, no-wrap msgid "svnadmin load REPOS_PATH" msgstr "" #.(para) -#: ../source/book.xml:21321 +#: ../source/book.xml:21309 msgid "Read a dumpfile-formatted stream from stdin, committing new revisions into the repository's filesystem. Send progress feedback to stdout." msgstr "" #.(screen) -#: ../source/book.xml:21329 +#: ../source/book.xml:21317 #, no-wrap msgid "\n--quiet (-q)\n--ignore-uuid\n--force-uuid\n--use-pre-commit-hook\n--use-post-commit-hook\n--parent-dir\n" msgstr "" #.(title) -#: ../source/book.xml:21340 ../source/book.xml:21392 ../source/book.xml:21554 +#: ../source/book.xml:21328 ../source/book.xml:21380 ../source/book.xml:21542 msgid "Example" msgstr "" #.(para) -#: ../source/book.xml:21342 +#: ../source/book.xml:21330 msgid "This shows the beginning of loading a repository from a backup file (made, of course, with svnadmin dump):" msgstr "" #.(screen) -#: ../source/book.xml:21345 +#: ../source/book.xml:21333 #, no-wrap msgid "\n$ svnadmin load /usr/local/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 "" #.(para) -#: ../source/book.xml:21352 +#: ../source/book.xml:21340 msgid "Or if you want to load into a subdirectory:" msgstr "" #.(screen) -#: ../source/book.xml:21353 +#: ../source/book.xml:21341 #, no-wrap msgid "\n$ svnadmin load --parent-dir new/subdir/for/project /usr/local/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 "" #.(tertiary) -#: ../source/book.xml:21366 +#: ../source/book.xml:21354 msgid "lslocks" msgstr "" #.(refname) -#: ../source/book.xml:21369 +#: ../source/book.xml:21357 msgid "svnadmin lslocks" msgstr "" #.(refpurpose) -#: ../source/book.xml:21370 +#: ../source/book.xml:21358 msgid "Print descriptions of all locks." msgstr "" #.(programlisting) -#: ../source/book.xml:21376 +#: ../source/book.xml:21364 #, no-wrap msgid "svnadmin lslocks REPOS_PATH" msgstr "" #.(para) -#: ../source/book.xml:21382 +#: ../source/book.xml:21370 msgid "Print descriptions of all locks in a repository." msgstr "" #.(para) -#: ../source/book.xml:21394 +#: ../source/book.xml:21382 msgid "This lists the one locked file in the repository at /svn/repos:" msgstr "" #.(screen) -#: ../source/book.xml:21396 +#: ../source/book.xml:21384 #, no-wrap msgid "\n$ svnadmin lslocks /svn/repos\nPath: /tree.jpg\nUUID Token: opaquelocktoken:ab00ddf0-6afb-0310-9cd0-dda813329753\nOwner: harry\nCreated: 2005-07-08 17:27:36 -0500 (Fri, 08 Jul 2005)\nExpires: \nComment (1 line):\nRework the uppermost branches on the bald cypress in the foreground.\n" msgstr "" #.(tertiary) -#: ../source/book.xml:21412 +#: ../source/book.xml:21400 msgid "lstxns" msgstr "" #.(refname) -#: ../source/book.xml:21415 +#: ../source/book.xml:21403 msgid "svnadmin lstxns" msgstr "" #.(refpurpose) -#: ../source/book.xml:21416 +#: ../source/book.xml:21404 msgid "Print the names of all uncommitted transactions." msgstr "" #.(programlisting) -#: ../source/book.xml:21422 +#: ../source/book.xml:21410 #, no-wrap msgid "svnadmin lstxns REPOS_PATH" msgstr "" #.(para) -#: ../source/book.xml:21428 +#: ../source/book.xml:21416 msgid "Print the names of all uncommitted transactions. See for information on how uncommitted transactions are created and what you should do with them." msgstr "" #.(para) -#: ../source/book.xml:21437 +#: ../source/book.xml:21425 msgid "List all outstanding transactions in a repository." msgstr "" #.(screen) -#: ../source/book.xml:21439 +#: ../source/book.xml:21427 #, no-wrap msgid "\n$ svnadmin lstxns /usr/local/svn/repos/ \n1w\n1x\n" msgstr "" #.(tertiary) -#: ../source/book.xml:21450 +#: ../source/book.xml:21438 msgid "recover" msgstr "" #.(refname) -#: ../source/book.xml:21453 +#: ../source/book.xml:21441 msgid "svnadmin recover" msgstr "" #.(filename) -#: ../source/book.xml:21457 +#: ../source/book.xml:21445 msgid "repos/conf/passwd" msgstr "" #.(refpurpose) -#: ../source/book.xml:21454 +#: ../source/book.xml:21442 msgid "Bring a repository database back into a consistent state (applies only to repositories using the backend). In addition, if does not exist, it will create a default password file ." msgstr "" #.(programlisting) -#: ../source/book.xml:21464 +#: ../source/book.xml:21452 #, no-wrap msgid "svnadmin recover REPOS_PATH" msgstr "" #.(para) -#: ../source/book.xml:21470 +#: ../source/book.xml:21458 msgid "Run this command if you get an error indicating that your repository needs to be recovered." msgstr "" #.(screen) -#: ../source/book.xml:21477 +#: ../source/book.xml:21465 #, no-wrap msgid "\n--wait\n" msgstr "" #.(para) -#: ../source/book.xml:21485 +#: ../source/book.xml:21473 msgid "Recover a hung repository:" msgstr "" #.(screen) -#: ../source/book.xml:21486 +#: ../source/book.xml:21474 #, no-wrap msgid "\n$ svnadmin recover /usr/local/svn/repos/ \nRepository lock acquired.\nPlease wait; recovering the repository may take some time...\n\nRecovery completed.\nThe latest repos revision is 34.\n" msgstr "" #.(para) -#: ../source/book.xml:21494 +#: ../source/book.xml:21482 msgid "Recovering the database requires an exclusive lock on the repository. (This is a database lock; see .) If another process is accessing the repository, then svnadmin recover will error:" msgstr "" #.(screen) -#: ../source/book.xml:21499 +#: ../source/book.xml:21487 #, no-wrap msgid "\n$ svnadmin recover /usr/local/svn/repos\nsvn: Failed to get exclusive repository access; perhaps another process\nsuch as httpd, svnserve or svn has it open?\n\n$\n" msgstr "" #.(para) -#: ../source/book.xml:21506 +#: ../source/book.xml:21494 msgid "The option, however, will cause svnadmin recover to wait indefinitely for other processes to disconnect:" msgstr "" #.(screen) -#: ../source/book.xml:21509 +#: ../source/book.xml:21497 #, no-wrap msgid "\n$ svnadmin recover /usr/local/svn/repos --wait\nWaiting on repository lock; perhaps another process has it open?\n\n### time goes by…\n\nRepository lock acquired.\nPlease wait; recovering the repository may take some time...\n\nRecovery completed.\nThe latest repos revision is 34.\n" msgstr "" #.(tertiary) -#: ../source/book.xml:21527 +#: ../source/book.xml:21515 msgid "rmlocks" msgstr "" #.(refname) -#: ../source/book.xml:21530 +#: ../source/book.xml:21518 msgid "svnadmin rmlocks" msgstr "" #.(refpurpose) -#: ../source/book.xml:21531 +#: ../source/book.xml:21519 msgid "Unconditionally remove one or more locks from a repository." msgstr "" #.(programlisting) -#: ../source/book.xml:21538 +#: ../source/book.xml:21526 #, no-wrap msgid "svnadmin rmlocks REPOS_PATH LOCKED_PATH..." msgstr "" #.(para) -#: ../source/book.xml:21544 +#: ../source/book.xml:21532 msgid "Remove lock from each LOCKED_PATH." msgstr "" #.(para) -#: ../source/book.xml:21556 +#: ../source/book.xml:21544 msgid "This deletes the locks on tree.jpg and house.jpg in the repository at /svn/repos" msgstr "" #.(screen) -#: ../source/book.xml:21560 +#: ../source/book.xml:21548 #, no-wrap msgid "\n$ svnadmin rmlocks /svn/repos tree.jpg house.jpg\nRemoved lock on '/tree.jpg.\nRemoved lock on '/house.jpg.\n" msgstr "" #.(tertiary) -#: ../source/book.xml:21571 +#: ../source/book.xml:21559 msgid "rmtxns" msgstr "" #.(refname) -#: ../source/book.xml:21574 +#: ../source/book.xml:21562 msgid "svnadmin rmtxns" msgstr "" #.(refpurpose) -#: ../source/book.xml:21575 +#: ../source/book.xml:21563 msgid "Delete transactions from a repository." msgstr "" #.(programlisting) -#: ../source/book.xml:21581 +#: ../source/book.xml:21569 #, no-wrap msgid "svnadmin rmtxns REPOS_PATH TXN_NAME..." msgstr "" #.(para) -#: ../source/book.xml:21587 +#: ../source/book.xml:21575 msgid "Delete outstanding transactions from a repository. This is covered in detail in ." msgstr "" #.(screen) -#: ../source/book.xml:21594 +#: ../source/book.xml:21582 #, no-wrap msgid "\n--quiet (-q)\n" msgstr "" #.(para) -#: ../source/book.xml:21602 +#: ../source/book.xml:21590 msgid "Remove named transactions:" msgstr "" #.(screen) -#: ../source/book.xml:21603 +#: ../source/book.xml:21591 #, no-wrap msgid "\n$ svnadmin rmtxns /usr/local/svn/repos/ 1w 1x\n" msgstr "" #.(para) -#: ../source/book.xml:21606 +#: ../source/book.xml:21594 msgid "Fortunately, the output of lstxns works great as the input for rmtxns:" msgstr "" #.(screen) -#: ../source/book.xml:21608 +#: ../source/book.xml:21596 #, no-wrap msgid "\n$ svnadmin rmtxns /usr/local/svn/repos/ `svnadmin lstxns /usr/local/svn/repos/`\n" msgstr "" #.(para) -#: ../source/book.xml:21611 +#: ../source/book.xml:21599 msgid "Which will remove all uncommitted transactions from your repository." msgstr "" #.(tertiary) -#: ../source/book.xml:21619 +#: ../source/book.xml:21607 msgid "setlog" msgstr "" #.(refname) -#: ../source/book.xml:21622 +#: ../source/book.xml:21610 msgid "svnadmin setlog" msgstr "" #.(refpurpose) -#: ../source/book.xml:21623 +#: ../source/book.xml:21611 msgid "Set the log-message on a revision." msgstr "" #.(programlisting) -#: ../source/book.xml:21629 +#: ../source/book.xml:21617 #, no-wrap msgid "svnadmin setlog REPOS_PATH -r REVISION FILE" msgstr "" #.(para) -#: ../source/book.xml:21635 +#: ../source/book.xml:21623 msgid "Set the log-message on revision REVISION to the contents of FILE." msgstr "" #.(para) -#: ../source/book.xml:21637 +#: ../source/book.xml:21625 msgid "This is similar to using svn propset --revprop to set the svn:log property on a revision, except that you can also use the 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 pre-revprop-change hook." msgstr "" #.(para) -#: ../source/book.xml:21645 +#: ../source/book.xml:21633 msgid "Revision properties are not under version control, so this command will permanently overwrite the previous log message." msgstr "" #.(screen) -#: ../source/book.xml:21654 +#: ../source/book.xml:21642 #, no-wrap msgid "\n--revision (-r) REV\n--bypass-hooks\n" msgstr "" #.(para) -#: ../source/book.xml:21663 +#: ../source/book.xml:21651 msgid "Set the log message for revision 19 to the contents of the file msg:" msgstr "" #.(screen) -#: ../source/book.xml:21665 +#: ../source/book.xml:21653 #, no-wrap msgid "\n$ svnadmin setlog /usr/local/svn/repos/ -r 19 msg\n" msgstr "" #.(tertiary) -#: ../source/book.xml:21676 +#: ../source/book.xml:21664 msgid "verify" msgstr "" #.(refname) -#: ../source/book.xml:21679 +#: ../source/book.xml:21667 msgid "svnadmin verify" msgstr "" #.(refpurpose) -#: ../source/book.xml:21680 +#: ../source/book.xml:21668 msgid "Verify the data stored in the repository." msgstr "" #.(programlisting) -#: ../source/book.xml:21686 +#: ../source/book.xml:21674 #, no-wrap msgid "svnadmin verify REPOS_PATH" msgstr "" #.(para) -#: ../source/book.xml:21692 +#: ../source/book.xml:21680 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 bitrot. If this command fails—which it will do at the first sign of a problem—that means that 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 "" #.(para) -#: ../source/book.xml:21708 +#: ../source/book.xml:21696 msgid "Verify a hung repository:" msgstr "" #.(screen) -#: ../source/book.xml:21709 +#: ../source/book.xml:21697 #, no-wrap msgid "\n$ svnadmin verify /usr/local/svn/repos/ \n* Verified revision 1729.\n" msgstr "" #.(para) -#: ../source/book.xml:21726 +#: ../source/book.xml:21714 msgid "svnlook 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 peeking. svnlook is typically used by the repository hooks, but a repository administrator might find it useful for diagnostic purposes." msgstr "" #.(para) -#: ../source/book.xml:21733 +#: ../source/book.xml:21721 msgid "Since svnlook 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 "" #.(para) -#: ../source/book.xml:21736 +#: ../source/book.xml:21724 msgid "If no revision or transaction is specified, svnlook defaults to the youngest (most recent) revision of the repository." msgstr "" #.(title) -#: ../source/book.xml:21742 +#: ../source/book.xml:21730 msgid "svnlook Options" msgstr "" #.(para) -#: ../source/book.xml:21744 +#: ../source/book.xml:21732 msgid "Options in svnlook are global, just like in svn and svnadmin; however, most options only apply to one subcommand since the functionality of svnlook is (intentionally) limited in scope." msgstr "" #.(para) +#: ../source/book.xml:21744 +msgid "Prevents svnlook diff 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 "" + +#.(option) +#: ../source/book.xml:21753 +msgid "--no-diff-added" +msgstr "" + +#.(para) #: ../source/book.xml:21756 -msgid "Prevents svnlook 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." +msgid "Prevents svnlook diff 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 "" #.(term) diff --git a/doc/svnbook/po/zh_CN.po b/doc/svnbook/po/zh_CN.po index dbe698b..c4965db 100644 --- a/doc/svnbook/po/zh_CN.po +++ b/doc/svnbook/po/zh_CN.po @@ -39,7 +39,7 @@ msgid "" msgstr "" "Project-Id-Version: svnbook 1.5\n" -"POT-Creation-Date: 2007-10-30 13:01 +0000\n" +"POT-Creation-Date: 2007-11-12 02:25 +0000\n" "PO-Revision-Date: 2007-10-30 21:19+0800\n" "Last-Translator: Dongsheng Song \n" "Language-Team: Simplified Chinese \n" @@ -152,7 +152,8 @@ msgstr "使用Subversion进行版本控制" #. (subtitle) #: ../source/book.xml:5 -msgid "For Subversion 1.5(Compiled from r2880)" +#, fuzzy +msgid "For Subversion 1.5(Compiled from r2881)" msgstr "针对 Subversion 1.5(编译自版本 r2880)" #. (edition) @@ -926,17 +927,17 @@ msgid "Subversion, once installed, has a number of different pieces. The followi msgstr "安装好的Subversion由几个部分组成，本节将简单的介绍一下这些组件。下文的描述或许过于简略，不易理解，但不用担心，本书后面的章节中会用更多的内容来详细阐述这些组件。" #. (term), (primary) -#: ../source/book.xml:982 ../source/book.xml:17042 ../source/book.xml:17145 -#: ../source/book.xml:17249 ../source/book.xml:17334 ../source/book.xml:17465 -#: ../source/book.xml:17541 ../source/book.xml:17669 ../source/book.xml:17825 -#: ../source/book.xml:17935 ../source/book.xml:18188 ../source/book.xml:18300 -#: ../source/book.xml:18353 ../source/book.xml:18457 ../source/book.xml:18658 -#: ../source/book.xml:18776 ../source/book.xml:18870 ../source/book.xml:19094 -#: ../source/book.xml:19216 ../source/book.xml:19301 ../source/book.xml:19408 -#: ../source/book.xml:19487 ../source/book.xml:19566 ../source/book.xml:19647 -#: ../source/book.xml:19735 ../source/book.xml:19860 ../source/book.xml:19949 -#: ../source/book.xml:20055 ../source/book.xml:20400 ../source/book.xml:20562 -#: ../source/book.xml:20649 +#: ../source/book.xml:982 ../source/book.xml:17030 ../source/book.xml:17133 +#: ../source/book.xml:17237 ../source/book.xml:17322 ../source/book.xml:17453 +#: ../source/book.xml:17529 ../source/book.xml:17657 ../source/book.xml:17813 +#: ../source/book.xml:17923 ../source/book.xml:18176 ../source/book.xml:18288 +#: ../source/book.xml:18341 ../source/book.xml:18445 ../source/book.xml:18646 +#: ../source/book.xml:18764 ../source/book.xml:18858 ../source/book.xml:19082 +#: ../source/book.xml:19204 ../source/book.xml:19289 ../source/book.xml:19396 +#: ../source/book.xml:19475 ../source/book.xml:19554 ../source/book.xml:19635 +#: ../source/book.xml:19723 ../source/book.xml:19848 ../source/book.xml:19937 +#: ../source/book.xml:20043 ../source/book.xml:20388 ../source/book.xml:20550 +#: ../source/book.xml:20637 msgid "svn" msgstr "svn" @@ -957,7 +958,7 @@ msgid "A program for reporting the state (in terms of revisions of the items pre msgstr "此工具用来显示工作拷贝的状态（用术语来说，就是当前项目的修订版本）。" #. (term), (title), (command), (primary) -#: ../source/book.xml:995 ../source/book.xml:9943 ../source/book.xml:21723 +#: ../source/book.xml:995 ../source/book.xml:9943 ../source/book.xml:21711 #: ../source/book.xml:21809 ../source/book.xml:21853 ../source/book.xml:21908 #: ../source/book.xml:21998 ../source/book.xml:22042 ../source/book.xml:22111 #: ../source/book.xml:22156 ../source/book.xml:22188 ../source/book.xml:22251 @@ -973,12 +974,12 @@ msgid "A tool for directly inspecting a Subversion repository." msgstr "直接查看Subversion版本库的工具。" #. (term), (title), (command), (primary) -#: ../source/book.xml:1001 ../source/book.xml:9913 ../source/book.xml:20793 -#: ../source/book.xml:20943 ../source/book.xml:21002 ../source/book.xml:21041 -#: ../source/book.xml:21144 ../source/book.xml:21177 ../source/book.xml:21223 -#: ../source/book.xml:21255 ../source/book.xml:21301 ../source/book.xml:21364 -#: ../source/book.xml:21410 ../source/book.xml:21448 ../source/book.xml:21525 -#: ../source/book.xml:21569 ../source/book.xml:21617 ../source/book.xml:21674 +#: ../source/book.xml:1001 ../source/book.xml:9913 ../source/book.xml:20781 +#: ../source/book.xml:20931 ../source/book.xml:20990 ../source/book.xml:21029 +#: ../source/book.xml:21132 ../source/book.xml:21165 ../source/book.xml:21211 +#: ../source/book.xml:21243 ../source/book.xml:21289 ../source/book.xml:21352 +#: ../source/book.xml:21398 ../source/book.xml:21436 ../source/book.xml:21513 +#: ../source/book.xml:21557 ../source/book.xml:21605 ../source/book.xml:21662 msgid "svnadmin" msgstr "svnadmin" @@ -1875,7 +1876,7 @@ msgid "Note that this chapter is not meant to be an exhaustive list of all Subve msgstr "这一章并不是Subversion命令的完全列表—而是你将会遇到的最常用任务的介绍，这一章假定你已经读过并且理解了，而且熟悉Subversion的模型，如果想查看所有命令的参考，见。" #. (title), (refpurpose) -#: ../source/book.xml:1984 ../source/book.xml:18306 ../source/book.xml:21150 +#: ../source/book.xml:1984 ../source/book.xml:18294 ../source/book.xml:21138 #: ../source/book.xml:22162 msgid "Help!" msgstr "求助！" @@ -1934,7 +1935,7 @@ msgid "There are two ways to get new files into your Subversion repository: svn import和svn add，我们将在本章讨论svn import，而会在回顾Subversion的典型一天时讨论svn add。" #. (title), (refname) -#: ../source/book.xml:2024 ../source/book.xml:18358 +#: ../source/book.xml:2024 ../source/book.xml:18346 msgid "svn import" msgstr "svn import" @@ -2246,7 +2247,7 @@ msgid "Update your working copy" msgstr "更新你的工作拷贝" #. (command), (refname) -#: ../source/book.xml:2276 ../source/book.xml:2336 ../source/book.xml:20654 +#: ../source/book.xml:2276 ../source/book.xml:2336 ../source/book.xml:20642 msgid "svn update" msgstr "svn update" @@ -2256,22 +2257,22 @@ msgid "Make changes" msgstr "做出修改" #. (command), (refname) -#: ../source/book.xml:2286 ../source/book.xml:17047 +#: ../source/book.xml:2286 ../source/book.xml:17035 msgid "svn add" msgstr "svn add" #. (command), (refname) -#: ../source/book.xml:2291 ../source/book.xml:17830 +#: ../source/book.xml:2291 ../source/book.xml:17818 msgid "svn delete" msgstr "svn delete" #. (command), (refname) -#: ../source/book.xml:2296 ../source/book.xml:17674 +#: ../source/book.xml:2296 ../source/book.xml:17662 msgid "svn copy" msgstr "svn copy" #. (command), (refname) -#: ../source/book.xml:2301 ../source/book.xml:19306 +#: ../source/book.xml:2301 ../source/book.xml:19294 msgid "svn move" msgstr "svn move" @@ -2281,12 +2282,12 @@ msgid "Examine your changes" msgstr "检验修改" #. (command), (refname) -#: ../source/book.xml:2311 ../source/book.xml:20060 ../source/book.xml:24412 +#: ../source/book.xml:2311 ../source/book.xml:20048 ../source/book.xml:24412 msgid "svn status" msgstr "svn status" #. (command), (refname) -#: ../source/book.xml:2316 ../source/book.xml:3285 ../source/book.xml:17940 +#: ../source/book.xml:2316 ../source/book.xml:3285 ../source/book.xml:17928 #: ../source/book.xml:24420 msgid "svn diff" msgstr "svn diff" @@ -2297,7 +2298,7 @@ msgid "Possibly undo some changes" msgstr "可能会取消一些修改" #. (command), (refname) -#: ../source/book.xml:2326 ../source/book.xml:19954 ../source/book.xml:24428 +#: ../source/book.xml:2326 ../source/book.xml:19942 ../source/book.xml:24428 msgid "svn revert" msgstr "svn revert" @@ -2307,7 +2308,7 @@ msgid "Resolve Conflicts (Merge Others' Changes)" msgstr "解决冲突（合并别人的修改）" #. (command), (refname) -#: ../source/book.xml:2341 ../source/book.xml:19865 +#: ../source/book.xml:2341 ../source/book.xml:19853 msgid "svn resolved" msgstr "svn resolved" @@ -2317,7 +2318,7 @@ msgid "Commit your changes" msgstr "提交你的修改" #. (command), (refname) -#: ../source/book.xml:2351 ../source/book.xml:17546 +#: ../source/book.xml:2351 ../source/book.xml:17534 msgid "svn commit" msgstr "svn commit" @@ -3521,7 +3522,7 @@ msgid "There are several commands that can provide you with historical data from msgstr "有许多命令可以为你提供版本库历史：" #. (command), (refname) -#: ../source/book.xml:3275 ../source/book.xml:18875 +#: ../source/book.xml:3275 ../source/book.xml:18863 msgid "svn log" msgstr "svn log" @@ -3536,7 +3537,7 @@ msgid "Shows line-level details of a particular change." msgstr "显示特定修改的行级详细信息。" #. (command), (refname) -#: ../source/book.xml:3293 ../source/book.xml:3547 ../source/book.xml:17254 +#: ../source/book.xml:3293 ../source/book.xml:3547 ../source/book.xml:17242 msgid "svn cat" msgstr "svn cat" @@ -3547,7 +3548,7 @@ msgid "Retrieves a file as it existed in a particular revision number and displa msgstr "取得在特定版本的某一个文件显示在当前屏幕。" #. (command), (refname) -#: ../source/book.xml:3302 ../source/book.xml:3572 ../source/book.xml:18663 +#: ../source/book.xml:3302 ../source/book.xml:3572 ../source/book.xml:18651 msgid "svn list" msgstr "svn list" @@ -5432,7 +5433,7 @@ msgid "This keyword describes the last time the file was known to have been chan msgstr "这个关键字保存了文件最后一次在版本库修改的日期，看起来类似于$Date: 2006-07-22 21:42:37 -0700 (Sat, 22 Jul 2006) $，它也可以用LastChangedDate来指定。" #. (literal), (para) -#: ../source/book.xml:5008 ../source/book.xml:18496 +#: ../source/book.xml:5008 ../source/book.xml:18484 msgid "Revision" msgstr "Revision" @@ -17443,7 +17444,7 @@ msgid "--config-dir" msgstr "--config-dir" #. (replaceable) -#: ../source/book.xml:16548 ../source/book.xml:20888 ../source/book.xml:22671 +#: ../source/book.xml:16548 ../source/book.xml:20876 ../source/book.xml:22671 msgid "DIR" msgstr "DIR" @@ -17588,7 +17589,7 @@ msgid "Tells Subversion to ignore external definitions and the external working msgstr "告诉Subversion忽略外部定义和外部定义管理的工作拷贝。" #. (option) -#: ../source/book.xml:16716 ../source/book.xml:20877 +#: ../source/book.xml:16716 ../source/book.xml:20865 msgid "--incremental" msgstr "--incremental" @@ -17639,7 +17640,7 @@ msgid "--new" msgstr "--new" #. (replaceable) -#: ../source/book.xml:16749 ../source/book.xml:16858 +#: ../source/book.xml:16749 ../source/book.xml:16846 msgid "ARG" msgstr "ARG" @@ -17671,153 +17672,142 @@ msgid "Disables auto-props, overriding the enable-auto-props msgstr "关闭auto-props，覆盖config文件中的enable-auto-props指示。" #. (option) -#: ../source/book.xml:16778 -msgid "--no-diff-added" -msgstr "--no-diff-added" - -#. (para) -#: ../source/book.xml:16781 -#, fuzzy -msgid "Prevents Subversion from printing differences for added files. The default behavior when you add a file is for svn diff to print the same differences that you would see if you had added the entire contents of an existing (empty) file." -msgstr "防止Subversion打印添加文件的区别。缺省的行为方式是，当添加一个文件时，svn diff打印的信息和比较一个空白文件相同。" - -#. (option) -#: ../source/book.xml:16790 ../source/book.xml:21753 +#: ../source/book.xml:16778 ../source/book.xml:21741 msgid "--no-diff-deleted" msgstr "--no-diff-deleted" #. (para) -#: ../source/book.xml:16793 +#: ../source/book.xml:16781 #, fuzzy msgid "Prevents Subversion from printing differences for deleted files. The default behavior when you remove a file is for svn diff to print the same differences that you would see if you had left the file but removed all the content." msgstr "防止Subversion打印删除文件的区别信息，缺省的行为方式是当你删除了一个文件后运行svn diff打印的区别与删除文件所有的内容得到的结果一样。" #. (option) -#: ../source/book.xml:16802 +#: ../source/book.xml:16790 msgid "--no-ignore" msgstr "--no-ignore" #. (para) -#: ../source/book.xml:16805 +#: ../source/book.xml:16793 #, fuzzy msgid "Shows files in the status listing that would normally be omitted since they match a pattern in the global-ignores configuration option or the svn:ignore property. See and for more information." msgstr "在状态列表中显示global-ignores配置选项或者是svn:ignore属性忽略的文件。见和查看详情。" #. (option) -#: ../source/book.xml:16814 +#: ../source/book.xml:16802 msgid "--no-unlock" msgstr "--no-unlock" #. (para) -#: ../source/book.xml:16817 +#: ../source/book.xml:16805 msgid "Don't automatically unlock files (the default commit behavior is to unlock all files listed as part of the commit). See for more information." msgstr "不自动解锁文件（缺省的提交行为是解锁提交列出的所有文件），更多信息见。" #. (option) -#: ../source/book.xml:16825 ../source/book.xml:22692 +#: ../source/book.xml:16813 ../source/book.xml:22692 msgid "--non-interactive" msgstr "--non-interactive" #. (para) -#: ../source/book.xml:16828 ../source/book.xml:22695 +#: ../source/book.xml:16816 ../source/book.xml:22695 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 of an automated script and it's more appropriate to have Subversion fail than to prompt for more information." msgstr "如果认证失败，或者是不充分的凭证时，防止出现要求凭证的提示（例如用户名和密码）。这在运行自动脚本时非常有用，只是让Subversion失败而不是提示更多的信息。" #. (term) -#: ../source/book.xml:16837 +#: ../source/book.xml:16825 msgid " ()" msgstr " ()" #. (para) -#: ../source/book.xml:16839 +#: ../source/book.xml:16827 msgid "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 "防止子命令迭代到子目录，大多数子命令缺省是迭代的，但是一些子命令—通常是那些潜在的删除或者是取消本地修改的命令—不是。" #. (option) -#: ../source/book.xml:16848 +#: ../source/book.xml:16836 msgid "--notice-ancestry" msgstr "--notice-ancestry" #. (para) -#: ../source/book.xml:16851 +#: ../source/book.xml:16839 msgid "Pay attention to ancestry when calculating differences." msgstr "在计算区别时关注祖先。" #. (option) -#: ../source/book.xml:16857 +#: ../source/book.xml:16845 msgid "--old" msgstr "--old" #. (para) -#: ../source/book.xml:16861 +#: ../source/book.xml:16849 #, fuzzy msgid "Uses ARG as the older target (for use with svn diff)." msgstr "使用ARG作为旧的目标。" #. (option) -#: ../source/book.xml:16867 ../source/book.xml:22705 +#: ../source/book.xml:16855 ../source/book.xml:22705 msgid "--password" msgstr "--password" #. (replaceable) -#: ../source/book.xml:16868 ../source/book.xml:22706 +#: ../source/book.xml:16856 ../source/book.xml:22706 msgid "PASS" msgstr "PASS" #. (para) -#: ../source/book.xml:16871 ../source/book.xml:22709 +#: ../source/book.xml:16859 ../source/book.xml:22709 msgid "Indicates that you are providing your password for authentication on the command line—otherwise, if it is needed, Subversion will prompt you for it." msgstr "指出在命令行中提供你的密码—另外，如果它是需要的，Subversion会提示你输入。" #. (term) -#: ../source/book.xml:16878 +#: ../source/book.xml:16866 msgid " ()" msgstr " ()" #. (para) -#: ../source/book.xml:16880 +#: ../source/book.xml:16868 msgid "Requests that the client print only essential information while performing an operation." msgstr "请求客户端在执行操作时只显示重要信息。" #. (term) -#: ../source/book.xml:16885 +#: ../source/book.xml:16873 msgid " ()" msgstr " ()" #. (para) -#: ../source/book.xml:16887 +#: ../source/book.xml:16875 msgid "Makes a subcommand recurse into subdirectories. Most subcommands recurse by default." msgstr "让子命令迭代到子目录，大多数子命令缺省是迭代的。" #. (option) -#: ../source/book.xml:16893 +#: ../source/book.xml:16881 msgid "--relocate" msgstr "--relocate" #. (replaceable) -#: ../source/book.xml:16894 +#: ../source/book.xml:16882 msgid "FROM TO [PATH...]" msgstr "目的路径[PATH...]" #. (para) -#: ../source/book.xml:16898 +#: ../source/book.xml:16886 #, fuzzy msgid "Used with the svn switch 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 svn switch for an example." msgstr "svn switch子命令中使用，用来修改你的工作拷贝所引用的版本库位置。当版本库的位置修改了，而你有一个工作拷贝，希望继续使用时非常有用。见svn switch的例子。" #. (term) -#: ../source/book.xml:16908 +#: ../source/book.xml:16896 msgid " () REV" msgstr " () REV" #. (para) -#: ../source/book.xml:16912 +#: ../source/book.xml:16900 #, fuzzy msgid "Indicates that you're going to supply a revision (or range of revisions) for a particular operation. You can provide revision numbers, revision keywords or dates (in curly braces), as arguments to the revision option. If you wish to provide a range of revisions, you can provide two revisions separated by a colon. For example:" msgstr "指出你将为特定操作提供一个修订版本（或修订版本的范围），你可以提供修订版本号，修订版本关键字或日期（在华括号中）作为修订版本开关的参数。如果你希望提供一个修订版本范围，你可以提供用冒号隔开的两个修订版本，举个例子：" #. (screen) -#: ../source/book.xml:16919 +#: ../source/book.xml:16907 #, no-wrap msgid "" "\n" @@ -17835,140 +17825,140 @@ msgstr "" "$ svn log -r 1729:{2002-02-17}\n" #. (para) -#: ../source/book.xml:16926 +#: ../source/book.xml:16914 msgid "See for more information." msgstr "见查看更多信息。" #. (option) -#: ../source/book.xml:16932 ../source/book.xml:21773 +#: ../source/book.xml:16920 ../source/book.xml:21773 msgid "--revprop" msgstr "--revprop" #. (para) -#: ../source/book.xml:16935 ../source/book.xml:21776 +#: ../source/book.xml:16923 ../source/book.xml:21776 #, fuzzy 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." msgstr "操作针对修订版本属性，而不是Subversion文件或目录的属性。这个选项需要你传递 ()参数。" #. (term) -#: ../source/book.xml:16943 +#: ../source/book.xml:16931 msgid " ()" msgstr " ()" #. (para) -#: ../source/book.xml:16945 +#: ../source/book.xml:16933 #, fuzzy 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 run svn update." msgstr "导致客户端显示本地拷贝哪些文件已经过期，这不会实际更新你的任何文件—只是显示了如果你运行svn update时更新的文件。" #. (option) -#: ../source/book.xml:16955 +#: ../source/book.xml:16943 msgid "--stop-on-copy" msgstr "--stop-on-copy" #. (para) -#: ../source/book.xml:16958 +#: ../source/book.xml:16946 msgid "Causes a Subversion subcommand which is traversing 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 "导致Subversion子命令在传递历史时会在版本化资源拷贝时停止收集历史信息—也就是历史中资源从另一个位置拷贝过来时。" #. (option) -#: ../source/book.xml:16968 +#: ../source/book.xml:16956 msgid "--strict" msgstr "--strict" #. (para) -#: ../source/book.xml:16971 +#: ../source/book.xml:16959 #, fuzzy msgid "Causes Subversion to use strict semantics, a notion which is rather vague unless talking about specific subcommands (namely, svn propget)." msgstr "导致Subversion使用严格的语法，也就是选择含糊，除非谈论特定的子命令。" #. (option) -#: ../source/book.xml:16978 +#: ../source/book.xml:16966 msgid "--targets" msgstr "--targets" #. (replaceable) -#: ../source/book.xml:16979 +#: ../source/book.xml:16967 msgid "FILENAME" msgstr "FILENAME" #. (para) -#: ../source/book.xml:16982 +#: ../source/book.xml:16970 msgid "Tells Subversion to get the list of files that you wish to operate on from the filename you provide instead of listing all the files on the command line." msgstr "告诉Subversion从你提供的文件中得到希望操作的文件列表，而不是在命令行列出所有的文件。" #. (option) -#: ../source/book.xml:16990 ../source/book.xml:22717 +#: ../source/book.xml:16978 ../source/book.xml:22717 msgid "--username" msgstr "--username" #. (replaceable) -#: ../source/book.xml:16991 ../source/book.xml:22718 +#: ../source/book.xml:16979 ../source/book.xml:22718 msgid "NAME" msgstr "NAME" #. (para) -#: ../source/book.xml:16994 ../source/book.xml:22721 +#: ../source/book.xml:16982 ../source/book.xml:22721 msgid "Indicates that you are providing your username for authentication on the command line—otherwise, if it is needed, Subversion will prompt you for it." msgstr "表示你要在命令行提供认证的用户名—否则如果需要，Subversion会提示你这一点。" #. (term) -#: ../source/book.xml:17001 +#: ../source/book.xml:16989 msgid " ()" msgstr " ()" #. (para) -#: ../source/book.xml:17003 +#: ../source/book.xml:16991 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 "请求客户端在运行子命令打印尽量多的信息，会导致Subversion打印额外的字段，每个文件的细节信息或者是关于动作的附加信息。" #. (option) -#: ../source/book.xml:17012 ../source/book.xml:23037 ../source/book.xml:23184 +#: ../source/book.xml:17000 ../source/book.xml:23037 ../source/book.xml:23184 msgid "--version" msgstr "--version" #. (para) -#: ../source/book.xml:17015 +#: ../source/book.xml:17003 msgid "Prints the client version info. This information not only includes 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 () it prints only the version number in a compact form." msgstr "打印客户端版本信息，这个信息不仅仅包括客户端的版本号，也有所有客户端可以用来访问Subversion版本库的版本库访问模块列表。" #. (option) -#: ../source/book.xml:17026 +#: ../source/book.xml:17014 msgid "--xml" msgstr "--xml" #. (para) -#: ../source/book.xml:17029 +#: ../source/book.xml:17017 msgid "Prints output in XML format." msgstr "使用XML格式打印输出。" #. (title) -#: ../source/book.xml:17037 +#: ../source/book.xml:17025 #, fuzzy msgid "svn Subcommands" msgstr "svn 子命令" #. (para) -#: ../source/book.xml:17039 ../source/book.xml:22734 +#: ../source/book.xml:17027 ../source/book.xml:22734 msgid "Here are the various subcommands:" msgstr "" #. (secondary) -#: ../source/book.xml:17043 ../source/book.xml:17146 ../source/book.xml:17250 -#: ../source/book.xml:17335 ../source/book.xml:17466 ../source/book.xml:17542 -#: ../source/book.xml:17670 ../source/book.xml:17826 ../source/book.xml:17936 -#: ../source/book.xml:18189 ../source/book.xml:18301 ../source/book.xml:18354 -#: ../source/book.xml:18458 ../source/book.xml:18659 ../source/book.xml:18777 -#: ../source/book.xml:18871 ../source/book.xml:19095 ../source/book.xml:19217 -#: ../source/book.xml:19302 ../source/book.xml:19409 ../source/book.xml:19488 -#: ../source/book.xml:19567 ../source/book.xml:19648 ../source/book.xml:19736 -#: ../source/book.xml:19861 ../source/book.xml:19950 ../source/book.xml:20056 -#: ../source/book.xml:20401 ../source/book.xml:20563 ../source/book.xml:20650 -#: ../source/book.xml:20944 ../source/book.xml:21003 ../source/book.xml:21042 -#: ../source/book.xml:21145 ../source/book.xml:21178 ../source/book.xml:21224 -#: ../source/book.xml:21256 ../source/book.xml:21302 ../source/book.xml:21365 -#: ../source/book.xml:21411 ../source/book.xml:21449 ../source/book.xml:21526 -#: ../source/book.xml:21570 ../source/book.xml:21618 ../source/book.xml:21675 +#: ../source/book.xml:17031 ../source/book.xml:17134 ../source/book.xml:17238 +#: ../source/book.xml:17323 ../source/book.xml:17454 ../source/book.xml:17530 +#: ../source/book.xml:17658 ../source/book.xml:17814 ../source/book.xml:17924 +#: ../source/book.xml:18177 ../source/book.xml:18289 ../source/book.xml:18342 +#: ../source/book.xml:18446 ../source/book.xml:18647 ../source/book.xml:18765 +#: ../source/book.xml:18859 ../source/book.xml:19083 ../source/book.xml:19205 +#: ../source/book.xml:19290 ../source/book.xml:19397 ../source/book.xml:19476 +#: ../source/book.xml:19555 ../source/book.xml:19636 ../source/book.xml:19724 +#: ../source/book.xml:19849 ../source/book.xml:19938 ../source/book.xml:20044 +#: ../source/book.xml:20389 ../source/book.xml:20551 ../source/book.xml:20638 +#: ../source/book.xml:20932 ../source/book.xml:20991 ../source/book.xml:21030 +#: ../source/book.xml:21133 ../source/book.xml:21166 ../source/book.xml:21212 +#: ../source/book.xml:21244 ../source/book.xml:21290 ../source/book.xml:21353 +#: ../source/book.xml:21399 ../source/book.xml:21437 ../source/book.xml:21514 +#: ../source/book.xml:21558 ../source/book.xml:21606 ../source/book.xml:21663 #: ../source/book.xml:21810 ../source/book.xml:21854 ../source/book.xml:21909 #: ../source/book.xml:21999 ../source/book.xml:22043 ../source/book.xml:22112 #: ../source/book.xml:22157 ../source/book.xml:22189 ../source/book.xml:22252 @@ -17980,31 +17970,31 @@ msgid "subcommands" msgstr "子命令" #. (tertiary) -#: ../source/book.xml:17044 +#: ../source/book.xml:17032 msgid "add" msgstr "add" #. (refpurpose) -#: ../source/book.xml:17048 +#: ../source/book.xml:17036 msgid "Add files, directories, or symbolic links." msgstr "添加文件、目录或符号链。" #. (title) -#: ../source/book.xml:17052 ../source/book.xml:17156 ../source/book.xml:17260 -#: ../source/book.xml:17344 ../source/book.xml:17475 ../source/book.xml:17551 -#: ../source/book.xml:17680 ../source/book.xml:17836 ../source/book.xml:17945 -#: ../source/book.xml:18198 ../source/book.xml:18310 ../source/book.xml:18364 -#: ../source/book.xml:18468 ../source/book.xml:18668 ../source/book.xml:18788 -#: ../source/book.xml:18880 ../source/book.xml:19105 ../source/book.xml:19226 -#: ../source/book.xml:19311 ../source/book.xml:19418 ../source/book.xml:19498 -#: ../source/book.xml:19576 ../source/book.xml:19657 ../source/book.xml:19745 -#: ../source/book.xml:19871 ../source/book.xml:19959 ../source/book.xml:20065 -#: ../source/book.xml:20410 ../source/book.xml:20572 ../source/book.xml:20659 -#: ../source/book.xml:20953 ../source/book.xml:21012 ../source/book.xml:21051 -#: ../source/book.xml:21154 ../source/book.xml:21187 ../source/book.xml:21236 -#: ../source/book.xml:21267 ../source/book.xml:21313 ../source/book.xml:21374 -#: ../source/book.xml:21420 ../source/book.xml:21462 ../source/book.xml:21536 -#: ../source/book.xml:21579 ../source/book.xml:21627 ../source/book.xml:21684 +#: ../source/book.xml:17040 ../source/book.xml:17144 ../source/book.xml:17248 +#: ../source/book.xml:17332 ../source/book.xml:17463 ../source/book.xml:17539 +#: ../source/book.xml:17668 ../source/book.xml:17824 ../source/book.xml:17933 +#: ../source/book.xml:18186 ../source/book.xml:18298 ../source/book.xml:18352 +#: ../source/book.xml:18456 ../source/book.xml:18656 ../source/book.xml:18776 +#: ../source/book.xml:18868 ../source/book.xml:19093 ../source/book.xml:19214 +#: ../source/book.xml:19299 ../source/book.xml:19406 ../source/book.xml:19486 +#: ../source/book.xml:19564 ../source/book.xml:19645 ../source/book.xml:19733 +#: ../source/book.xml:19859 ../source/book.xml:19947 ../source/book.xml:20053 +#: ../source/book.xml:20398 ../source/book.xml:20560 ../source/book.xml:20647 +#: ../source/book.xml:20941 ../source/book.xml:21000 ../source/book.xml:21039 +#: ../source/book.xml:21142 ../source/book.xml:21175 ../source/book.xml:21224 +#: ../source/book.xml:21255 ../source/book.xml:21301 ../source/book.xml:21362 +#: ../source/book.xml:21408 ../source/book.xml:21450 ../source/book.xml:21524 +#: ../source/book.xml:21567 ../source/book.xml:21615 ../source/book.xml:21672 #: ../source/book.xml:21819 ../source/book.xml:21863 ../source/book.xml:21918 #: ../source/book.xml:22008 ../source/book.xml:22052 ../source/book.xml:22121 #: ../source/book.xml:22166 ../source/book.xml:22200 ../source/book.xml:22262 @@ -18016,27 +18006,27 @@ msgid "Synopsis" msgstr "概要" #. (programlisting) -#: ../source/book.xml:17054 +#: ../source/book.xml:17042 #, no-wrap msgid "svn add PATH..." msgstr "svn add PATH..." #. (title), (entry) -#: ../source/book.xml:17058 ../source/book.xml:17162 ../source/book.xml:17266 -#: ../source/book.xml:17350 ../source/book.xml:17481 ../source/book.xml:17557 -#: ../source/book.xml:17686 ../source/book.xml:17843 ../source/book.xml:17953 -#: ../source/book.xml:18205 ../source/book.xml:18316 ../source/book.xml:18370 -#: ../source/book.xml:18474 ../source/book.xml:18674 ../source/book.xml:18794 -#: ../source/book.xml:18888 ../source/book.xml:19113 ../source/book.xml:19233 -#: ../source/book.xml:19317 ../source/book.xml:19425 ../source/book.xml:19505 -#: ../source/book.xml:19583 ../source/book.xml:19664 ../source/book.xml:19752 -#: ../source/book.xml:19877 ../source/book.xml:19965 ../source/book.xml:20071 -#: ../source/book.xml:20417 ../source/book.xml:20578 ../source/book.xml:20665 -#: ../source/book.xml:20959 ../source/book.xml:21018 ../source/book.xml:21057 -#: ../source/book.xml:21160 ../source/book.xml:21193 ../source/book.xml:21242 -#: ../source/book.xml:21273 ../source/book.xml:21319 ../source/book.xml:21380 -#: ../source/book.xml:21426 ../source/book.xml:21468 ../source/book.xml:21542 -#: ../source/book.xml:21585 ../source/book.xml:21633 ../source/book.xml:21690 +#: ../source/book.xml:17046 ../source/book.xml:17150 ../source/book.xml:17254 +#: ../source/book.xml:17338 ../source/book.xml:17469 ../source/book.xml:17545 +#: ../source/book.xml:17674 ../source/book.xml:17831 ../source/book.xml:17941 +#: ../source/book.xml:18193 ../source/book.xml:18304 ../source/book.xml:18358 +#: ../source/book.xml:18462 ../source/book.xml:18662 ../source/book.xml:18782 +#: ../source/book.xml:18876 ../source/book.xml:19101 ../source/book.xml:19221 +#: ../source/book.xml:19305 ../source/book.xml:19413 ../source/book.xml:19493 +#: ../source/book.xml:19571 ../source/book.xml:19652 ../source/book.xml:19740 +#: ../source/book.xml:19865 ../source/book.xml:19953 ../source/book.xml:20059 +#: ../source/book.xml:20405 ../source/book.xml:20566 ../source/book.xml:20653 +#: ../source/book.xml:20947 ../source/book.xml:21006 ../source/book.xml:21045 +#: ../source/book.xml:21148 ../source/book.xml:21181 ../source/book.xml:21230 +#: ../source/book.xml:21261 ../source/book.xml:21307 ../source/book.xml:21368 +#: ../source/book.xml:21414 ../source/book.xml:21456 ../source/book.xml:21530 +#: ../source/book.xml:21573 ../source/book.xml:21621 ../source/book.xml:21678 #: ../source/book.xml:21825 ../source/book.xml:21869 ../source/book.xml:21924 #: ../source/book.xml:22014 ../source/book.xml:22058 ../source/book.xml:22127 #: ../source/book.xml:22172 ../source/book.xml:22206 ../source/book.xml:22268 @@ -18052,92 +18042,92 @@ msgid "Description" msgstr "描述" #. (para) -#: ../source/book.xml:17060 +#: ../source/book.xml:17048 #, fuzzy 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 svn revert." msgstr "添加文件、目录或符号链到你的工作拷贝并且预定添加到版本库。它们会在下次提交上传并添加到版本库，如果你在提交之前改变了主意，你可以使用svn revert取消预定。" #. (title) -#: ../source/book.xml:17070 ../source/book.xml:17171 ../source/book.xml:17274 -#: ../source/book.xml:17362 ../source/book.xml:17499 ../source/book.xml:17582 -#: ../source/book.xml:17728 ../source/book.xml:17858 ../source/book.xml:18059 -#: ../source/book.xml:18224 ../source/book.xml:18323 ../source/book.xml:18382 -#: ../source/book.xml:18560 ../source/book.xml:18715 ../source/book.xml:18805 -#: ../source/book.xml:18917 ../source/book.xml:19147 ../source/book.xml:19247 -#: ../source/book.xml:19350 ../source/book.xml:19436 ../source/book.xml:19516 -#: ../source/book.xml:19594 ../source/book.xml:19675 ../source/book.xml:19770 -#: ../source/book.xml:19890 ../source/book.xml:19978 ../source/book.xml:20314 -#: ../source/book.xml:20437 ../source/book.xml:20590 ../source/book.xml:20717 -#: ../source/book.xml:21170 ../source/book.xml:22181 ../source/book.xml:22416 +#: ../source/book.xml:17058 ../source/book.xml:17159 ../source/book.xml:17262 +#: ../source/book.xml:17350 ../source/book.xml:17487 ../source/book.xml:17570 +#: ../source/book.xml:17716 ../source/book.xml:17846 ../source/book.xml:18047 +#: ../source/book.xml:18212 ../source/book.xml:18311 ../source/book.xml:18370 +#: ../source/book.xml:18548 ../source/book.xml:18703 ../source/book.xml:18793 +#: ../source/book.xml:18905 ../source/book.xml:19135 ../source/book.xml:19235 +#: ../source/book.xml:19338 ../source/book.xml:19424 ../source/book.xml:19504 +#: ../source/book.xml:19582 ../source/book.xml:19663 ../source/book.xml:19758 +#: ../source/book.xml:19878 ../source/book.xml:19966 ../source/book.xml:20302 +#: ../source/book.xml:20425 ../source/book.xml:20578 ../source/book.xml:20705 +#: ../source/book.xml:21158 ../source/book.xml:22181 ../source/book.xml:22416 #: ../source/book.xml:22469 ../source/book.xml:22773 ../source/book.xml:22834 #: ../source/book.xml:22904 msgid "Alternate Names" msgstr "别名" #. (para) -#: ../source/book.xml:17072 ../source/book.xml:17276 ../source/book.xml:17501 -#: ../source/book.xml:18226 ../source/book.xml:18384 ../source/book.xml:18562 -#: ../source/book.xml:18807 ../source/book.xml:18919 ../source/book.xml:19149 -#: ../source/book.xml:19249 ../source/book.xml:19892 ../source/book.xml:19980 -#: ../source/book.xml:20592 ../source/book.xml:21388 ../source/book.xml:21550 +#: ../source/book.xml:17060 ../source/book.xml:17264 ../source/book.xml:17489 +#: ../source/book.xml:18214 ../source/book.xml:18372 ../source/book.xml:18550 +#: ../source/book.xml:18795 ../source/book.xml:18907 ../source/book.xml:19137 +#: ../source/book.xml:19237 ../source/book.xml:19880 ../source/book.xml:19968 +#: ../source/book.xml:20580 ../source/book.xml:21376 ../source/book.xml:21538 #: ../source/book.xml:22327 ../source/book.xml:22775 msgid "None" msgstr "无" #. (title) -#: ../source/book.xml:17076 ../source/book.xml:17177 ../source/book.xml:17280 -#: ../source/book.xml:17368 ../source/book.xml:17505 ../source/book.xml:17590 -#: ../source/book.xml:17734 ../source/book.xml:17864 ../source/book.xml:18065 -#: ../source/book.xml:18230 ../source/book.xml:18332 ../source/book.xml:18388 -#: ../source/book.xml:18566 ../source/book.xml:18721 ../source/book.xml:18811 -#: ../source/book.xml:18923 ../source/book.xml:19153 ../source/book.xml:19253 -#: ../source/book.xml:19356 ../source/book.xml:19442 ../source/book.xml:19522 -#: ../source/book.xml:19600 ../source/book.xml:19681 ../source/book.xml:19776 -#: ../source/book.xml:19896 ../source/book.xml:19984 ../source/book.xml:20320 -#: ../source/book.xml:20443 ../source/book.xml:20596 ../source/book.xml:20723 +#: ../source/book.xml:17064 ../source/book.xml:17165 ../source/book.xml:17268 +#: ../source/book.xml:17356 ../source/book.xml:17493 ../source/book.xml:17578 +#: ../source/book.xml:17722 ../source/book.xml:17852 ../source/book.xml:18053 +#: ../source/book.xml:18218 ../source/book.xml:18320 ../source/book.xml:18376 +#: ../source/book.xml:18554 ../source/book.xml:18709 ../source/book.xml:18799 +#: ../source/book.xml:18911 ../source/book.xml:19141 ../source/book.xml:19241 +#: ../source/book.xml:19344 ../source/book.xml:19430 ../source/book.xml:19510 +#: ../source/book.xml:19588 ../source/book.xml:19669 ../source/book.xml:19764 +#: ../source/book.xml:19884 ../source/book.xml:19972 ../source/book.xml:20308 +#: ../source/book.xml:20431 ../source/book.xml:20584 ../source/book.xml:20711 msgid "Changes" msgstr "改变" #. (para) -#: ../source/book.xml:17078 +#: ../source/book.xml:17066 msgid "Working Copy" msgstr "工作拷贝" #. (title) -#: ../source/book.xml:17082 ../source/book.xml:17183 ../source/book.xml:17286 -#: ../source/book.xml:17374 ../source/book.xml:17511 ../source/book.xml:17596 -#: ../source/book.xml:17741 ../source/book.xml:17871 ../source/book.xml:18071 -#: ../source/book.xml:18236 ../source/book.xml:18338 ../source/book.xml:18394 -#: ../source/book.xml:18572 ../source/book.xml:18727 ../source/book.xml:18817 -#: ../source/book.xml:18929 ../source/book.xml:19159 ../source/book.xml:19259 -#: ../source/book.xml:19362 ../source/book.xml:19448 ../source/book.xml:19528 -#: ../source/book.xml:19606 ../source/book.xml:19687 ../source/book.xml:19782 -#: ../source/book.xml:19902 ../source/book.xml:19990 ../source/book.xml:20326 -#: ../source/book.xml:20449 ../source/book.xml:20602 ../source/book.xml:20729 +#: ../source/book.xml:17070 ../source/book.xml:17171 ../source/book.xml:17274 +#: ../source/book.xml:17362 ../source/book.xml:17499 ../source/book.xml:17584 +#: ../source/book.xml:17729 ../source/book.xml:17859 ../source/book.xml:18059 +#: ../source/book.xml:18224 ../source/book.xml:18326 ../source/book.xml:18382 +#: ../source/book.xml:18560 ../source/book.xml:18715 ../source/book.xml:18805 +#: ../source/book.xml:18917 ../source/book.xml:19147 ../source/book.xml:19247 +#: ../source/book.xml:19350 ../source/book.xml:19436 ../source/book.xml:19516 +#: ../source/book.xml:19594 ../source/book.xml:19675 ../source/book.xml:19770 +#: ../source/book.xml:19890 ../source/book.xml:19978 ../source/book.xml:20314 +#: ../source/book.xml:20437 ../source/book.xml:20590 ../source/book.xml:20717 msgid "Accesses Repository" msgstr "是否访问版本库" #. (para) -#: ../source/book.xml:17084 ../source/book.xml:17513 ../source/book.xml:18340 -#: ../source/book.xml:19904 ../source/book.xml:19992 +#: ../source/book.xml:17072 ../source/book.xml:17501 ../source/book.xml:18328 +#: ../source/book.xml:19892 ../source/book.xml:19980 msgid "No" msgstr "否" #. (title) -#: ../source/book.xml:17088 ../source/book.xml:17189 ../source/book.xml:17292 -#: ../source/book.xml:17380 ../source/book.xml:17517 ../source/book.xml:17602 -#: ../source/book.xml:17748 ../source/book.xml:17877 ../source/book.xml:18078 -#: ../source/book.xml:18242 ../source/book.xml:18344 ../source/book.xml:18400 -#: ../source/book.xml:18578 ../source/book.xml:18733 ../source/book.xml:18823 -#: ../source/book.xml:18935 ../source/book.xml:19165 ../source/book.xml:19265 -#: ../source/book.xml:19368 ../source/book.xml:19454 ../source/book.xml:19534 -#: ../source/book.xml:19612 ../source/book.xml:19693 ../source/book.xml:19788 -#: ../source/book.xml:19908 ../source/book.xml:19996 ../source/book.xml:20332 -#: ../source/book.xml:20455 ../source/book.xml:20608 ../source/book.xml:20735 -#: ../source/book.xml:20973 ../source/book.xml:21031 ../source/book.xml:21106 -#: ../source/book.xml:21207 ../source/book.xml:21327 ../source/book.xml:21386 -#: ../source/book.xml:21475 ../source/book.xml:21548 ../source/book.xml:21592 -#: ../source/book.xml:21652 ../source/book.xml:21832 ../source/book.xml:21875 +#: ../source/book.xml:17076 ../source/book.xml:17177 ../source/book.xml:17280 +#: ../source/book.xml:17368 ../source/book.xml:17505 ../source/book.xml:17590 +#: ../source/book.xml:17736 ../source/book.xml:17865 ../source/book.xml:18066 +#: ../source/book.xml:18230 ../source/book.xml:18332 ../source/book.xml:18388 +#: ../source/book.xml:18566 ../source/book.xml:18721 ../source/book.xml:18811 +#: ../source/book.xml:18923 ../source/book.xml:19153 ../source/book.xml:19253 +#: ../source/book.xml:19356 ../source/book.xml:19442 ../source/book.xml:19522 +#: ../source/book.xml:19600 ../source/book.xml:19681 ../source/book.xml:19776 +#: ../source/book.xml:19896 ../source/book.xml:19984 ../source/book.xml:20320 +#: ../source/book.xml:20443 ../source/book.xml:20596 ../source/book.xml:20723 +#: ../source/book.xml:20961 ../source/book.xml:21019 ../source/book.xml:21094 +#: ../source/book.xml:21195 ../source/book.xml:21315 ../source/book.xml:21374 +#: ../source/book.xml:21463 ../source/book.xml:21536 ../source/book.xml:21580 +#: ../source/book.xml:21640 ../source/book.xml:21832 ../source/book.xml:21875 #: ../source/book.xml:21968 ../source/book.xml:22021 ../source/book.xml:22065 #: ../source/book.xml:22135 ../source/book.xml:22214 ../source/book.xml:22275 #: ../source/book.xml:22325 ../source/book.xml:22371 ../source/book.xml:22422 @@ -18147,7 +18137,7 @@ msgid "Options" msgstr "选项" #. (screen) -#: ../source/book.xml:17090 +#: ../source/book.xml:17078 #, no-wrap msgid "" "\n" @@ -18171,19 +18161,19 @@ msgstr "" "--force\n" #. (title) -#: ../source/book.xml:17103 ../source/book.xml:17229 ../source/book.xml:17305 -#: ../source/book.xml:17396 ../source/book.xml:17526 ../source/book.xml:17622 -#: ../source/book.xml:17767 ../source/book.xml:17897 ../source/book.xml:18102 -#: ../source/book.xml:18260 ../source/book.xml:18422 ../source/book.xml:18595 -#: ../source/book.xml:18750 ../source/book.xml:18841 ../source/book.xml:18955 -#: ../source/book.xml:19186 ../source/book.xml:19283 ../source/book.xml:19388 -#: ../source/book.xml:19470 ../source/book.xml:19550 ../source/book.xml:19628 -#: ../source/book.xml:19710 ../source/book.xml:19808 ../source/book.xml:19919 -#: ../source/book.xml:20007 ../source/book.xml:20350 ../source/book.xml:20472 -#: ../source/book.xml:20622 ../source/book.xml:20754 ../source/book.xml:20984 -#: ../source/book.xml:21117 ../source/book.xml:21285 ../source/book.xml:21435 -#: ../source/book.xml:21483 ../source/book.xml:21600 ../source/book.xml:21661 -#: ../source/book.xml:21706 ../source/book.xml:21841 ../source/book.xml:21884 +#: ../source/book.xml:17091 ../source/book.xml:17217 ../source/book.xml:17293 +#: ../source/book.xml:17384 ../source/book.xml:17514 ../source/book.xml:17610 +#: ../source/book.xml:17755 ../source/book.xml:17885 ../source/book.xml:18090 +#: ../source/book.xml:18248 ../source/book.xml:18410 ../source/book.xml:18583 +#: ../source/book.xml:18738 ../source/book.xml:18829 ../source/book.xml:18943 +#: ../source/book.xml:19174 ../source/book.xml:19271 ../source/book.xml:19376 +#: ../source/book.xml:19458 ../source/book.xml:19538 ../source/book.xml:19616 +#: ../source/book.xml:19698 ../source/book.xml:19796 ../source/book.xml:19907 +#: ../source/book.xml:19995 ../source/book.xml:20338 ../source/book.xml:20460 +#: ../source/book.xml:20610 ../source/book.xml:20742 ../source/book.xml:20972 +#: ../source/book.xml:21105 ../source/book.xml:21273 ../source/book.xml:21423 +#: ../source/book.xml:21471 ../source/book.xml:21588 ../source/book.xml:21649 +#: ../source/book.xml:21694 ../source/book.xml:21841 ../source/book.xml:21884 #: ../source/book.xml:21977 ../source/book.xml:22030 ../source/book.xml:22076 #: ../source/book.xml:22144 ../source/book.xml:22223 ../source/book.xml:22284 #: ../source/book.xml:22331 ../source/book.xml:22380 ../source/book.xml:22432 @@ -18194,12 +18184,12 @@ msgid "Examples" msgstr "例子" #. (para) -#: ../source/book.xml:17105 +#: ../source/book.xml:17093 msgid "To add a file to your working copy:" msgstr "添加一个文件到工作拷贝：" #. (screen) -#: ../source/book.xml:17106 +#: ../source/book.xml:17094 #, no-wrap msgid "" "\n" @@ -18211,13 +18201,13 @@ msgstr "" "A foo.c\n" #. (para) -#: ../source/book.xml:17110 +#: ../source/book.xml:17098 #, fuzzy msgid "When adding a directory, the default behavior of svn add is to recurse:" msgstr "当添加一个目录，svn add缺省的行为方式是递归的：" #. (screen) -#: ../source/book.xml:17112 +#: ../source/book.xml:17100 #, no-wrap msgid "" "\n" @@ -18237,12 +18227,12 @@ msgstr "" "A testdir/d\n" #. (para) -#: ../source/book.xml:17120 +#: ../source/book.xml:17108 msgid "You can add a directory without adding its contents:" msgstr "你可以只添加一个目录而不包括其内容：" #. (screen) -#: ../source/book.xml:17122 +#: ../source/book.xml:17110 #, no-wrap msgid "" "\n" @@ -18254,13 +18244,13 @@ msgstr "" "A otherdir\n" #. (para) -#: ../source/book.xml:17126 +#: ../source/book.xml:17114 #, fuzzy msgid "Normally, the command svn add * 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 down. Passing the option makes svn add recurse into versioned directories:" msgstr "通常情况下，命令svn add *会忽略所有已经在版本控制之下的目录，有时候，你会希望添加所有工作拷贝的未版本化文件，包括那些隐藏在深处的文件，可以使用svn add的递归到版本化的目录下：" #. (screen) -#: ../source/book.xml:17134 +#: ../source/book.xml:17122 #, no-wrap msgid "" "\n" @@ -18278,53 +18268,53 @@ msgstr "" "…\n" #. (tertiary) -#: ../source/book.xml:17147 +#: ../source/book.xml:17135 msgid "blame" msgstr "blame" #. (refname) -#: ../source/book.xml:17150 +#: ../source/book.xml:17138 msgid "svn blame" msgstr "svn blame" #. (refpurpose) -#: ../source/book.xml:17151 +#: ../source/book.xml:17139 msgid "Show author and revision information in-line for the specified files or URLs." msgstr "显示特定文件和URL内嵌的作者和修订版本信息。" #. (programlisting) -#: ../source/book.xml:17158 +#: ../source/book.xml:17146 #, no-wrap msgid "svn blame TARGET[@REV]..." msgstr "svn blame TARGET[@REV]..." #. (para) -#: ../source/book.xml:17164 +#: ../source/book.xml:17152 msgid "Show author and revision information in-line 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 "显示特定文件和URL内嵌的作者和修订版本信息。每一行文本在开头都放了最后修改的作者（用户名）和修订版本号。" #. (para) -#: ../source/book.xml:17173 +#: ../source/book.xml:17161 msgid "praise, annotate, ann" msgstr "praise、annotate、ann" #. (para) -#: ../source/book.xml:17179 ../source/book.xml:17282 ../source/book.xml:18067 -#: ../source/book.xml:18334 ../source/book.xml:18568 ../source/book.xml:18723 -#: ../source/book.xml:18925 ../source/book.xml:20322 +#: ../source/book.xml:17167 ../source/book.xml:17270 ../source/book.xml:18055 +#: ../source/book.xml:18322 ../source/book.xml:18556 ../source/book.xml:18711 +#: ../source/book.xml:18913 ../source/book.xml:20310 msgid "Nothing" msgstr "无2" #. (para) -#: ../source/book.xml:17185 ../source/book.xml:17288 ../source/book.xml:17376 -#: ../source/book.xml:17598 ../source/book.xml:18396 ../source/book.xml:18729 -#: ../source/book.xml:18819 ../source/book.xml:18931 ../source/book.xml:20451 -#: ../source/book.xml:20604 ../source/book.xml:20731 +#: ../source/book.xml:17173 ../source/book.xml:17276 ../source/book.xml:17364 +#: ../source/book.xml:17586 ../source/book.xml:18384 ../source/book.xml:18717 +#: ../source/book.xml:18807 ../source/book.xml:18919 ../source/book.xml:20439 +#: ../source/book.xml:20592 ../source/book.xml:20719 msgid "Yes" msgstr "是" #. (screen) -#: ../source/book.xml:17191 +#: ../source/book.xml:17179 #, no-wrap msgid "" "\n" @@ -18354,13 +18344,13 @@ msgstr "" "--config-dir ARG\n" #. (para) -#: ../source/book.xml:17231 +#: ../source/book.xml:17219 #, fuzzy msgid "If you want to see blame annotated source for readme.txt in your test repository:" msgstr "如果你希望在测试版本库看到blame标记的readme.txt源代码：" #. (screen) -#: ../source/book.xml:17234 +#: ../source/book.xml:17222 #, no-wrap msgid "" "\n" @@ -18374,34 +18364,34 @@ msgstr "" " 5 harry You should read this.\n" #. (para) -#: ../source/book.xml:17239 +#: ../source/book.xml:17227 msgid "Even if svn blame says that Harry last modified readme.txt in revision 5, you'll have to examine exactly what the revision changed to be sure that Harry changed the context of the line—he may have just adjusted the whitespace." msgstr "" #. (tertiary) -#: ../source/book.xml:17251 ../source/book.xml:21855 +#: ../source/book.xml:17239 ../source/book.xml:21855 msgid "cat" msgstr "cat" #. (refpurpose) -#: ../source/book.xml:17255 +#: ../source/book.xml:17243 msgid "Output the contents of the specified files or URLs." msgstr "输出特定文件或URL的内容。" #. (programlisting) -#: ../source/book.xml:17262 +#: ../source/book.xml:17250 #, no-wrap msgid "svn cat TARGET[@REV]..." msgstr "svn cat TARGET[@REV]..." #. (para) -#: ../source/book.xml:17268 +#: ../source/book.xml:17256 #, fuzzy msgid "Output the contents of the specified files or URLs. For listing the contents of directories, see svn list." msgstr "输出特定文件或URL的内容。列出目录的内容可以使用svn list。" #. (screen) -#: ../source/book.xml:17294 +#: ../source/book.xml:17282 #, no-wrap msgid "" "\n" @@ -18421,12 +18411,12 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:17307 +#: ../source/book.xml:17295 msgid "If you want to view readme.txt in your repository without checking it out:" msgstr "如果你希望不检出而察看版本库的readme.txt的内容：" #. (screen) -#: ../source/book.xml:17309 +#: ../source/book.xml:17297 #, no-wrap msgid "" "\n" @@ -18440,13 +18430,13 @@ msgstr "" "You should read this.\n" #. (para) -#: ../source/book.xml:17315 +#: ../source/book.xml:17303 #, fuzzy msgid "If your working copy is out of date (or you have local modifications) and you want to see the HEAD revision of a file in your working copy, svn cat -r HEAD will automatically fetch the HEAD revision when you give it a path:" msgstr "如果你的工作拷贝已经过期（或者你有本地修改），并且希望察看工作拷贝的HEAD修订版本的一个文件，如果你给定一个路径，svn cat会自动取得HEAD的修订版本：" #. (screen) -#: ../source/book.xml:17322 +#: ../source/book.xml:17310 #, no-wrap msgid "" "\n" @@ -18466,43 +18456,43 @@ msgstr "" "Latest revision fresh from the repository!\n" #. (tertiary) -#: ../source/book.xml:17336 +#: ../source/book.xml:17324 msgid "checkout" msgstr "checkout" #. (refname) -#: ../source/book.xml:17339 +#: ../source/book.xml:17327 msgid "svn checkout" msgstr "svn checkout" #. (refpurpose) -#: ../source/book.xml:17340 +#: ../source/book.xml:17328 msgid "Check out a working copy from a repository." msgstr "从版本库取出一个工作拷贝。" #. (programlisting) -#: ../source/book.xml:17346 +#: ../source/book.xml:17334 #, no-wrap msgid "svn checkout URL[@REV]... [PATH]" msgstr "svn checkout URL[@REV]... [PATH]" #. (para) -#: ../source/book.xml:17352 +#: ../source/book.xml:17340 msgid "Check out a working copy from a repository. If PATH 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 PATH, with the name of the subdirectory being the basename of the URL." msgstr "从版本库取出一个工作拷贝，如果省略PATH，URL的基名称会作为目标，如果给定多个URL，每一个都会检出到PATH的子目录，使用URL基名称的子目录名称。" #. (para) -#: ../source/book.xml:17364 +#: ../source/book.xml:17352 msgid "co" msgstr "co" #. (para) -#: ../source/book.xml:17370 +#: ../source/book.xml:17358 msgid "Creates a working copy." msgstr "创建一个工作拷贝。" #. (screen) -#: ../source/book.xml:17382 +#: ../source/book.xml:17370 #, no-wrap msgid "" "\n" @@ -18528,13 +18518,13 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:17398 +#: ../source/book.xml:17386 #, fuzzy msgid "Check out a working copy into a directory called mine:" msgstr "取出一个工作拷贝到mine：" #. (screen) -#: ../source/book.xml:17400 +#: ../source/book.xml:17388 #, no-wrap msgid "" "\n" @@ -18554,13 +18544,13 @@ msgstr "" "mine\n" #. (para) -#: ../source/book.xml:17408 +#: ../source/book.xml:17396 #, fuzzy msgid "Check out two different directories into two separate working copies:" msgstr "检出两个目录到两个单独的工作拷贝：" #. (screen) -#: ../source/book.xml:17410 +#: ../source/book.xml:17398 #, no-wrap msgid "" "\n" @@ -18586,13 +18576,13 @@ msgstr "" "quiz test\n" #. (para) -#: ../source/book.xml:17421 +#: ../source/book.xml:17409 #, fuzzy msgid "Check out two different directories into two separate working copies, but place both into a directory called working-copies:" msgstr "检出两个目录到两个单独的工作拷贝，但是将两个目录都放到working-copies：" #. (screen) -#: ../source/book.xml:17424 +#: ../source/book.xml:17412 #, no-wrap msgid "" "\n" @@ -18618,13 +18608,13 @@ msgstr "" "working-copies\n" #. (para) -#: ../source/book.xml:17435 +#: ../source/book.xml:17423 #, fuzzy msgid "If you interrupt a checkout (or something else interrupts your checkout, like loss of connectivity, etc.), you can restart it either by issuing the identical checkout command again, or by updating the incomplete working copy:" msgstr "如果你打断一个检出（或其它打断检出的事情，如连接失败。），你可以使用同样的命令重新开始或者是更新不完整的工作拷贝：" #. (screen) -#: ../source/book.xml:17440 +#: ../source/book.xml:17428 #, no-wrap msgid "" "\n" @@ -18670,45 +18660,45 @@ msgstr "" "Updated to revision 3.\n" #. (tertiary) -#: ../source/book.xml:17467 +#: ../source/book.xml:17455 msgid "cleanup" msgstr "cleanup" #. (refname) -#: ../source/book.xml:17470 +#: ../source/book.xml:17458 msgid "svn cleanup" msgstr "svn cleanup" #. (refpurpose) -#: ../source/book.xml:17471 +#: ../source/book.xml:17459 msgid "Recursively clean up the working copy." msgstr "递归清理工作拷贝。" #. (programlisting) -#: ../source/book.xml:17477 +#: ../source/book.xml:17465 #, no-wrap msgid "svn cleanup [PATH...]" msgstr "svn cleanup [PATH...]" #. (para) -#: ../source/book.xml:17483 +#: ../source/book.xml:17471 msgid "Recursively clean up the working copy, removing working copy locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again." msgstr "递归清理工作拷贝，删除未完成的工作拷贝锁定，并恢复未完成的操作。如果你得到一个工作拷贝已锁定的错误，运行这个命令可以删除无效的锁定，让你的工作拷贝再次回到可用的状态。" #. (para) -#: ../source/book.xml:17488 +#: ../source/book.xml:17476 #, fuzzy msgid "If, for some reason, an svn update fails due to a problem running an external diff program (e.g. user input or network failure), pass the to allow cleanup to complete any merging with your external diff program. You can also specify any configuration directory with the option, but you should need these options extremely infrequently." msgstr "如果，因为一些原因，运行外置的区别程序（例如，用户输入或是网络错误）有时候会导致一个svn update失败，使用选项可以完全清除你的外置区别程序所作的合并，你也可以使用指定任何配置目录，但是你应该不会经常使用这些选项。" #. (para) -#: ../source/book.xml:17507 ../source/book.xml:19155 ../source/book.xml:19898 -#: ../source/book.xml:19986 ../source/book.xml:20445 ../source/book.xml:20725 +#: ../source/book.xml:17495 ../source/book.xml:19143 ../source/book.xml:19886 +#: ../source/book.xml:19974 ../source/book.xml:20433 ../source/book.xml:20713 msgid "Working copy" msgstr "工作拷贝2" #. (screen) -#: ../source/book.xml:17519 +#: ../source/book.xml:17507 #, no-wrap msgid "" "\n" @@ -18720,13 +18710,13 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:17528 +#: ../source/book.xml:17516 #, fuzzy msgid "Well, there's not much to the examples here as svn cleanup generates no output. If you pass no PATH, . is used." msgstr "svn cleanup没有输出，没有太多的例子，如果你没有传递PATH，会使用.。" #. (screen) -#: ../source/book.xml:17532 +#: ../source/book.xml:17520 #, no-wrap msgid "" "\n" @@ -18740,49 +18730,49 @@ msgstr "" "$ svn cleanup /path/to/working-copy\n" #. (tertiary) -#: ../source/book.xml:17543 +#: ../source/book.xml:17531 msgid "commit" msgstr "commit" #. (refpurpose) -#: ../source/book.xml:17547 +#: ../source/book.xml:17535 msgid "Send changes from your working copy to the repository." msgstr "将修改从工作拷贝发送到版本库。" #. (programlisting) -#: ../source/book.xml:17553 +#: ../source/book.xml:17541 #, no-wrap msgid "svn commit [PATH...]" msgstr "svn commit [PATH...]" #. (para) -#: ../source/book.xml:17559 +#: ../source/book.xml:17547 #, fuzzy 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 or option, svn will launch your editor for you to compose a commit message. See the editor-cmd section in ." msgstr "将修改从工作拷贝发送到版本库。如果你没有使用或提供一个提交日志信息，svn会启动你的编辑器来编写一个提交信息，见的editor-cmd小节。" #. (para) -#: ../source/book.xml:17566 +#: ../source/book.xml:17554 msgid "svn commit will send any lock tokens that it finds and will release locks on all PATHS committed (recursively), unless is passed." msgstr "" #. (para) -#: ../source/book.xml:17571 +#: ../source/book.xml:17559 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 "如果你开始一个提交并且Subversion启动了你的编辑器来编辑提交信息，你仍可以退出而不会提交你的修改，如果你希望取消你的提交，只需要退出编辑器而不保存你的提交信息，Subversion会提示你是选择取消提交、空信息继续还是重新编辑信息。" #. (para) -#: ../source/book.xml:17584 +#: ../source/book.xml:17572 msgid "ci (short for check in; not co, which is short for checkout)" msgstr "ci（check in的缩写；不是checkout的缩写co。）" #. (para) -#: ../source/book.xml:17592 +#: ../source/book.xml:17580 msgid "Working copy, repository" msgstr "工作拷贝，版本库" #. (screen) -#: ../source/book.xml:17604 +#: ../source/book.xml:17592 #, no-wrap msgid "" "\n" @@ -18816,13 +18806,13 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:17624 +#: ../source/book.xml:17612 #, fuzzy msgid "Commit a simple modification to a file with the commit message on the command line and an implicit target of your current directory (.):" msgstr "使用命令行提交一个包含日志信息的文件修改，当前目录（.）是没有说明的目标路径：" #. (screen) -#: ../source/book.xml:17628 +#: ../source/book.xml:17616 #, no-wrap msgid "" "\n" @@ -18838,13 +18828,13 @@ msgstr "" "Committed revision 3.\n" #. (para) -#: ../source/book.xml:17634 +#: ../source/book.xml:17622 #, fuzzy msgid "Commit a modification to the file foo.c (explicitly specified on the command line) with the commit message in a file named msg:" msgstr "提交一个修改到foo.c（在命令行明确指明），并且msg文件中保存了提交信息：" #. (screen) -#: ../source/book.xml:17638 +#: ../source/book.xml:17626 #, no-wrap msgid "" "\n" @@ -18860,13 +18850,13 @@ msgstr "" "Committed revision 5.\n" #. (para) -#: ../source/book.xml:17644 +#: ../source/book.xml:17632 #, fuzzy msgid "If you want to use a file that's under version control for your commit message with , you need to pass the option:" msgstr "如果你希望使用在选项中使用在版本控制之下的文件作为参数，你需要使用选项：" #. (screen) -#: ../source/book.xml:17648 +#: ../source/book.xml:17636 #, no-wrap msgid "" "\n" @@ -18890,12 +18880,12 @@ msgstr "" "Committed revision 6.\n" #. (para) -#: ../source/book.xml:17658 +#: ../source/book.xml:17646 msgid "To commit a file scheduled for deletion:" msgstr "提交一个已经预定要删除的文件：" #. (screen) -#: ../source/book.xml:17659 +#: ../source/book.xml:17647 #, no-wrap msgid "" "\n" @@ -18911,93 +18901,93 @@ msgstr "" "Committed revision 7.\n" #. (tertiary) -#: ../source/book.xml:17671 +#: ../source/book.xml:17659 msgid "copy" msgstr "copy" #. (refpurpose) -#: ../source/book.xml:17675 +#: ../source/book.xml:17663 msgid "Copy a file or directory in a working copy or in the repository." msgstr "拷贝工作拷贝的一个文件或目录到版本库。" #. (programlisting) -#: ../source/book.xml:17682 +#: ../source/book.xml:17670 #, no-wrap msgid "svn copy SRC DST" msgstr "svn copy SRC DST" #. (para) -#: ../source/book.xml:17688 +#: ../source/book.xml:17676 msgid "Copy a file in a working copy or in the repository. SRC and DST can each be either a working copy (WC) path or URL:" msgstr "拷贝工作拷贝的一个文件或目录到版本库。SRC和DST既可以是工作拷贝（WC）路径也可以是URL：" #. (term) -#: ../source/book.xml:17694 ../source/book.xml:19334 +#: ../source/book.xml:17682 ../source/book.xml:19322 msgid "WC -> WC" msgstr "WC -> WC" #. (para) -#: ../source/book.xml:17696 +#: ../source/book.xml:17684 msgid "Copy and schedule an item for addition (with history)." msgstr "拷贝并且预定一个添加的项目（包含历史）。" #. (term) -#: ../source/book.xml:17701 +#: ../source/book.xml:17689 msgid "WC -> URL" msgstr "WC -> URL" #. (para) -#: ../source/book.xml:17703 +#: ../source/book.xml:17691 msgid "Immediately commit a copy of WC to URL." msgstr "将WC或URL的拷贝立即提交。" #. (term) -#: ../source/book.xml:17707 +#: ../source/book.xml:17695 msgid "URL -> WC" msgstr "URL -> WC" #. (para) -#: ../source/book.xml:17709 +#: ../source/book.xml:17697 msgid "Check out URL into WC, and schedule it for addition." msgstr "检出URL到WC，并且加入到添加计划。" #. (term) -#: ../source/book.xml:17714 ../source/book.xml:19341 +#: ../source/book.xml:17702 ../source/book.xml:19329 msgid "URL -> URL" msgstr "URL -> URL" #. (para) -#: ../source/book.xml:17716 +#: ../source/book.xml:17704 msgid "Complete server-side copy. This is usually used to branch and tag." msgstr "完全的服务器端拷贝，通常用在分支和标签。" #. (para) -#: ../source/book.xml:17722 +#: ../source/book.xml:17710 msgid "You can only copy files within a single repository. Subversion does not support cross-repository copying." msgstr "你只可以在单个版本库中拷贝文件，Subversion还不支持跨版本库的拷贝。" #. (para) -#: ../source/book.xml:17730 +#: ../source/book.xml:17718 msgid "cp" msgstr "cp" #. (para) -#: ../source/book.xml:17736 +#: ../source/book.xml:17724 msgid "Repository if destination is a URL." msgstr "如果目标是URL则包括版本库。" #. (para) -#: ../source/book.xml:17737 +#: ../source/book.xml:17725 msgid "Working copy if destination is a WC path." msgstr "如果目标是WC路径，则是工作拷贝。" #. (para) -#: ../source/book.xml:17743 +#: ../source/book.xml:17731 msgid "If source or destination is in the repository, or if needed to look up the source revision number." msgstr "如果目标是版本库，或者需要查看修订版本号，则会访问版本库。" #. (screen) -#: ../source/book.xml:17750 +#: ../source/book.xml:17738 #, no-wrap msgid "" "\n" @@ -19029,12 +19019,12 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:17769 +#: ../source/book.xml:17757 msgid "Copy an item within your working copy (just schedules the copy—nothing goes into the repository until you commit):" msgstr "拷贝工作拷贝的一个项目（只是预定要拷贝—在提交之前不会影响版本库）：" #. (screen) -#: ../source/book.xml:17772 +#: ../source/book.xml:17760 #, no-wrap msgid "" "\n" @@ -19050,12 +19040,12 @@ msgstr "" "A + bar.txt\n" #. (para) -#: ../source/book.xml:17778 +#: ../source/book.xml:17766 msgid "Copy an item in your working copy to a URL in the repository (an immediate commit, so you must supply a commit message):" msgstr "拷贝你的工作拷贝的一个项目到版本库的URL（直接的提交，所以需要提供一个提交信息）：" #. (screen) -#: ../source/book.xml:17781 +#: ../source/book.xml:17769 #, no-wrap msgid "" "\n" @@ -19069,17 +19059,17 @@ msgstr "" "Committed revision 8.\n" #. (para) -#: ../source/book.xml:17786 +#: ../source/book.xml:17774 msgid "Copy an item from the repository to your working copy (just schedules the copy—nothing goes into the repository until you commit):" msgstr "拷贝版本库的一个项目到你的工作拷贝（只是预定要拷贝—在提交之前不会影响版本库）：" #. (para) -#: ../source/book.xml:17790 +#: ../source/book.xml:17778 msgid "This is the recommended way to resurrect a dead file in your repository!" msgstr "这是恢复死掉文件的推荐方式！" #. (screen) -#: ../source/book.xml:17793 +#: ../source/book.xml:17781 #, no-wrap msgid "" "\n" @@ -19091,12 +19081,12 @@ msgstr "" "A near-here\n" #. (para) -#: ../source/book.xml:17797 +#: ../source/book.xml:17785 msgid "And finally, copying between two URLs:" msgstr "最后，是在URL之间拷贝：" #. (screen) -#: ../source/book.xml:17798 +#: ../source/book.xml:17786 #, no-wrap msgid "" "\n" @@ -19110,13 +19100,13 @@ msgstr "" "Committed revision 9.\n" #. (para) -#: ../source/book.xml:17804 +#: ../source/book.xml:17792 #, fuzzy msgid "This is the easiest way to tag a revision in your repository—just svn copy that revision (usually HEAD) into your tags directory." msgstr "这是在版本库里作标签最简单的方法—svn copy那个修订版本（通常是HEAD）到你的tags目录。" #. (screen) -#: ../source/book.xml:17809 +#: ../source/book.xml:17797 #, no-wrap msgid "" "\n" @@ -19130,12 +19120,12 @@ msgstr "" "Committed revision 12.\n" #. (para) -#: ../source/book.xml:17814 +#: ../source/book.xml:17802 msgid "And don't worry if you forgot to tag—you can always specify an older revision and tag anytime:" msgstr "不要担心忘记作标签—你可以在以后任何时候给一个旧版本作标签：" #. (screen) -#: ../source/book.xml:17816 +#: ../source/book.xml:17804 #, no-wrap msgid "" "\n" @@ -19149,56 +19139,56 @@ msgstr "" "Committed revision 13.\n" #. (tertiary) -#: ../source/book.xml:17827 +#: ../source/book.xml:17815 msgid "delete" msgstr "delete" #. (refpurpose) -#: ../source/book.xml:17831 +#: ../source/book.xml:17819 msgid "Delete an item from a working copy or the repository." msgstr "从工作拷贝或版本库删除一个项目。" #. (programlisting) -#: ../source/book.xml:17838 +#: ../source/book.xml:17826 #, no-wrap msgid "svn delete PATH..." msgstr "svn delete PATH..." #. (programlisting) -#: ../source/book.xml:17839 +#: ../source/book.xml:17827 #, no-wrap msgid "svn delete URL..." msgstr "svn delete URL..." #. (para) -#: ../source/book.xml:17845 +#: ../source/book.xml:17833 #, fuzzy msgid "Items specified by PATH are scheduled for deletion upon the next commit. Files (and directories that have not been committed) are immediately removed from the working copy. The command will not remove any unversioned or modified items; use the option to override this behavior." msgstr "PATH指定的项目会在下次提交删除，文件（和没有提交的目录）会立即从版本库删除，这个命令不会删除任何未版本化或已经修改的项目；使用选项可以覆盖这种行为方式。" #. (para) -#: ../source/book.xml:17852 +#: ../source/book.xml:17840 msgid "Items specified by URL are deleted from the repository via an immediate commit. Multiple URLs are committed atomically." msgstr "URL指定的项目会在直接提交中从版本库删除，多个URL的提交是原子操作。" #. (para) -#: ../source/book.xml:17860 +#: ../source/book.xml:17848 msgid "del, remove, rm" msgstr "del, remove, rm" #. (para) -#: ../source/book.xml:17866 +#: ../source/book.xml:17854 #, fuzzy msgid "Working copy if operating on files, repository if operating on URLs" msgstr "如果操作对象是文件则是工作拷贝变化，对象是URL则会影响版本库。" #. (para) -#: ../source/book.xml:17873 ../source/book.xml:18574 +#: ../source/book.xml:17861 ../source/book.xml:18562 msgid "Only if operating on URLs" msgstr "对URL操作时访问" #. (screen) -#: ../source/book.xml:17879 +#: ../source/book.xml:17867 #, no-wrap msgid "" "\n" @@ -19232,13 +19222,13 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:17899 +#: ../source/book.xml:17887 #, fuzzy msgid "Using svn to delete a file from your working copy deletes your local copy of the file, but merely schedules it to be deleted from the repository. When you commit, the file is deleted in the repository." msgstr "使用svn从工作拷贝删除文件只是预定要删除，当你提交，文件才会从版本库删除。" #. (screen) -#: ../source/book.xml:17904 +#: ../source/book.xml:17892 #, no-wrap msgid "" "\n" @@ -19260,12 +19250,12 @@ msgstr "" "Committed revision 14.\n" #. (para) -#: ../source/book.xml:17913 +#: ../source/book.xml:17901 msgid "Deleting a URL, however, is immediate, so you have to supply a log message:" msgstr "然而直接删除一个URL，你需要提供一个日志信息：" #. (screen) -#: ../source/book.xml:17915 +#: ../source/book.xml:17903 #, no-wrap msgid "" "\n" @@ -19279,12 +19269,12 @@ msgstr "" "Committed revision 15.\n" #. (para) -#: ../source/book.xml:17920 +#: ../source/book.xml:17908 msgid "Here's an example of how to force deletion of a file that has local mods:" msgstr "如下是强制删除本地已修改文件的例子：" #. (screen) -#: ../source/book.xml:17922 +#: ../source/book.xml:17910 #, no-wrap msgid "" "\n" @@ -19306,138 +19296,138 @@ msgstr "" "D over-there\n" #. (tertiary) -#: ../source/book.xml:17937 ../source/book.xml:22044 +#: ../source/book.xml:17925 ../source/book.xml:22044 msgid "diff" msgstr "diff" #. (refpurpose) -#: ../source/book.xml:17941 +#: ../source/book.xml:17929 #, fuzzy msgid "Display the differences between two revisions or paths." msgstr "比较两条路径的区别。" #. (programlisting) -#: ../source/book.xml:17947 +#: ../source/book.xml:17935 #, no-wrap msgid "diff [-c M | -r N[:M]] [TARGET[@REV]...]" msgstr "diff [-c M | -r N[:M]] [TARGET[@REV]...]" #. (programlisting) -#: ../source/book.xml:17948 +#: ../source/book.xml:17936 #, no-wrap msgid "diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] [PATH...]" msgstr "diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] [PATH...]" #. (programlisting) -#: ../source/book.xml:17949 +#: ../source/book.xml:17937 #, no-wrap msgid "diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]" msgstr "diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]" #. (para) -#: ../source/book.xml:17955 +#: ../source/book.xml:17943 #, fuzzy msgid "Display the differences between two paths. The ways you can use svn diff are:" msgstr "显示两条路径的区别，svn diff有三种使用方式：" #. (para) -#: ../source/book.xml:17957 +#: ../source/book.xml:17945 #, fuzzy msgid "Use just svn diff'to display local modifications in a working copy." msgstr "运行svn diff以标准差别格式查看修改的内容。" #. (para) -#: ../source/book.xml:17959 +#: ../source/book.xml:17947 msgid "Display the changes made to TARGETs as they are seen in REV between two revisions. TARGETs may be all working copy paths or all URLs. If TARGETs are working copy paths, N defaults to BASE and M to the working copy; if URLs, N must be specified and M defaults to HEAD. The -c M option is equivalent to -r N:M where N = M-1. Using -c -M does the reverse: -r M:N where N = M-1." msgstr "" #. (para) -#: ../source/book.xml:17975 +#: ../source/book.xml:17963 msgid "Display the differences between OLD-TGT as it was seen in OLDREV and NEW-TGT as it was seen ain NEWREV. PATHs, if given, are relative to OLD-TGT and NEW-TGT and restrict the output to differences for those paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default to N, -r N:M makes OLDREV default to N and NEWREV default to M." msgstr "" #. (para) -#: ../source/book.xml:17994 +#: ../source/book.xml:17982 msgid "Shorthand for svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]" msgstr "" #. (para) -#: ../source/book.xml:17996 +#: ../source/book.xml:17984 msgid "svn diff -r N:M URL is shorthand for svn diff -r N:M --old=URL --new=URL." msgstr "" #. (para) -#: ../source/book.xml:17999 +#: ../source/book.xml:17987 #, fuzzy msgid "svn diff [-r N[:M]] URL1[@N] URL2[@M] is shorthand for svn diff [-r N[:M]] --old=URL1 --new=URL2." msgstr "svn diff [-r N[:M]] URL1[@N] URL2[@M]是svn diff [-r N[:M]] --old=URL1 --new=URL2的缩写。" #. (para) -#: ../source/book.xml:18002 +#: ../source/book.xml:17990 msgid "If TARGET is a URL, then revs N and M can be given either via the or by using @ notation as described earlier." msgstr "TARGET是一个URL，然后可以使用前面提到的或@符号来指定N和M。" #. (para) -#: ../source/book.xml:18006 +#: ../source/book.xml:17994 #, fuzzy msgid "If TARGET is a working copy path, then the option means:" msgstr "如果TARGET是工作拷贝路径，则选项的含义是：" #. (option) -#: ../source/book.xml:18012 +#: ../source/book.xml:18000 msgid "--revision N:M" msgstr "--revision N:M" #. (para) -#: ../source/book.xml:18015 +#: ../source/book.xml:18003 msgid "The server compares TARGET@N and TARGET@M." msgstr "服务器比较 TARGET@N和TARGET@M。" #. (option) -#: ../source/book.xml:18023 +#: ../source/book.xml:18011 msgid "--revision N" msgstr "--revision N" #. (para) -#: ../source/book.xml:18026 +#: ../source/book.xml:18014 msgid "The client compares TARGET@N against working copy." msgstr "客户端比较TARGET@N和工作拷贝。" #. (term) -#: ../source/book.xml:18032 +#: ../source/book.xml:18020 msgid "(no )" msgstr "（无）" #. (para) -#: ../source/book.xml:18034 +#: ../source/book.xml:18022 msgid "The client compares base and working copies of TARGET." msgstr "客户端比较base和 TARGET的TARGET。" #. (para) -#: ../source/book.xml:18039 +#: ../source/book.xml:18027 #, fuzzy msgid "If the alternate syntax is used, the server compares URL1 and URL2 at revisions N and M respectively. If either N or M are omitted, a value of HEAD is assumed." msgstr "如果使用其他语法，服务器会比较URL1和URL2各自的N和M。如果省掉N或M，会假定为HEAD。" #. (para) -#: ../source/book.xml:18047 +#: ../source/book.xml:18035 #, fuzzy msgid "By default, svn diff ignores the ancestry of files and merely compares the contents of the two files being compared. If you use , the ancestry of the paths in question will be taken into consideration when comparing revisions (that is, if you run svn diff 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 "缺省情况下，svn diff忽略文件的祖先，只会比较两个文件的内容。如果你使用，比较修订版本（也就是，当你运行svn diff比较两个内容相同，但祖先历史不同的对象会看到所有的内容被删除又再次添加）时就会考虑路径的祖先。" #. (para) -#: ../source/book.xml:18061 +#: ../source/book.xml:18049 msgid "di" msgstr "di" #. (para) -#: ../source/book.xml:18073 +#: ../source/book.xml:18061 #, fuzzy msgid "For obtaining differences against anything but BASE revision in your working copy" msgstr "获得工作拷贝非BASE修订版本的区别时会" #. (screen) -#: ../source/book.xml:18080 +#: ../source/book.xml:18068 #, no-wrap msgid "" "\n" @@ -19479,13 +19469,13 @@ msgstr "" "\n" #. (para) -#: ../source/book.xml:18104 +#: ../source/book.xml:18092 #, fuzzy msgid "Compare BASE and your working copy (one of the most popular uses of svn diff):" msgstr "比较BASE和你的工作拷贝（svn diff最经常的用法）：" #. (screen) -#: ../source/book.xml:18107 +#: ../source/book.xml:18095 #, no-wrap msgid "" "\n" @@ -19503,13 +19493,13 @@ msgstr "" "+++ COMMITTERS\t(working copy)\n" #. (para) -#: ../source/book.xml:18114 +#: ../source/book.xml:18102 #, fuzzy msgid "See what changed in the file COMMITTERS revision 9115:" msgstr "环境变量EDITOR" #. (screen) -#: ../source/book.xml:18116 +#: ../source/book.xml:18104 #, no-wrap msgid "" "\n" @@ -19527,12 +19517,12 @@ msgstr "" "+++ COMMITTERS\t(working copy)\n" #. (para) -#: ../source/book.xml:18123 +#: ../source/book.xml:18111 msgid "See how your working copy's modifications compare against an older revision:" msgstr "察看你的工作拷贝对旧的修订版本的修改：" #. (screen) -#: ../source/book.xml:18125 +#: ../source/book.xml:18113 #, no-wrap msgid "" "\n" @@ -19550,12 +19540,12 @@ msgstr "" "+++ COMMITTERS\t(working copy)\n" #. (para) -#: ../source/book.xml:18132 +#: ../source/book.xml:18120 msgid "Compare revision 3000 to revision 3500 using @ syntax:" msgstr "使用@语法与修订版本3000和35000比较：" #. (screen) -#: ../source/book.xml:18134 +#: ../source/book.xml:18122 #, no-wrap msgid "" "\n" @@ -19575,12 +19565,12 @@ msgstr "" "…\n" #. (para) -#: ../source/book.xml:18142 +#: ../source/book.xml:18130 msgid "Compare revision 3000 to revision 3500 using range notation (you only pass the one URL in this case):" msgstr "使用范围符号来比较修订版本3000和3500（在这种情况下只能传递一个URL）：" #. (screen) -#: ../source/book.xml:18145 +#: ../source/book.xml:18133 #, no-wrap msgid "" "\n" @@ -19598,13 +19588,13 @@ msgstr "" "+++ COMMITTERS\t(revision 3500)\n" #. (para) -#: ../source/book.xml:18152 +#: ../source/book.xml:18140 #, fuzzy msgid "Compare revision 3000 to revision 3500 of all files in trunk using range notation:" msgstr "使用范围符号比较修订版本3000和3500trunk中的所有文件：" #. (screen) -#: ../source/book.xml:18154 +#: ../source/book.xml:18142 #, no-wrap msgid "" "\n" @@ -19616,13 +19606,13 @@ msgstr "" " " #. (para) -#: ../source/book.xml:18157 +#: ../source/book.xml:18145 #, fuzzy msgid "Compare revision 3000 to revision 3500 of only three files in trunk using range notation:" msgstr "使用范围符号比较修订版本3000和3500trunk中的三个文件：" #. (screen) -#: ../source/book.xml:18160 +#: ../source/book.xml:18148 #, no-wrap msgid "" "\n" @@ -19634,12 +19624,12 @@ msgstr "" " " #. (para) -#: ../source/book.xml:18163 +#: ../source/book.xml:18151 msgid "If you have a working copy, you can obtain the differences without typing in the long URLs:" msgstr "如果你有工作拷贝，你不必输入这么长的URL：" #. (screen) -#: ../source/book.xml:18165 +#: ../source/book.xml:18153 #, no-wrap msgid "" "\n" @@ -19657,12 +19647,12 @@ msgstr "" "+++ COMMITTERS\t(revision 3500)\n" #. (para) -#: ../source/book.xml:18172 +#: ../source/book.xml:18160 msgid "Use CMD to pass arguments directly to the external diff program" msgstr "使用CMD来指定外部区别程序" #. (screen) -#: ../source/book.xml:18176 +#: ../source/book.xml:18164 #, no-wrap msgid "" "\n" @@ -19682,55 +19672,55 @@ msgstr "" "> \n" #. (tertiary) -#: ../source/book.xml:18190 +#: ../source/book.xml:18178 msgid "export" msgstr "export" #. (refname) -#: ../source/book.xml:18193 +#: ../source/book.xml:18181 msgid "svn export" msgstr "svn export" #. (refpurpose) -#: ../source/book.xml:18194 +#: ../source/book.xml:18182 msgid "Export a clean directory tree." msgstr "导出一个干净的目录树。" #. (programlisting) -#: ../source/book.xml:18200 +#: ../source/book.xml:18188 #, no-wrap msgid "svn export [-r REV] URL[@PEGREV] [PATH]" msgstr "svn export [-r REV] URL[@PEGREV] [PATH]" #. (programlisting) -#: ../source/book.xml:18201 +#: ../source/book.xml:18189 #, no-wrap msgid "svn export [-r REV] PATH1[@PEGREV] [PATH2]" msgstr "svn export [-r REV] PATH1[@PEGREV] [PATH2]" #. (para) -#: ../source/book.xml:18207 +#: ../source/book.xml:18195 #, fuzzy msgid "The first form exports a clean directory tree from the repository specified by URL, at revision REV if it is given, otherwise at HEAD, into PATH. If PATH is omitted, the last component of the URL is used for the local directory name." msgstr "第一种从版本库导出干净工作目录树的形式是指定URL，如果指定了修订版本REV，会导出相应的版本，如果没有指定修订版本，则会导出HEAD，导出到PATH。如果省略PATH，URL的最后一部分会作为本地目录的名字。" #. (para) -#: ../source/book.xml:18215 +#: ../source/book.xml:18203 msgid "The second form exports a clean directory tree from the working copy specified by PATH1 into PATH2. All local changes will be preserved, but files not under version control will not be copied." msgstr "从工作拷贝导出干净目录树的第二种形式是指定PATH1到PATH2，所有的本地修改将会保留，但是不再版本控制下的文件不会拷贝。" #. (para) -#: ../source/book.xml:18232 +#: ../source/book.xml:18220 msgid "Local disk" msgstr "本地磁盘" #. (para) -#: ../source/book.xml:18238 +#: ../source/book.xml:18226 msgid "Only if exporting from a URL" msgstr "只有当从URL导出时会访问" #. (screen) -#: ../source/book.xml:18244 +#: ../source/book.xml:18232 #, no-wrap msgid "" "\n" @@ -19760,12 +19750,12 @@ msgstr "" "--ignore-externals\n" #. (para) -#: ../source/book.xml:18262 +#: ../source/book.xml:18250 msgid "Export from your working copy (doesn't print every file and directory):" msgstr "从你的工作拷贝导出（不会打印每一个文件和目录）：" #. (screen) -#: ../source/book.xml:18264 +#: ../source/book.xml:18252 #, no-wrap msgid "" "\n" @@ -19777,12 +19767,12 @@ msgstr "" "Export complete.\n" #. (para) -#: ../source/book.xml:18268 +#: ../source/book.xml:18256 msgid "Export directly from the repository (prints every file and directory):" msgstr "从版本库导出目录（打印所有的文件和目录）：" #. (screen) -#: ../source/book.xml:18270 +#: ../source/book.xml:18258 #, no-wrap msgid "" "\n" @@ -19800,13 +19790,13 @@ msgstr "" "Exported revision 15.\n" #. (para) -#: ../source/book.xml:18277 +#: ../source/book.xml:18265 #, fuzzy msgid "When rolling operating-system-specific release packages, it can be useful to export a tree which uses a specific EOL character for line endings. The option will do this, but it only affects files that have svn:eol-style = native properties attached to them. For example, to export a tree with all CRLF line endings (possibly for a Windows .zip file distribution):" msgstr "当使用操作系统特定的分发版本，使用特定的EOL字符作为行结束符号导出一棵树会非常有用。选项会这样做，但是如果影响的文件拥有svn:eol-style = native属性，举个例子，导出一棵使用CRLF作为行结束的树（可能是为了做一个Windows的.zip文件分发版本）：" #. (screen) -#: ../source/book.xml:18285 +#: ../source/book.xml:18273 #, no-wrap msgid "" "\n" @@ -19824,45 +19814,45 @@ msgstr "" "Exported revision 15.\n" #. (para) -#: ../source/book.xml:18292 +#: ../source/book.xml:18280 #, fuzzy msgid "You can specify LR, CR, or CRLF as a line ending type with the option." msgstr "变更描述：A (添加的)，D (删除的)或M (修改的)" #. (tertiary) -#: ../source/book.xml:18302 ../source/book.xml:21146 ../source/book.xml:22158 +#: ../source/book.xml:18290 ../source/book.xml:21134 ../source/book.xml:22158 msgid "help" msgstr "help" #. (refname) -#: ../source/book.xml:18305 +#: ../source/book.xml:18293 msgid "svn help" msgstr "svn help" #. (programlisting) -#: ../source/book.xml:18312 +#: ../source/book.xml:18300 #, no-wrap msgid "svn help [SUBCOMMAND...]" msgstr "svn help [SUBCOMMAND...]" #. (para) -#: ../source/book.xml:18318 +#: ../source/book.xml:18306 msgid "This is your best friend when you're using Subversion and this book isn't within reach!" msgstr "当手边没有这本书时，这是你使用Subversion最好的朋友！" #. (para) -#: ../source/book.xml:18325 ../source/book.xml:21172 ../source/book.xml:22183 +#: ../source/book.xml:18313 ../source/book.xml:21160 ../source/book.xml:22183 msgid "?, h" msgstr "?, h" #. (para) -#: ../source/book.xml:18326 +#: ../source/book.xml:18314 #, fuzzy msgid "The options , and have the same effect as using the help subcommand." msgstr "不访问" #. (screen) -#: ../source/book.xml:18346 +#: ../source/book.xml:18334 #, no-wrap msgid "" "\n" @@ -19872,34 +19862,34 @@ msgstr "" "--config-dir DIR\n" #. (tertiary) -#: ../source/book.xml:18355 +#: ../source/book.xml:18343 msgid "import" msgstr "import" #. (refpurpose) -#: ../source/book.xml:18359 +#: ../source/book.xml:18347 msgid "Commit an unversioned file or tree into the repository." msgstr "递归提交一个路径的拷贝到版本库。" #. (programlisting) -#: ../source/book.xml:18366 +#: ../source/book.xml:18354 #, no-wrap msgid "svn import [PATH] URL" msgstr "svn import [PATH] URL" #. (para) -#: ../source/book.xml:18372 +#: ../source/book.xml:18360 #, fuzzy msgid "Recursively commit a copy of PATH to URL. If PATH is omitted . is assumed. Parent directories are created in the repository as necessary." msgstr "递归提交一个路径的拷贝到URL。如果省略PATH，默认是.。版本库中对应的父目录必须已经创建。" #. (para) -#: ../source/book.xml:18390 +#: ../source/book.xml:18378 msgid "Repository" msgstr "版本库" #. (screen) -#: ../source/book.xml:18402 +#: ../source/book.xml:18390 #, no-wrap msgid "" "\n" @@ -19937,13 +19927,13 @@ msgstr "" "--ignore-externals\n" #. (para) -#: ../source/book.xml:18424 +#: ../source/book.xml:18412 #, fuzzy msgid "This imports the local directory myproj into trunk/misc in your repository. The directory trunk/misc need not exist before you import into it—svn import will recursively create directories for you." msgstr "这将本地目录myproj导入到版本库的trunk/misc，trunk/misc在导入之前不需要存在—svn import会递归的为你创建目录：" #. (screen) -#: ../source/book.xml:18431 +#: ../source/book.xml:18419 #, no-wrap msgid "" "\n" @@ -19961,13 +19951,13 @@ msgstr "" "Committed revision 16.\n" #. (para) -#: ../source/book.xml:18438 +#: ../source/book.xml:18426 #, fuzzy msgid "Be aware that this will not create a directory named myproj in the repository. If that's what you want, simply add myproj to the end of the URL:" msgstr "在上一个例子里，将会拷贝目录mytree到版本库的some/project下：" #. (screen) -#: ../source/book.xml:18442 +#: ../source/book.xml:18430 #, no-wrap msgid "" "\n" @@ -19985,159 +19975,159 @@ msgstr "" "Committed revision 16.\n" #. (para) -#: ../source/book.xml:18449 +#: ../source/book.xml:18437 #, fuzzy msgid "After importing data, note that the original tree is not under version control. To start working, you still need to svn checkout a fresh working copy of the tree." msgstr "在导入数据之后，你会发现原先的目录树并没有纳入版本控制，为了开始工作，你还是要运行svn checkout得到一个干净的目录树工作拷贝。" #. (tertiary) -#: ../source/book.xml:18459 ../source/book.xml:22253 +#: ../source/book.xml:18447 ../source/book.xml:22253 msgid "info" msgstr "info" #. (refname) -#: ../source/book.xml:18462 +#: ../source/book.xml:18450 msgid "svn info" msgstr "svn info" #. (refpurpose) -#: ../source/book.xml:18463 +#: ../source/book.xml:18451 msgid "Display information about a local or remote item." msgstr "显示本地或远程条目的信息。" #. (programlisting) -#: ../source/book.xml:18470 +#: ../source/book.xml:18458 #, no-wrap msgid "svn info [TARGET[@REV]...]" msgstr "svn info [TARGET[@REV]...]" #. (para) -#: ../source/book.xml:18476 +#: ../source/book.xml:18464 msgid "Print information about the working copy paths or URLs specified. The information shown for both may include:" msgstr "打印你的工作拷贝路径和URL的信息，包括：" #. (para) -#: ../source/book.xml:18481 +#: ../source/book.xml:18469 msgid "Path" msgstr "路经" #. (para) -#: ../source/book.xml:18484 +#: ../source/book.xml:18472 msgid "Name" msgstr "名称" #. (para) -#: ../source/book.xml:18487 +#: ../source/book.xml:18475 msgid "URL" msgstr "URL" #. (para) -#: ../source/book.xml:18490 +#: ../source/book.xml:18478 msgid "Repository Root" msgstr "版本库的根" #. (para) -#: ../source/book.xml:18493 +#: ../source/book.xml:18481 msgid "Repository UUID" msgstr "版本库的UUID" #. (para) -#: ../source/book.xml:18499 +#: ../source/book.xml:18487 msgid "Node Kind" msgstr "节点类型" #. (para) -#: ../source/book.xml:18502 +#: ../source/book.xml:18490 msgid "Last Changed Author" msgstr "最后修改的作者" #. (para) -#: ../source/book.xml:18505 +#: ../source/book.xml:18493 msgid "Last Changed Revision" msgstr "最后修改的修订版本" #. (para) -#: ../source/book.xml:18508 +#: ../source/book.xml:18496 msgid "Last Changed Date" msgstr "最后修改的日期" #. (para) -#: ../source/book.xml:18511 +#: ../source/book.xml:18499 msgid "Lock Token" msgstr "锁定令牌" #. (para) -#: ../source/book.xml:18514 +#: ../source/book.xml:18502 msgid "Lock Owner" msgstr "锁定拥有者" #. (para) -#: ../source/book.xml:18517 +#: ../source/book.xml:18505 msgid "Lock Created (date)" msgstr "锁定创建时间" #. (para) -#: ../source/book.xml:18520 +#: ../source/book.xml:18508 msgid "Lock Expires (date)" msgstr "Lock Expires (date)" #. (para) -#: ../source/book.xml:18523 +#: ../source/book.xml:18511 msgid "Additional kinds of information available only for working copy paths are:" msgstr "Additional kinds of information available only for working copy paths are:" #. (para) -#: ../source/book.xml:18527 +#: ../source/book.xml:18515 msgid "Schedule" msgstr "Schedule" #. (para) -#: ../source/book.xml:18530 +#: ../source/book.xml:18518 msgid "Copied From URL" msgstr "Copied From URL" #. (para) -#: ../source/book.xml:18533 +#: ../source/book.xml:18521 msgid "Copied From Rev" msgstr "Copied From Rev" #. (para) -#: ../source/book.xml:18536 +#: ../source/book.xml:18524 msgid "Text Last Updated" msgstr "Text Last Updated" #. (para) -#: ../source/book.xml:18539 +#: ../source/book.xml:18527 msgid "Properties Last Updated" msgstr "Properties Last Updated" #. (para) -#: ../source/book.xml:18542 +#: ../source/book.xml:18530 msgid "Checksum" msgstr "Checksum" #. (para) -#: ../source/book.xml:18545 +#: ../source/book.xml:18533 msgid "Conflict Previous Base File" msgstr "Conflict Previous Base File" #. (para) -#: ../source/book.xml:18548 +#: ../source/book.xml:18536 msgid "Conflict Previous Working File" msgstr "Conflict Previous Working File" #. (para) -#: ../source/book.xml:18551 +#: ../source/book.xml:18539 msgid "Conflict Current Base File" msgstr "Conflict Current Base File" #. (para) -#: ../source/book.xml:18554 +#: ../source/book.xml:18542 msgid "Conflict Properties File" msgstr "Conflict Properties File" #. (screen) -#: ../source/book.xml:18580 +#: ../source/book.xml:18568 #, no-wrap msgid "" "\n" @@ -20165,13 +20155,13 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:18597 +#: ../source/book.xml:18585 #, fuzzy msgid "svn info will show you all the useful information that it has for items in your working copy. It will show information for files:" msgstr "svn info会展示所有项目的所有有用信息，它会显示文件的信息：" #. (screen) -#: ../source/book.xml:18600 +#: ../source/book.xml:18588 #, no-wrap msgid "" "\n" @@ -20209,12 +20199,12 @@ msgstr "" "Checksum: /3L38YwzhT93BWvgpdF6Zw==\n" #. (para) -#: ../source/book.xml:18617 +#: ../source/book.xml:18605 msgid "It will also show information for directories:" msgstr "它也会展示目录的信息：" #. (screen) -#: ../source/book.xml:18618 +#: ../source/book.xml:18606 #, no-wrap msgid "" "\n" @@ -20245,13 +20235,13 @@ msgstr "" "Last Changed Date: 2003-01-16 23:21:19 -0600 (Thu, 16 Jan 2003)\n" #. (para) -#: ../source/book.xml:18632 +#: ../source/book.xml:18620 #, fuzzy msgid "svn info also acts on URLs (also note that the file readme.doc in this example is locked, so lock information is also provided):" msgstr "svn info也可以针对URL操作（另外，可以注意一下例子中的readme.doc文件已经被锁定，所以也会显示锁定信息）：" #. (screen) -#: ../source/book.xml:18635 +#: ../source/book.xml:18623 #, no-wrap msgid "" "\n" @@ -20293,75 +20283,75 @@ msgstr "" "Lock Created: 2003-01-15 17:35:12 -0600 (Wed, 15 Jan 2003)\n" #. (tertiary) -#: ../source/book.xml:18660 +#: ../source/book.xml:18648 msgid "list" msgstr "list" #. (refpurpose) -#: ../source/book.xml:18664 +#: ../source/book.xml:18652 msgid "List directory entries in the repository." msgstr "列出版本库目录的条目。" #. (programlisting) -#: ../source/book.xml:18670 +#: ../source/book.xml:18658 #, no-wrap msgid "svn list [TARGET[@REV]...]" msgstr "svn list [TARGET[@REV]...]" #. (para) -#: ../source/book.xml:18676 +#: ../source/book.xml:18664 msgid "List each TARGET file and the contents of each TARGET directory as they exist in the repository. If TARGET is a working copy path, the corresponding repository URL will be used." msgstr "列出每一个TARGET文件和TARGET目录的内容，如果TARGET是工作拷贝路径，会使用对应的版本库URL。" #. (para) -#: ../source/book.xml:18681 +#: ../source/book.xml:18669 #, fuzzy msgid "The default TARGET is ., meaning the repository URL of the current working copy directory." msgstr "缺省的TARGET是.，意味着当前工作拷贝的版本库URL。" #. (para) -#: ../source/book.xml:18685 +#: ../source/book.xml:18673 #, fuzzy msgid "With , svn list shows the following fields for each item:" msgstr "如果一个客户端连接到svnserve进程，如下事情会发生：" #. (para) -#: ../source/book.xml:18690 +#: ../source/book.xml:18678 msgid "Revision number of the last commit" msgstr "最后一次提交的修订版本号" #. (para) -#: ../source/book.xml:18694 +#: ../source/book.xml:18682 msgid "Author of the last commit" msgstr "最后一次提交的作者" #. (para) -#: ../source/book.xml:18697 +#: ../source/book.xml:18685 msgid "If locked, the letter O (See for details)." msgstr "" #. (para) -#: ../source/book.xml:18700 +#: ../source/book.xml:18688 msgid "Size (in bytes)" msgstr "大小（单位字节）" #. (para) -#: ../source/book.xml:18703 +#: ../source/book.xml:18691 msgid "Date and time of the last commit" msgstr "最后提交的日期时间" #. (para) -#: ../source/book.xml:18707 +#: ../source/book.xml:18695 msgid "With , output is in XML format (with a header and an enclosing document element unless is also specified). All of the information is present; the option is not accepted." msgstr "使用选项，输出是XML格式（如果没有指定，会包括一个头和一个围绕的元素）。会展示所有的信息；不接受选项。" #. (para) -#: ../source/book.xml:18717 +#: ../source/book.xml:18705 msgid "ls" msgstr "ls" #. (screen) -#: ../source/book.xml:18735 +#: ../source/book.xml:18723 #, no-wrap msgid "" "\n" @@ -20389,13 +20379,13 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:18752 +#: ../source/book.xml:18740 #, fuzzy msgid "svn list is most useful if you want to see what files a repository has without downloading a working copy:" msgstr "如果你希望在没有下载工作拷贝时察看版本库有哪些文件，svn list会非常有用：" #. (screen) -#: ../source/book.xml:18755 +#: ../source/book.xml:18743 #, no-wrap msgid "" "\n" @@ -20413,13 +20403,13 @@ msgstr "" "…\n" #. (para) -#: ../source/book.xml:18762 +#: ../source/book.xml:18750 #, fuzzy msgid "You can pass the option for additional information, rather like the UNIX command ls -l:" msgstr "你也可以传递选项来得到额外信息，非常类似UNIX的ls -l命令：" #. (screen) -#: ../source/book.xml:18765 +#: ../source/book.xml:18753 #, no-wrap msgid "" "\n" @@ -20435,43 +20425,43 @@ msgstr "" " 24 harry Jan 18 11:27 examples/\n" #. (para) -#: ../source/book.xml:18771 +#: ../source/book.xml:18759 msgid "For further details, see ." msgstr "更多细节见。" #. (tertiary) -#: ../source/book.xml:18778 ../source/book.xml:22301 +#: ../source/book.xml:18766 ../source/book.xml:22301 msgid "lock" msgstr "lock" #. (refname) -#: ../source/book.xml:18781 +#: ../source/book.xml:18769 msgid "svn lock" msgstr "svn lock" #. (refpurpose) -#: ../source/book.xml:18782 +#: ../source/book.xml:18770 msgid "Lock working copy paths or URLs in the repository, so that no other user can commit changes to them." msgstr "锁定版本库的工作拷贝路径或URL，所以没有其他用户可以提交这些文件的修改。" #. (programlisting) -#: ../source/book.xml:18790 +#: ../source/book.xml:18778 #, no-wrap msgid "svn lock TARGET..." msgstr "Synopsis" #. (para) -#: ../source/book.xml:18796 +#: ../source/book.xml:18784 msgid "Lock each TARGET. If any TARGET is already locked by another user, print a warning and continue locking the rest of the TARGETs. Use to steal a lock from another user or working copy." msgstr "svn lock TARGET..." #. (para) -#: ../source/book.xml:18813 ../source/book.xml:20598 +#: ../source/book.xml:18801 ../source/book.xml:20586 msgid "Working Copy, Repository" msgstr "锁定每个TARGET。如果任何TARGET已经被另一个用户锁定，则会打印警告信息并且继续锁定剩下的TARGET。可以使用从其它用户来窃取锁定。" #. (screen) -#: ../source/book.xml:18825 +#: ../source/book.xml:18813 #, no-wrap msgid "" "\n" @@ -20501,12 +20491,12 @@ msgstr "" "--force\n" #. (para) -#: ../source/book.xml:18843 +#: ../source/book.xml:18831 msgid "Lock two files in your working copy:" msgstr "在工作拷贝锁定两个文件：" #. (screen) -#: ../source/book.xml:18844 +#: ../source/book.xml:18832 #, no-wrap msgid "" "\n" @@ -20522,12 +20512,12 @@ msgstr "" "'house.jpg' locked by user 'harry'.\n" #. (para) -#: ../source/book.xml:18850 +#: ../source/book.xml:18838 msgid "Lock a file in your working copy that is currently locked by another user:" msgstr "锁定工作拷贝的一个被其它用户锁定的文件：" #. (screen) -#: ../source/book.xml:18852 +#: ../source/book.xml:18840 #, no-wrap msgid "" "\n" @@ -20547,12 +20537,12 @@ msgstr "" "'tree.jpg' locked by user 'harry'.\n" #. (para) -#: ../source/book.xml:18860 +#: ../source/book.xml:18848 msgid "Lock a file without a working copy:" msgstr "没有工作拷贝的情况下锁定文件：" #. (screen) -#: ../source/book.xml:18861 +#: ../source/book.xml:18849 #, no-wrap msgid "" "\n" @@ -20564,63 +20554,63 @@ msgstr "" "'tree.jpg' locked by user 'harry'.\n" #. (para) -#: ../source/book.xml:18865 ../source/book.xml:20644 +#: ../source/book.xml:18853 ../source/book.xml:20632 msgid "For further details, see ." msgstr "更多细节见。" #. (tertiary) -#: ../source/book.xml:18872 ../source/book.xml:22350 +#: ../source/book.xml:18860 ../source/book.xml:22350 msgid "log" msgstr "log" #. (refpurpose) -#: ../source/book.xml:18876 +#: ../source/book.xml:18864 msgid "Display commit log messages." msgstr "显示提交日志信息。" #. (programlisting) -#: ../source/book.xml:18882 +#: ../source/book.xml:18870 #, no-wrap msgid "svn log [PATH]" msgstr "svn log [PATH]" #. (programlisting) -#: ../source/book.xml:18883 +#: ../source/book.xml:18871 #, no-wrap msgid "svn log URL [PATH...]" msgstr "svn log URL [PATH...]" #. (programlisting) -#: ../source/book.xml:18884 +#: ../source/book.xml:18872 #, no-wrap msgid "svn log URL[@REV] [PATH...]" msgstr "svn log URL[@REV] [PATH...]" #. (para) -#: ../source/book.xml:18890 +#: ../source/book.xml:18878 #, fuzzy msgid "Shows log messages from the repository. If no arguments are supplied, svn log shows the log messages for all files and directories inside of (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 BASE:1." msgstr "缺省目标是你的当前目录的路径，如果没有提供参数，svn log会显示当前目录下的所有文件和目录的日志信息，你可以通过指定路径来精炼结果，一个或多个修订版本，或者是任何两个的组合。对于本地路径的缺省修订版本范围BASE:1。" #. (para) -#: ../source/book.xml:18898 +#: ../source/book.xml:18886 #, fuzzy msgid "If you specify a URL alone, then it prints log messages for everything that 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 HEAD:1." msgstr "如果你只是指定一个URL，就会打印这个URL上所有的日志信息，如果添加部分路径，只有这条路径下的URL信息会被打印，URL缺省的修订版本范围是HEAD:1。" #. (para) -#: ../source/book.xml:18903 +#: ../source/book.xml:18891 #, fuzzy msgid "With , svn log will also print all affected paths with each log message. With , svn log will not print the log message body itself (this is compatible with )." msgstr "svn log使用选项也会打印所有影响路径的日志信息，使用选项不会打印日志信息正文本身（这与协调一致）。" #. (para) -#: ../source/book.xml:18908 +#: ../source/book.xml:18896 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 to disable this behavior, which can be useful for determining branch points." msgstr "每个日志信息只会打印一次，即使是那些明确请求不止一次的路径，日志会跟随在拷贝过程中，使用可以关闭这个特性，可以用来监测分支点。" #. (screen) -#: ../source/book.xml:18937 +#: ../source/book.xml:18925 #, no-wrap msgid "" "\n" @@ -20654,13 +20644,13 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:18957 +#: ../source/book.xml:18945 #, fuzzy msgid "You can see the log messages for all the paths that changed in your working copy by running svn log from the top:" msgstr "你可以在顶级目录运行svn log看到工作拷贝中所有修改的路径的日志信息：" #. (screen) -#: ../source/book.xml:18960 +#: ../source/book.xml:18948 #, no-wrap msgid "" "\n" @@ -20684,12 +20674,12 @@ msgstr "" "…\n" #. (para) -#: ../source/book.xml:18970 +#: ../source/book.xml:18958 msgid "Examine all log messages for a particular file in your working copy:" msgstr "检验一个特定文件所有的日志信息：" #. (screen) -#: ../source/book.xml:18972 +#: ../source/book.xml:18960 #, no-wrap msgid "" "\n" @@ -20713,12 +20703,12 @@ msgstr "" "…\n" #. (para) -#: ../source/book.xml:18982 +#: ../source/book.xml:18970 msgid "If you don't have a working copy handy, you can log a URL:" msgstr "如果你手边没有工作拷贝，你可以查看一个URL的日志：" #. (screen) -#: ../source/book.xml:18984 +#: ../source/book.xml:18972 #, no-wrap msgid "" "\n" @@ -20742,13 +20732,13 @@ msgstr "" "…\n" #. (para) -#: ../source/book.xml:18994 +#: ../source/book.xml:18982 #, fuzzy msgid "If you want several distinct paths underneath the same URL, you can use the URL [PATH...] syntax." msgstr "如果你希望查看某个URL下面不同的多个路径，你可以使用URL [PATH...]语法。" #. (screen) -#: ../source/book.xml:18997 +#: ../source/book.xml:18985 #, no-wrap msgid "" "\n" @@ -20780,13 +20770,13 @@ msgstr "" "…\n" #. (para) -#: ../source/book.xml:19011 +#: ../source/book.xml:18999 #, fuzzy msgid "When you're concatenating the results of multiple calls to the log command, you may want to use the option. svn log 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 svn log on a range of two revisions, you would get this:" msgstr "当你想¿ž接多个队日志命令的调用结果，你会希望使用选项。svn log通常会在日志信息的开头和每一小段间打印一行虚线，如果你对一段修订版本运行svn log，你会得到下面的结果：" #. (screen) -#: ../source/book.xml:19019 +#: ../source/book.xml:19007 #, no-wrap msgid "" "\n" @@ -20810,12 +20800,12 @@ msgstr "" "------------------------------------------------------------------------\n" #. (para) -#: ../source/book.xml:19029 +#: ../source/book.xml:19017 msgid "However, if you wanted to gather 2 non-sequential log messages into a file, you might do something like this:" msgstr "然而，如果你希望收集两个不连续的日志信息到一个文件，你会这样做：" #. (screen) -#: ../source/book.xml:19032 +#: ../source/book.xml:19020 #, no-wrap msgid "" "\n" @@ -20855,13 +20845,13 @@ msgstr "" "------------------------------------------------------------------------\n" #. (para) -#: ../source/book.xml:19050 +#: ../source/book.xml:19038 #, fuzzy msgid "You can avoid the clutter of the double dashed lines in your output by using the incremental option:" msgstr "你可以使用incremental选项来避免两行虚线带来的混乱：" #. (screen) -#: ../source/book.xml:19052 +#: ../source/book.xml:19040 #, no-wrap msgid "" "\n" @@ -20893,19 +20883,19 @@ msgstr "" "r27 | ...\n" #. (para) -#: ../source/book.xml:19066 +#: ../source/book.xml:19054 #, fuzzy msgid "The option provides similar output control when using the option." msgstr "选项为提供了一个相似的输出控制。" #. (para) -#: ../source/book.xml:19070 +#: ../source/book.xml:19058 #, fuzzy msgid "If you run svn log on a specific path and provide a specific revision and get no output at all" msgstr "如果你在特定路径和修订版本运行svn log，输出结果为空" #. (screen) -#: ../source/book.xml:19073 +#: ../source/book.xml:19061 #, no-wrap msgid "" "\n" @@ -20917,12 +20907,12 @@ msgstr "" "------------------------------------------------------------------------\n" #. (para) -#: ../source/book.xml:19077 +#: ../source/book.xml:19065 msgid "That just means that 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 "这只意味着这条路径在那个修订版本没有修改，如果从版本库的顶级目录运行这个命令，或者是你知道那个修订版本修改了那个文件，你可以明确的指定它：" #. (screen) -#: ../source/book.xml:19081 +#: ../source/book.xml:19069 #, no-wrap msgid "" "\n" @@ -20942,74 +20932,74 @@ msgstr "" "------------------------------------------------------------------------\n" #. (tertiary) -#: ../source/book.xml:19096 +#: ../source/book.xml:19084 msgid "merge" msgstr "merge" #. (refname) -#: ../source/book.xml:19099 +#: ../source/book.xml:19087 msgid "svn merge" msgstr "svn merge" #. (refpurpose) -#: ../source/book.xml:19100 +#: ../source/book.xml:19088 msgid "Apply the differences between two sources to a working copy path." msgstr "应用两组源文件的差别到工作拷贝路径。" #. (programlisting) -#: ../source/book.xml:19107 +#: ../source/book.xml:19095 #, no-wrap msgid "svn merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]" msgstr "svn merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]" #. (programlisting) -#: ../source/book.xml:19108 +#: ../source/book.xml:19096 #, no-wrap msgid "svn merge sourceURL1[@N] sourceURL2[@M] [WCPATH]" msgstr "svn merge sourceURL1[@N] sourceURL2[@M] [WCPATH]" #. (programlisting) -#: ../source/book.xml:19109 +#: ../source/book.xml:19097 #, no-wrap msgid "svn merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]" msgstr "svn merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]" #. (para) -#: ../source/book.xml:19115 +#: ../source/book.xml:19103 #, fuzzy msgid "In the first and second forms, the source paths (URLs in the first form, working copy paths in the second) are specified at revisions N and M. These are the two sources to be compared. The revisions default to HEAD if omitted." msgstr "第一种和第二种形式里，源路径（第一种是URL，第二种是工作拷贝路径）用修订版本号N和M指定，这是要比较的两组源文件，如果省略修订版本号，缺省是HEAD。" #. (para) -#: ../source/book.xml:19121 +#: ../source/book.xml:19109 #, fuzzy msgid "The -c M option is equivalent to -r N:M where N = M-1. Using -c -M does the reverse: -r M:N where N = M-1." msgstr "Subversion将CVS的P和U合并为U，当合并或冲突发生时，Subversion会简单的打印G或C，而不是大段相关内容。" #. (para) -#: ../source/book.xml:19126 +#: ../source/book.xml:19114 msgid "In the third form, SOURCE can be a URL or working copy item, in which case the corresponding URL is used. This URL, at revisions N and M, defines the two sources to be compared." msgstr "第三种形式，SOURCE可以是URL或者工作拷贝项目，与之对应的URL会被使用。在修订版本号N和M的URL定义了要比较的两组源。" #. (para) -#: ../source/book.xml:19132 +#: ../source/book.xml:19120 #, fuzzy msgid "WCPATH is the working copy path that will receive the changes. If WCPATH is omitted, a default value of . is assumed, unless the sources have identical basenames that match a file within .: in which case, the differences will be applied to that file." msgstr "WCPATH是接收变化的工作拷贝路径，如果省略WCPATH，会假定缺省值.，除非源有相同基本名称与.中的某一文件名字匹配：在这种情况下，区别会应用到那个文件。" #. (para) -#: ../source/book.xml:19139 +#: ../source/book.xml:19127 #, fuzzy msgid "Unlike svn diff, 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 "不像svn diff，合并操作在执行时会考虑文件的祖先，当你从一个分支合并到另一个分支，而这两个分支有各自重命名的文件时，这一点会非常重要。" #. (para) -#: ../source/book.xml:19161 +#: ../source/book.xml:19149 msgid "Only if working with URLs" msgstr "只有在对URL操作时会" #. (screen) -#: ../source/book.xml:19167 +#: ../source/book.xml:19155 #, no-wrap msgid "" "\n" @@ -21045,12 +21035,12 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:19188 +#: ../source/book.xml:19176 msgid "Merge a branch back into the trunk (assuming that you have a working copy of the trunk, and that the branch was created in revision 250):" msgstr "将一个分支合并回主干（假定你有一份主干的工作拷贝，分支在修订版本250创建）：" #. (screen) -#: ../source/book.xml:19191 +#: ../source/book.xml:19179 #, no-wrap msgid "" "\n" @@ -21068,12 +21058,12 @@ msgstr "" "U myproj/flo.txt\n" #. (para) -#: ../source/book.xml:19198 +#: ../source/book.xml:19186 msgid "If you branched at revision 23, and you want to merge changes on trunk into your branch, you could do this from inside the working copy of your branch:" msgstr "如果你的分支在修订版本23，你希望将主干的修改合并到分支，你可以在你的工作拷贝的分支上这样做：" #. (screen) -#: ../source/book.xml:19201 +#: ../source/book.xml:19189 #, no-wrap msgid "" "\n" @@ -21087,12 +21077,12 @@ msgstr "" "…\n" #. (para) -#: ../source/book.xml:19206 +#: ../source/book.xml:19194 msgid "To merge changes to a single file:" msgstr "合并一个单独文件的修改：" #. (screen) -#: ../source/book.xml:19207 +#: ../source/book.xml:19195 #, no-wrap msgid "" "\n" @@ -21106,51 +21096,51 @@ msgstr "" "U thhgttg.txt\n" #. (tertiary) -#: ../source/book.xml:19218 +#: ../source/book.xml:19206 msgid "mkdir" msgstr "mkdir" #. (refname) -#: ../source/book.xml:19221 +#: ../source/book.xml:19209 msgid "svn mkdir" msgstr "svn mkdir" #. (refpurpose) -#: ../source/book.xml:19222 +#: ../source/book.xml:19210 msgid "Create a new directory under version control." msgstr "创建一个纳入版本控制的新目录。" #. (programlisting) -#: ../source/book.xml:19228 +#: ../source/book.xml:19216 #, no-wrap msgid "svn mkdir PATH..." msgstr "svn mkdir PATH..." #. (programlisting) -#: ../source/book.xml:19229 +#: ../source/book.xml:19217 #, no-wrap msgid "svn mkdir URL..." msgstr "svn mkdir URL..." #. (para) -#: ../source/book.xml:19235 +#: ../source/book.xml:19223 msgid "Create a directory with a name given by the final component of the PATH or URL. A directory specified by a working copy PATH 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." msgstr "创建一个目录，名字是提供的PATH或者URL的最后一部分，工作拷贝PATH指定的目录会预定要添加，而通过URL指定的目录会作为一次立即提交在版本库建立。多个目录URL的提交是原子操作，在两种情况下，中介目录必须已经存在。" #. (para) -#: ../source/book.xml:19255 ../source/book.xml:19358 +#: ../source/book.xml:19243 ../source/book.xml:19346 msgid "Working copy, repository if operating on a URL" msgstr "如果是对URL操作则会影响版本库，否则是工作拷贝" #. (para) -#: ../source/book.xml:19261 ../source/book.xml:19364 ../source/book.xml:19450 -#: ../source/book.xml:19530 ../source/book.xml:19608 ../source/book.xml:19689 -#: ../source/book.xml:19784 +#: ../source/book.xml:19249 ../source/book.xml:19352 ../source/book.xml:19438 +#: ../source/book.xml:19518 ../source/book.xml:19596 ../source/book.xml:19677 +#: ../source/book.xml:19772 msgid "Only if operating on a URL" msgstr "只有在对URl操作时会" #. (screen) -#: ../source/book.xml:19267 +#: ../source/book.xml:19255 #, no-wrap msgid "" "\n" @@ -21180,12 +21170,12 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:19285 +#: ../source/book.xml:19273 msgid "Create a directory in your working copy:" msgstr "在工作拷贝创建一个目录：" #. (screen) -#: ../source/book.xml:19286 +#: ../source/book.xml:19274 #, no-wrap msgid "" "\n" @@ -21197,12 +21187,12 @@ msgstr "" "A newdir\n" #. (para) -#: ../source/book.xml:19290 +#: ../source/book.xml:19278 msgid "Create one in the repository (instant commit, so a log message is required):" msgstr "在版本库创建一个目录（立即提交，所以需要日志信息）：" #. (screen) -#: ../source/book.xml:19292 +#: ../source/book.xml:19280 #, no-wrap msgid "" "\n" @@ -21216,60 +21206,60 @@ msgstr "" "Committed revision 26.\n" #. (tertiary) -#: ../source/book.xml:19303 +#: ../source/book.xml:19291 msgid "move" msgstr "move" #. (refpurpose) -#: ../source/book.xml:19307 +#: ../source/book.xml:19295 msgid "Move a file or directory." msgstr "移动一个文件或目录。" #. (programlisting) -#: ../source/book.xml:19313 +#: ../source/book.xml:19301 #, no-wrap msgid "svn move SRC DST" msgstr "svn move SRC DST" #. (para) -#: ../source/book.xml:19319 +#: ../source/book.xml:19307 msgid "This command moves a file or directory in your working copy or in the repository." msgstr "这个命令移动文件或目录到你的工作拷贝或者是版本库。" #. (para) -#: ../source/book.xml:19322 +#: ../source/book.xml:19310 #, fuzzy msgid "This command is equivalent to an svn copy followed by svn delete." msgstr "这个命令同svn copy加一个svn delete等同。" #. (para) -#: ../source/book.xml:19327 +#: ../source/book.xml:19315 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." msgstr "Subversion不支持在工作拷贝和URL之间拷贝，此外，你只可以一个版本库内移动文件—Subversion不支持跨版本库的移动。" #. (para) -#: ../source/book.xml:19336 +#: ../source/book.xml:19324 msgid "Move and schedule a file or directory for addition (with history)." msgstr "移动和预订一个文件或目录将要添加（包含历史）。" #. (para) -#: ../source/book.xml:19343 +#: ../source/book.xml:19331 msgid "Complete server-side rename." msgstr "完全服务器端的重命名。" #. (para) -#: ../source/book.xml:19352 +#: ../source/book.xml:19340 msgid "mv, rename, ren" msgstr "mv, rename, ren" #. (emphasis) -#: ../source/book.xml:19373 +#: ../source/book.xml:19361 #, fuzzy msgid "Deprecated" msgstr "删除" #. (screen) -#: ../source/book.xml:19370 +#: ../source/book.xml:19358 #, no-wrap msgid "" "\n" @@ -21303,12 +21293,12 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:19390 +#: ../source/book.xml:19378 msgid "Move a file in your working copy:" msgstr "移动工作拷bede一个文件：" #. (screen) -#: ../source/book.xml:19391 +#: ../source/book.xml:19379 #, no-wrap msgid "" "\n" @@ -21322,12 +21312,12 @@ msgstr "" "D foo.c\n" #. (para) -#: ../source/book.xml:19396 +#: ../source/book.xml:19384 msgid "Move a file in the repository (an immediate commit, so it requires a commit message):" msgstr "移动版本库中的一个文件（一个立即提交，所以需要提交信息）：" #. (screen) -#: ../source/book.xml:19398 +#: ../source/book.xml:19386 #, no-wrap msgid "" "\n" @@ -21343,51 +21333,51 @@ msgstr "" "Committed revision 27.\n" #. (tertiary) -#: ../source/book.xml:19410 +#: ../source/book.xml:19398 msgid "propdel" msgstr "propdel" #. (refname) -#: ../source/book.xml:19413 +#: ../source/book.xml:19401 msgid "svn propdel" msgstr "svn propdel" #. (refpurpose) -#: ../source/book.xml:19414 +#: ../source/book.xml:19402 msgid "Remove a property from an item." msgstr "删除一个项目的一个属性。" #. (programlisting) -#: ../source/book.xml:19420 +#: ../source/book.xml:19408 #, no-wrap msgid "svn propdel PROPNAME [PATH...]" msgstr "svn propdel PROPNAME [PATH...]" #. (programlisting) -#: ../source/book.xml:19421 +#: ../source/book.xml:19409 #, fuzzy, no-wrap msgid "svn propdel PROPNAME --revprop -r REV [TARGET]" msgstr "svn propdel PROPNAME --revprop -r REV [URL]" #. (para) -#: ../source/book.xml:19427 +#: ../source/book.xml:19415 #, fuzzy msgid "This removes properties from files, directories, or revisions. The first form removes versioned properties in your working copy, while the second removes unversioned remote properties on a repository revision (TARGET only determines which repository to access)." msgstr "这会删除文件、目录或修订版本的属性。第一种形式是在工作拷贝删除版本化属性，第二种是在一个版本库修订版本中删除未版本化的属性。" #. (para) -#: ../source/book.xml:19438 +#: ../source/book.xml:19426 msgid "pdel, pd" msgstr "pdel, pd" #. (para) -#: ../source/book.xml:19444 ../source/book.xml:19524 ../source/book.xml:19602 -#: ../source/book.xml:19683 ../source/book.xml:19778 +#: ../source/book.xml:19432 ../source/book.xml:19512 ../source/book.xml:19590 +#: ../source/book.xml:19671 ../source/book.xml:19766 msgid "Working copy, repository only if operating on a URL" msgstr "只有在对URL操作时会 2" #. (screen) -#: ../source/book.xml:19456 +#: ../source/book.xml:19444 #, no-wrap msgid "" "\n" @@ -21413,12 +21403,12 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:19472 +#: ../source/book.xml:19460 msgid "Delete a property from a file in your working copy" msgstr "删除你的工作拷贝中一个文件的一个属性" #. (screen) -#: ../source/book.xml:19474 +#: ../source/book.xml:19462 #, no-wrap msgid "" "\n" @@ -21430,12 +21420,12 @@ msgstr "" "property 'svn:mime-type' deleted from 'some-script'.\n" #. (para) -#: ../source/book.xml:19478 +#: ../source/book.xml:19466 msgid "Delete a revision property:" msgstr "删除一个修订版本的属性：" #. (screen) -#: ../source/book.xml:19479 +#: ../source/book.xml:19467 #, no-wrap msgid "" "\n" @@ -21447,45 +21437,45 @@ msgstr "" "property 'release-date' deleted from repository revision '26'\n" #. (tertiary) -#: ../source/book.xml:19489 +#: ../source/book.xml:19477 msgid "propedit" msgstr "propedit" #. (refname) -#: ../source/book.xml:19492 +#: ../source/book.xml:19480 msgid "svn propedit" msgstr "svn propedit" #. (refpurpose) -#: ../source/book.xml:19493 +#: ../source/book.xml:19481 msgid "Edit the property of one or more items under version control." msgstr "修改一个或多个版本控制之下文件的属性。" #. (programlisting) -#: ../source/book.xml:19500 +#: ../source/book.xml:19488 #, no-wrap msgid "svn propedit PROPNAME PATH..." msgstr "svn propedit PROPNAME PATH..." #. (programlisting) -#: ../source/book.xml:19501 +#: ../source/book.xml:19489 #, no-wrap msgid "svn propedit PROPNAME --revprop -r REV [TARGET]" msgstr "svn propedit PROPNAME --revprop -r REV [TARGET]" #. (para) -#: ../source/book.xml:19507 +#: ../source/book.xml:19495 #, fuzzy msgid "Edit one or more properties using your favorite editor. The first form edits versioned properties in your working copy, while the second edits unversioned remote properties on a repository revision (TARGET only determines which repository to access)." msgstr "使用喜欢的编辑器编辑一个或多个属性，第一种形式是在工作拷贝编辑版本化的属性，第二种形式是远程编辑未版本化的版本库修订版本属性。" #. (para) -#: ../source/book.xml:19518 +#: ../source/book.xml:19506 msgid "pedit, pe" msgstr "pedit, pe" #. (screen) -#: ../source/book.xml:19536 +#: ../source/book.xml:19524 #, no-wrap msgid "" "\n" @@ -21511,13 +21501,13 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:19552 +#: ../source/book.xml:19540 #, fuzzy msgid "svn propedit makes it easy to modify properties that have multiple values:" msgstr "svn propedit对修改多个值的属性非常简单：" #. (screen) -#: ../source/book.xml:19554 +#: ../source/book.xml:19542 #, no-wrap msgid "" "\n" @@ -21537,44 +21527,44 @@ msgstr "" "Set new value for property 'svn:keywords' on 'foo.c'\n" #. (tertiary) -#: ../source/book.xml:19568 ../source/book.xml:22394 +#: ../source/book.xml:19556 ../source/book.xml:22394 msgid "propget" msgstr "propget" #. (refname) -#: ../source/book.xml:19571 +#: ../source/book.xml:19559 msgid "svn propget" msgstr "svn propget" #. (refpurpose) -#: ../source/book.xml:19572 +#: ../source/book.xml:19560 msgid "Print the value of a property." msgstr "打印一个属性的值。" #. (programlisting) -#: ../source/book.xml:19578 +#: ../source/book.xml:19566 #, no-wrap msgid "svn propget PROPNAME [TARGET[@REV]...]" msgstr "svn propget PROPNAME [TARGET[@REV]...]" #. (programlisting) -#: ../source/book.xml:19579 +#: ../source/book.xml:19567 #, no-wrap msgid "svn propget PROPNAME --revprop -r REV [URL]" msgstr "svn propget PROPNAME --revprop -r REV [URL]" #. (para) -#: ../source/book.xml:19585 +#: ../source/book.xml:19573 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, while the second prints unversioned remote property on a repository revision. See for more information on properties." msgstr "打印一个文件、目录或修订版本的一个属性的值，第一种形式是打印工作拷贝中一个或多个项目的版本化的属性，第二种形式是远程打印版本库修订版本的未版本化的属性。属性的详情见。" #. (para) -#: ../source/book.xml:19596 +#: ../source/book.xml:19584 msgid "pget, pg" msgstr "pget, pg" #. (screen) -#: ../source/book.xml:19614 +#: ../source/book.xml:19602 #, no-wrap msgid "" "\n" @@ -21600,12 +21590,12 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:19630 +#: ../source/book.xml:19618 msgid "Examine a property of a file in your working copy:" msgstr "检查工作拷贝的一个文件的一个属性：" #. (screen) -#: ../source/book.xml:19632 +#: ../source/book.xml:19620 #, no-wrap msgid "" "\n" @@ -21621,12 +21611,12 @@ msgstr "" "Rev\n" #. (para) -#: ../source/book.xml:19638 +#: ../source/book.xml:19626 msgid "The same goes for a revision property:" msgstr "对于修订版本属性相同：" #. (screen) -#: ../source/book.xml:19639 +#: ../source/book.xml:19627 #, no-wrap msgid "" "\n" @@ -21638,45 +21628,45 @@ msgstr "" "Began journal.\n" #. (tertiary) -#: ../source/book.xml:19649 ../source/book.xml:22447 +#: ../source/book.xml:19637 ../source/book.xml:22447 msgid "proplist" msgstr "proplist" #. (refname) -#: ../source/book.xml:19652 +#: ../source/book.xml:19640 msgid "svn proplist" msgstr "svn proplist" #. (refpurpose) -#: ../source/book.xml:19653 +#: ../source/book.xml:19641 msgid "List all properties." msgstr "列出所有的属性。" #. (programlisting) -#: ../source/book.xml:19659 +#: ../source/book.xml:19647 #, no-wrap msgid "svn proplist [TARGET[@REV]...]" msgstr "svn proplist [TARGET[@REV]...]" #. (programlisting) -#: ../source/book.xml:19660 +#: ../source/book.xml:19648 #, no-wrap msgid "svn proplist --revprop -r REV [TARGET]" msgstr "svn proplist --revprop -r REV [TARGET]" #. (para) -#: ../source/book.xml:19666 +#: ../source/book.xml:19654 #, fuzzy msgid "List all properties on files, directories, or revisions. The first form lists versioned properties in your working copy, while the second lists unversioned remote properties on a repository revision (TARGET only determines which repository to access)." msgstr "列出文件、目录或修订版本的属性，第一种形式是列出工作拷贝的所有版本化的属性，第二种形式是列出版本库修订版本的未版本化的属性。" #. (para) -#: ../source/book.xml:19677 +#: ../source/book.xml:19665 msgid "plist, pl" msgstr "plist, pl" #. (screen) -#: ../source/book.xml:19695 +#: ../source/book.xml:19683 #, no-wrap msgid "" "\n" @@ -21704,12 +21694,12 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:19712 +#: ../source/book.xml:19700 msgid "You can use proplist to see the properties on an item in your working copy:" msgstr "你可以使用proplist察看你的工作拷贝的一个项目的属性：" #. (screen) -#: ../source/book.xml:19714 +#: ../source/book.xml:19702 #, no-wrap msgid "" "\n" @@ -21727,12 +21717,12 @@ msgstr "" " owner\n" #. (para) -#: ../source/book.xml:19721 +#: ../source/book.xml:19709 msgid "But with the flag, svn proplist is extremely handy as it also shows you the values for the properties:" msgstr "通过选项，svn proplist也可以非常便利的显示属性的值：" #. (screen) -#: ../source/book.xml:19724 +#: ../source/book.xml:19712 #, no-wrap msgid "" "\n" @@ -21750,50 +21740,50 @@ msgstr "" " owner : sally\n" #. (tertiary) -#: ../source/book.xml:19737 +#: ../source/book.xml:19725 msgid "propset" msgstr "propset" #. (refname) -#: ../source/book.xml:19740 +#: ../source/book.xml:19728 msgid "svn propset" msgstr "svn propset" #. (refpurpose) -#: ../source/book.xml:19741 +#: ../source/book.xml:19729 msgid "Set PROPNAME to PROPVAL on files, directories, or revisions." msgstr "设置文件、目录或者修订版本的属性PROPNAME为PROPVAL。" #. (programlisting) -#: ../source/book.xml:19747 +#: ../source/book.xml:19735 #, no-wrap msgid "svn propset PROPNAME [PROPVAL | -F VALFILE] PATH..." msgstr "svn propset PROPNAME [PROPVAL | -F VALFILE] PATH..." #. (programlisting) -#: ../source/book.xml:19748 +#: ../source/book.xml:19736 #, no-wrap msgid "svn propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [TARGET]" msgstr "svn propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [TARGET]" #. (para) -#: ../source/book.xml:19754 +#: ../source/book.xml:19742 #, fuzzy msgid "Set PROPNAME to PROPVAL 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 (TARGET only determines which repository to access)." msgstr "设置文件、目录或者修订版本的属性PROPNAME为PROPVAL。第一个例子在工作拷贝创建了一个版本化的本地属性修改，第二个例子创建了一个未版本化的远程的对版本库修订版本的属性修改。" #. (para) -#: ../source/book.xml:19763 +#: ../source/book.xml:19751 msgid "Subversion has a number of special properties that affect its behavior. See for more on these properties." msgstr "Subversion有一系列特殊的影响行为方式的属性，关于这些属性的详情请见。" #. (para) -#: ../source/book.xml:19772 +#: ../source/book.xml:19760 msgid "pset, ps" msgstr "pset, ps" #. (screen) -#: ../source/book.xml:19790 +#: ../source/book.xml:19778 #, no-wrap msgid "" "\n" @@ -21827,13 +21817,13 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:19810 +#: ../source/book.xml:19798 #, fuzzy msgid "Set the mime type on a file:" msgstr "设置文件的mimetype：" #. (screen) -#: ../source/book.xml:19811 +#: ../source/book.xml:19799 #, no-wrap msgid "" "\n" @@ -21845,12 +21835,12 @@ msgstr "" "property 'svn:mime-type' set on 'foo.jpg'\n" #. (para) -#: ../source/book.xml:19815 +#: ../source/book.xml:19803 msgid "On a UNIX system, if you want a file to have the executable permission set:" msgstr "在UNIX系统，如果你希望一个文件设置执行权限：" #. (screen) -#: ../source/book.xml:19817 +#: ../source/book.xml:19805 #, no-wrap msgid "" "\n" @@ -21862,12 +21852,12 @@ msgstr "" "property 'svn:executable' set on 'somescript'\n" #. (para) -#: ../source/book.xml:19821 +#: ../source/book.xml:19809 msgid "Perhaps you have an internal policy to set certain properties for the benefit of your coworkers:" msgstr "或许为了合作者的利益你有一个内部的属性设置：" #. (screen) -#: ../source/book.xml:19823 +#: ../source/book.xml:19811 #, no-wrap msgid "" "\n" @@ -21879,13 +21869,13 @@ msgstr "" "property 'owner' set on 'foo.c'\n" #. (para) -#: ../source/book.xml:19827 +#: ../source/book.xml:19815 #, fuzzy msgid "If you made a mistake in a log message for a particular revision and want to change it, use and set svn:log to the new log message:" msgstr "如果你在特定修订版本的日志信息里有一些错误，并且希望修改，可以使用设置svn:log为新的日志信息：" #. (screen) -#: ../source/book.xml:19831 +#: ../source/book.xml:19819 #, no-wrap msgid "" "\n" @@ -21897,12 +21887,12 @@ msgstr "" "property 'svn:log' set on repository revision '25'\n" #. (para) -#: ../source/book.xml:19835 +#: ../source/book.xml:19823 msgid "Or, if you don't have a working copy, you can provide a URL." msgstr "或者，你没有工作拷贝，你可以提供一个URL。" #. (screen) -#: ../source/book.xml:19837 +#: ../source/book.xml:19825 #, no-wrap msgid "" "\n" @@ -21914,12 +21904,12 @@ msgstr "" "property 'svn:log' set on repository revision '25'\n" #. (para) -#: ../source/book.xml:19841 +#: ../source/book.xml:19829 msgid "Lastly, you can tell propset to take its input from a file. You could even use this to set the contents of a property to something binary:" msgstr "最后，你可以告诉propset从一个文件得到输入，你甚至可以使用这个方式来设置一个属性为二进制内容：" #. (screen) -#: ../source/book.xml:19844 +#: ../source/book.xml:19832 #, no-wrap msgid "" "\n" @@ -21931,39 +21921,39 @@ msgstr "" "property 'owner-pic' set on 'moo.c'\n" #. (para) -#: ../source/book.xml:19849 +#: ../source/book.xml:19837 #, fuzzy 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 pre-revprop-change. See for more information on hook scripts." msgstr "缺省，你不可以在Subversion版本库修改修订版本属性，你的版本库管理员必须显示的通过创建一个名字为pre-revprop-change的钩子来允许修订版本属性修改，关于钩子脚本的详情请见。" #. (tertiary) -#: ../source/book.xml:19862 +#: ../source/book.xml:19850 msgid "resolved" msgstr "resolved" #. (quote) -#: ../source/book.xml:19866 +#: ../source/book.xml:19854 msgid "conflicted" msgstr "冲突" #. (refpurpose) -#: ../source/book.xml:19866 +#: ../source/book.xml:19854 msgid "Remove state on working copy files or directories." msgstr "删除工作拷贝文件或目录的状态。" #. (programlisting) -#: ../source/book.xml:19873 +#: ../source/book.xml:19861 #, no-wrap msgid "svn resolved PATH..." msgstr "svn resolved PATH..." #. (para) -#: ../source/book.xml:19879 +#: ../source/book.xml:19867 msgid "Remove conflicted state on working copy files or directories. This routine does not semantically resolve conflict markers; it merely removes conflict-related artifact files and allows PATH to be committed again; that is, it tells Subversion that the conflicts have been resolved. See for an in-depth look at resolving conflicts." msgstr "删除工作拷贝文件或目录的conflicted状态。这个程序不是语义上的改变冲突标志，它只是删除冲突相关的人造文件，从而重新允许PATH提交；也就是说，它告诉Subversion冲突已经解决了。关于解决冲突更深入的考虑可以查看。" #. (screen) -#: ../source/book.xml:19910 ../source/book.xml:19998 +#: ../source/book.xml:19898 ../source/book.xml:19986 #, no-wrap msgid "" "\n" @@ -21979,12 +21969,12 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:19921 +#: ../source/book.xml:19909 msgid "If you get a conflict on an update, your working copy will sprout three new files:" msgstr "如果你在更新时得到冲突，你的工作拷贝会产生三个新的文件：" #. (screen) -#: ../source/book.xml:19923 +#: ../source/book.xml:19911 #, no-wrap msgid "" "\n" @@ -22008,46 +21998,46 @@ msgstr "" "foo.c.r31\n" #. (para) -#: ../source/book.xml:19933 +#: ../source/book.xml:19921 #, fuzzy msgid "Once you've resolved the conflict and foo.c is ready to be committed, run svn resolved to let your working copy know you've taken care of everything." msgstr "当你解决了foo.c的冲突，并且准备提交，运行svn resolved让你的工作拷贝知道你已经完成了所有事情。" #. (para) -#: ../source/book.xml:19938 +#: ../source/book.xml:19926 #, fuzzy msgid "You can just remove the conflict files and commit, but svn resolved 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 "你可以仅仅删除冲突的文件并且提交，但是svn resolved除了删除冲突文件，还修正了一些记录在工作拷贝管理区域的记录数据，所以我们推荐你使用这个命令。" #. (tertiary) -#: ../source/book.xml:19951 +#: ../source/book.xml:19939 msgid "revert" msgstr "revert" #. (refpurpose) -#: ../source/book.xml:19955 +#: ../source/book.xml:19943 msgid "Undo all local edits." msgstr "取消所有的本地编辑。" #. (programlisting) -#: ../source/book.xml:19961 +#: ../source/book.xml:19949 #, no-wrap msgid "svn revert PATH..." msgstr "svn revert PATH..." #. (para) -#: ../source/book.xml:19967 +#: ../source/book.xml:19955 #, fuzzy msgid "Reverts any local changes to a file or directory and resolves any conflicted states. svn revert will not only revert 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 done (e.g. files scheduled for addition or deletion can be unscheduled)." msgstr "恢复所有对文件和目录的修改，并且解决所有的冲突状态。svn revert不会只是恢复工作拷贝中一个项目的内容，也包括了对属性修改的恢复。最终，你可以使用它来取消所有已经做过的预定操作（例如，文件预定要添加或删除可以恢复）。" #. (para) -#: ../source/book.xml:20009 +#: ../source/book.xml:19997 msgid "Discard changes to a file:" msgstr "丢弃对一个文件的修改：" #. (screen) -#: ../source/book.xml:20010 +#: ../source/book.xml:19998 #, no-wrap msgid "" "\n" @@ -22059,12 +22049,12 @@ msgstr "" "Reverted foo.c\n" #. (para) -#: ../source/book.xml:20014 +#: ../source/book.xml:20002 msgid "If you want to revert a whole directory of files, use the flag:" msgstr "如果你希望恢复一整个目录的文件，可以使用选项：" #. (screen) -#: ../source/book.xml:20016 +#: ../source/book.xml:20004 #, no-wrap msgid "" "\n" @@ -22080,12 +22070,12 @@ msgstr "" "Reverted bar.txt\n" #. (para) -#: ../source/book.xml:20022 +#: ../source/book.xml:20010 msgid "Lastly, you can undo any scheduling operations:" msgstr "最后，你可以取消预定的操作：" #. (screen) -#: ../source/book.xml:20024 +#: ../source/book.xml:20012 #, no-wrap msgid "" "\n" @@ -22117,340 +22107,340 @@ msgstr "" "? whoops\n" #. (para) -#: ../source/book.xml:20039 +#: ../source/book.xml:20027 msgid "svn revert is inherently dangerous, since its entire purpose is to throw away data—namely, your uncommitted changes. Once you've reverted, Subversion provides no way to get back those uncommitted changes." msgstr "" #. (para) -#: ../source/book.xml:20045 +#: ../source/book.xml:20033 #, fuzzy msgid "If you provide no targets to svn revert, it will do nothing—to protect you from accidentally losing changes in your working copy, svn revert requires you to provide at least one target." msgstr "如果你没有给svn revert提供了目标，它不会做任何事情—为了保护你不小心失去对工作拷贝的修改，svn revert需要你提供至少一个目标。" #. (tertiary) -#: ../source/book.xml:20057 +#: ../source/book.xml:20045 msgid "status" msgstr "status" #. (refpurpose) -#: ../source/book.xml:20061 +#: ../source/book.xml:20049 msgid "Print the status of working copy files and directories." msgstr "打印工作拷贝文件和目录的状态。" #. (programlisting) -#: ../source/book.xml:20067 +#: ../source/book.xml:20055 #, no-wrap msgid "svn status [PATH...]" msgstr "svn status [PATH...]" #. (para) -#: ../source/book.xml:20073 +#: ../source/book.xml:20061 #, fuzzy msgid "Print the status of working copy files and directories. With no arguments, it prints only locally modified items (no repository access). With , it adds working revision and server out-of-date information. With , it prints full revision information on every item." msgstr "打印工作拷贝文件和目录的状态。如果没有参数，只会打印本地修改的项目（不会访问版本库），使用选项，会添加工作修订版本和服务器过期信息。使用会打印每个项目的完全修订版本信息。" #. (para) -#: ../source/book.xml:20080 +#: ../source/book.xml:20068 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 "输出的前六列都是一个字符宽，每一列给出了工作拷贝项目的每一方面的信息。" #. (para) -#: ../source/book.xml:20083 +#: ../source/book.xml:20071 msgid "The first column indicates that an item was added, deleted, or otherwise changed." msgstr "第一列指出一个项目的是添加、删除还是其它的修改。" #. (term) -#: ../source/book.xml:20087 ../source/book.xml:20168 ../source/book.xml:20194 -#: ../source/book.xml:20210 ../source/book.xml:20226 ../source/book.xml:20241 -#: ../source/book.xml:20289 +#: ../source/book.xml:20075 ../source/book.xml:20156 ../source/book.xml:20182 +#: ../source/book.xml:20198 ../source/book.xml:20214 ../source/book.xml:20229 +#: ../source/book.xml:20277 msgid "' '" msgstr "' '" #. (para) -#: ../source/book.xml:20089 ../source/book.xml:20170 +#: ../source/book.xml:20077 ../source/book.xml:20158 msgid "No modifications." msgstr "没有修改。" #. (term) -#: ../source/book.xml:20093 +#: ../source/book.xml:20081 msgid "'A'" msgstr "'A'" #. (para) -#: ../source/book.xml:20095 +#: ../source/book.xml:20083 msgid "Item is scheduled for Addition." msgstr "预定要添加的项目。" #. (term) -#: ../source/book.xml:20099 +#: ../source/book.xml:20087 msgid "'D'" msgstr "'D'" #. (para) -#: ../source/book.xml:20101 +#: ../source/book.xml:20089 msgid "Item is scheduled for Deletion." msgstr "预定要删除的项目。" #. (term) -#: ../source/book.xml:20105 ../source/book.xml:20174 +#: ../source/book.xml:20093 ../source/book.xml:20162 msgid "'M'" msgstr "'M'" #. (para) -#: ../source/book.xml:20107 +#: ../source/book.xml:20095 msgid "Item has been modified." msgstr "项目已经修改了。" #. (term) -#: ../source/book.xml:20111 +#: ../source/book.xml:20099 msgid "'R'" msgstr "'R'" #. (para) -#: ../source/book.xml:20113 +#: ../source/book.xml:20101 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 "项目在工作拷贝中已经被替换了。这意味着文件预定要删除，然后有一个同样名称的文件要在同一个位置替换它。" #. (term) -#: ../source/book.xml:20120 ../source/book.xml:20181 +#: ../source/book.xml:20108 ../source/book.xml:20169 msgid "'C'" msgstr "'C'" #. (para) -#: ../source/book.xml:20122 +#: ../source/book.xml:20110 msgid "The contents (as opposed to the properties) of the item conflict with updates received from the repository." msgstr "项目的内容（相对于属性）与更新得到的数据冲突了。" #. (term) -#: ../source/book.xml:20128 +#: ../source/book.xml:20116 msgid "'X'" msgstr "'X'" #. (para) -#: ../source/book.xml:20130 +#: ../source/book.xml:20118 #, fuzzy msgid "Item is present because of an externals definition." msgstr "项目与外部定义相关。" #. (term) -#: ../source/book.xml:20134 +#: ../source/book.xml:20122 msgid "'I'" msgstr "'I'" #. (para) -#: ../source/book.xml:20136 +#: ../source/book.xml:20124 #, fuzzy msgid "Item is being ignored (e.g. with the svn:ignore property)." msgstr "项目被忽略（例如使用svn:ignore属性）。" #. (term) -#: ../source/book.xml:20141 +#: ../source/book.xml:20129 msgid "'?'" msgstr "'?'" #. (para) -#: ../source/book.xml:20143 +#: ../source/book.xml:20131 msgid "Item is not under version control." msgstr "项目不在版本控制之下。" #. (term) -#: ../source/book.xml:20147 +#: ../source/book.xml:20135 msgid "'!'" msgstr "'!'" #. (para) -#: ../source/book.xml:20149 +#: ../source/book.xml:20137 #, fuzzy msgid "Item is missing (e.g. you moved or deleted it without using svn). This also indicates that a directory is incomplete (a checkout or update was interrupted)." msgstr "项目已经丢失（例如，你使用svn移动或者删除了它）。这也说明了一个目录不是完整的（一个检出或更新中断）。" #. (term) -#: ../source/book.xml:20156 +#: ../source/book.xml:20144 msgid "'~'" msgstr "'~'" #. (para) -#: ../source/book.xml:20158 +#: ../source/book.xml:20146 msgid "Item is versioned as one kind of object (file, directory, link), but has been replaced by different kind of object." msgstr "项目作为一种对象（文件、目录或链接）纳入版本控制，但是已经被另一种对象替代。" #. (para) -#: ../source/book.xml:20164 +#: ../source/book.xml:20152 msgid "The second column tells the status of a file's or directory's properties." msgstr "第二列告诉一个文件或目录的属性的状态。" #. (para) -#: ../source/book.xml:20176 +#: ../source/book.xml:20164 msgid "Properties for this item have been modified." msgstr "这个项目的属性已经修改。" #. (para) -#: ../source/book.xml:20183 +#: ../source/book.xml:20171 msgid "Properties for this item are in conflict with property updates received from the repository." msgstr "这个项目的属性与从版本库得到的更新有冲突。" #. (para) -#: ../source/book.xml:20189 +#: ../source/book.xml:20177 msgid "The third column is populated only if the working copy directory is locked. (See .)" msgstr "第三列只在工作拷贝锁定时才会出现。（见。）" #. (para) -#: ../source/book.xml:20196 +#: ../source/book.xml:20184 msgid "Item is not locked." msgstr "项目没有锁定。" #. (term) -#: ../source/book.xml:20200 +#: ../source/book.xml:20188 msgid "'L'" msgstr "'L'" #. (para) -#: ../source/book.xml:20202 +#: ../source/book.xml:20190 msgid "Item is locked." msgstr "项目已经锁定。" #. (para) -#: ../source/book.xml:20206 +#: ../source/book.xml:20194 msgid "The fourth column is populated only if the item is scheduled for addition-with-history." msgstr "第四列只在预定包含历史添加的项目出现。" #. (para) -#: ../source/book.xml:20212 +#: ../source/book.xml:20200 msgid "No history scheduled with commit." msgstr "没有历史预定要提交。" #. (term) -#: ../source/book.xml:20216 +#: ../source/book.xml:20204 msgid "'+'" msgstr "'+'" #. (para) -#: ../source/book.xml:20218 +#: ../source/book.xml:20206 msgid "History scheduled with commit." msgstr "历史预定要伴随提交。" #. (para) -#: ../source/book.xml:20222 +#: ../source/book.xml:20210 msgid "The fifth column is populated only if the item is switched relative to its parent (see )." msgstr "第五列只在项目跳转到相对于它的父目录时出现（见）。" #. (para) -#: ../source/book.xml:20228 +#: ../source/book.xml:20216 msgid "Item is a child of its parent directory." msgstr "项目是它的父目录的孩子。" #. (term) -#: ../source/book.xml:20232 +#: ../source/book.xml:20220 msgid "'S'" msgstr "'S'" #. (para) -#: ../source/book.xml:20234 +#: ../source/book.xml:20222 msgid "Item is switched." msgstr "项目已经转换。" #. (para) -#: ../source/book.xml:20238 +#: ../source/book.xml:20226 msgid "The sixth column is populated with lock information." msgstr "第六列显示锁定信息。" #. (para) -#: ../source/book.xml:20243 +#: ../source/book.xml:20231 msgid "When is used, the file is not locked. If is not used, this merely means that the file is not locked in this working copy." msgstr "当使用，文件没有锁定。如果不使用，这意味着文件在工作拷贝被锁定。" #. (term) -#: ../source/book.xml:20251 +#: ../source/book.xml:20239 msgid "K" msgstr "K" #. (para) -#: ../source/book.xml:20253 +#: ../source/book.xml:20241 msgid "File is locked in this working copy." msgstr "文件锁定在工作拷贝。" #. (term) -#: ../source/book.xml:20257 +#: ../source/book.xml:20245 msgid "O" msgstr "O" #. (para) -#: ../source/book.xml:20259 +#: ../source/book.xml:20247 msgid "File is locked either by another user or in another working copy. This only appears when is used." msgstr "文件被另一个工作拷贝的另一个用户锁定，只有在使用时显示。" #. (term) -#: ../source/book.xml:20265 +#: ../source/book.xml:20253 msgid "T" msgstr "T" #. (para) -#: ../source/book.xml:20267 +#: ../source/book.xml:20255 #, fuzzy msgid "File was locked in this working copy, but the lock has been stolen and is invalid. The file is currently locked in the repository. This only appears when is used." msgstr "文件锁定在工作拷贝，但是锁定被窃取而不可用。文件当前锁定在版本库，只有在使用时显示。" #. (term) -#: ../source/book.xml:20275 +#: ../source/book.xml:20263 msgid "B" msgstr "B" #. (para) -#: ../source/book.xml:20277 +#: ../source/book.xml:20265 #, fuzzy msgid "File was locked in this working copy, but the lock has been broken and is invalid. The file is no longer locked This only appears when is used." msgstr "文件锁定在工作拷贝，但是锁定被破坏而不可用。文件当前锁定在版本库，只有在使用时显示。" #. (para) -#: ../source/book.xml:20284 +#: ../source/book.xml:20272 #, fuzzy msgid "The out-of-date information appears in the seventh column (only if you pass the option)." msgstr "过期信息出现在第七列（只在使用选项时出现）。" #. (para) -#: ../source/book.xml:20291 +#: ../source/book.xml:20279 msgid "The item in your working copy is up-to-date." msgstr "这个项目在工作拷贝是最新的。" #. (term) -#: ../source/book.xml:20295 +#: ../source/book.xml:20283 msgid "'*'" msgstr "'*'" #. (para) -#: ../source/book.xml:20297 +#: ../source/book.xml:20285 msgid "A newer revision of the item exists on the server." msgstr "在服务器这个项目有了新的修订版本。" #. (para) -#: ../source/book.xml:20302 +#: ../source/book.xml:20290 #, fuzzy msgid "The remaining fields are variable width and delimited by spaces. The working revision is the next field if the or options are passed." msgstr "余下的字段是可变得宽度且使用空格分隔，如果使用或选项，工作修订版本是下一个字段。" #. (para) -#: ../source/book.xml:20306 +#: ../source/book.xml:20294 #, fuzzy msgid "If the option is passed, the last committed revision and last committed author are displayed next." msgstr "如果传递选项，最后提交的修订版本和最后的提交作者会在后面显示。" #. (para) -#: ../source/book.xml:20309 +#: ../source/book.xml:20297 msgid "The working copy path is always the final field, so it can include spaces." msgstr "工作拷贝路径永远是最后一个字段，所以它可以包括空格。" #. (para) -#: ../source/book.xml:20316 +#: ../source/book.xml:20304 msgid "stat, st" msgstr "stat, st" #. (para) -#: ../source/book.xml:20328 +#: ../source/book.xml:20316 msgid "Only if using " msgstr "只有使用时会访问" #. (screen) -#: ../source/book.xml:20334 +#: ../source/book.xml:20322 #, no-wrap msgid "" "\n" @@ -22480,12 +22470,12 @@ msgstr "" "--ignore-externals\n" #. (para) -#: ../source/book.xml:20352 +#: ../source/book.xml:20340 msgid "This is the easiest way to find out what changes you have made to your working copy:" msgstr "这是查看你在工作拷贝所做的修改的最简单的方法。" #. (screen) -#: ../source/book.xml:20354 +#: ../source/book.xml:20342 #, no-wrap msgid "" "\n" @@ -22499,13 +22489,13 @@ msgstr "" "A + wc/qax.c\n" #. (para) -#: ../source/book.xml:20359 +#: ../source/book.xml:20347 #, fuzzy msgid "If you want to find out what files in your working copy are out-of-date, pass the option (this will not make any changes to your working copy). Here you can see that wc/foo.c has changed in the repository since we last updated our working copy:" msgstr "如果你希望找出工作拷贝哪些文件是最新的，使用选项（这不会对工作拷贝有任何修改）。这里你会看到wc/foo.c在上次更新后有了修改：" #. (screen) -#: ../source/book.xml:20367 +#: ../source/book.xml:20355 #, no-wrap msgid "" "\n" @@ -22523,18 +22513,18 @@ msgstr "" "Status against revision: 981\n" #. (para) -#: ../source/book.xml:20375 +#: ../source/book.xml:20363 #, fuzzy msgid "only places an asterisk next to items that are out of date (that is, items that will be updated from the repository if you run svn update). does not 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)." msgstr "只会在过期的项目（如果你运行svn update，就会更新的项目）旁边安置一个星号。不会导致状态列表反映项目的版本库版本。" #. (para) -#: ../source/book.xml:20384 +#: ../source/book.xml:20372 msgid "And finally, the most information you can get out of the status subcommand:" msgstr "最后，是你能从status子命令得到的所有信息：" #. (screen) -#: ../source/book.xml:20386 +#: ../source/book.xml:20374 #, no-wrap msgid "" "\n" @@ -22554,56 +22544,56 @@ msgstr "" "Head revision: 981\n" #. (para) -#: ../source/book.xml:20394 +#: ../source/book.xml:20382 #, fuzzy msgid "For many more examples of svn status, see ." msgstr "关于svn status的更多例子可以见。" #. (tertiary) -#: ../source/book.xml:20402 +#: ../source/book.xml:20390 msgid "switch" msgstr "switch" #. (refname) -#: ../source/book.xml:20405 +#: ../source/book.xml:20393 msgid "svn switch" msgstr "svn switch" #. (refpurpose) -#: ../source/book.xml:20406 +#: ../source/book.xml:20394 msgid "Update working copy to a different URL." msgstr "把工作拷贝更新到别的URL。" #. (programlisting) -#: ../source/book.xml:20412 +#: ../source/book.xml:20400 #, no-wrap msgid "svn switch URL [PATH]" msgstr "svn switch URL [PATH]" #. (programlisting) -#: ../source/book.xml:20413 +#: ../source/book.xml:20401 #, no-wrap msgid "switch --relocate FROM TO [PATH...]" msgstr "switch --relocate FROM TO [PATH...]" #. (para) -#: ../source/book.xml:20419 +#: ../source/book.xml:20407 #, fuzzy msgid "The first variant of this subcommand (without the option) updates your working copy to point to a new URL—usually a URL which 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. See for an in-depth look at switching." msgstr "这个子命令更新你的工作拷贝来反映新的URL—通常是一个与你的工作拷贝分享共同祖先的URL，尽管这不是必需的。这是Subversion移动工作拷贝到分支的方式。更深入的了解请见。" #. (para) -#: ../source/book.xml:20426 +#: ../source/book.xml:20414 msgid "The option causes svn switch to do something different: it updates your working copy to point to the same 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 "" #. (para) -#: ../source/book.xml:20439 +#: ../source/book.xml:20427 msgid "sw" msgstr "sw" #. (screen) -#: ../source/book.xml:20457 +#: ../source/book.xml:20445 #, no-wrap msgid "" "\n" @@ -22631,13 +22621,13 @@ msgstr "" "--config-dir DIR\n" #. (para) -#: ../source/book.xml:20474 +#: ../source/book.xml:20462 #, fuzzy msgid "If you're currently inside the directory vendors, which was branched to vendors-with-fix, and you'd like to switch your working copy to that branch:" msgstr "如果你目前所在目录vendors分支到vendors-with-fix，你希望转移到那个分支：" #. (screen) -#: ../source/book.xml:20478 +#: ../source/book.xml:20466 #, no-wrap msgid "" "\n" @@ -22657,12 +22647,12 @@ msgstr "" "Updated to revision 31.\n" #. (para) -#: ../source/book.xml:20486 +#: ../source/book.xml:20474 msgid "And to switch back, just provide the URL to the location in the repository from which you originally checked out your working copy:" msgstr "为了跳转回来，只需要提供最初取出工作拷贝的版本库URL：" #. (screen) -#: ../source/book.xml:20489 +#: ../source/book.xml:20477 #, no-wrap msgid "" "\n" @@ -22682,18 +22672,18 @@ msgstr "" "Updated to revision 31.\n" #. (para) -#: ../source/book.xml:20498 +#: ../source/book.xml:20486 msgid "You can just switch part of your working copy to a branch if you don't want to switch your entire working copy." msgstr "如果你不希望跳转所有的工作拷贝，你可以只跳转一部分。" #. (para) -#: ../source/book.xml:20502 +#: ../source/book.xml:20490 #, fuzzy msgid "Sometimes an administrator might change the base location of your repository—in other words, the contents of the repository doesn't change, but the main URL used to reach the root of the repository does. For example, the hostname may change, the URL scheme may change, or any part of the URL which leads to the repository itself may change. Rather than check out a new working copy, you can have the svn switch command rewrite the beginnings of all the URLs in your working copy. Use the option to do the substitution. No file contents are changed, nor is the repository contacted. It's similar to running a Perl script over your working copy .svn/ directories which runs s/OldRoot/NewRoot/." msgstr "有时候管理员会修改版本库的基本位置—换句话说，版本库的内容并不改变，但是访问根的主URL变了。举个例子，主机名变了、URL模式变了或者是URL中的任何一部分改变了。我们不选择重新检出一个工作拷贝，你可以使用svn switch来重写版本库所有URL的开头。使用来做这种替换，没有文件内容会改变，访问的版本库也不会改变。只是像在工作拷贝.svn/运行了一段Perl脚本s/OldRoot/NewRoot/。" #. (screen) -#: ../source/book.xml:20517 +#: ../source/book.xml:20505 #, no-wrap msgid "" "\n" @@ -22731,50 +22721,50 @@ msgstr "" "At revision 3.\n" #. (para) -#: ../source/book.xml:20535 +#: ../source/book.xml:20523 msgid "Be careful when using the 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 . Here's the rule of thumb:" msgstr "小心使用选项，如果你输入了错误的选项，你会在工作拷贝创建无意义的URL，会导致整个工作区不可用并且难于修复。理解何时应该使用也是非常重要的，下面是一些规则：" #. (para) -#: ../source/book.xml:20545 +#: ../source/book.xml:20533 #, fuzzy msgid "If the working copy needs to reflect a new directory within the repository, then use just svn switch." msgstr "如果工作拷贝需要反映一个版本库的新目录，只需要使用svn switch。" #. (para) -#: ../source/book.xml:20551 +#: ../source/book.xml:20539 #, fuzzy msgid "If the working copy still reflects the same repository directory, but the location of the repository itself has changed, then use svn switch --relocate." msgstr "如果你的工作拷贝还是反映相同的版本库目录，但是版本库本身的位置改变了，使用svn switch --relocate。" #. (tertiary) -#: ../source/book.xml:20564 +#: ../source/book.xml:20552 msgid "unlock" msgstr "unlock" #. (refname) -#: ../source/book.xml:20567 +#: ../source/book.xml:20555 msgid "svn unlock" msgstr "svn unlock" #. (refpurpose) -#: ../source/book.xml:20568 +#: ../source/book.xml:20556 msgid "Unlock working copy paths or URLs." msgstr "解锁工作拷贝路径或URL。" #. (programlisting) -#: ../source/book.xml:20574 +#: ../source/book.xml:20562 #, no-wrap msgid "svn unlock TARGET..." msgstr "svn unlock TARGET..." #. (para) -#: ../source/book.xml:20580 +#: ../source/book.xml:20568 msgid "Unlock each TARGET. If any TARGET is either locked by another user or no valid lock token exists in the working copy, print a warning and continue unlocking the rest of the TARGETs. Use to break a lock belonging to another user or working copy." msgstr "解锁每个TARGET。如果任何另一个用户锁定了TARGET，或者没有正确工作拷贝的锁定令牌，打印警告并继续解锁余下的TARGET。使用可以打破其它用户或工作拷贝的锁定。" #. (screen) -#: ../source/book.xml:20610 +#: ../source/book.xml:20598 #, no-wrap msgid "" "\n" @@ -22796,12 +22786,12 @@ msgstr "" "--force\n" #. (para) -#: ../source/book.xml:20624 +#: ../source/book.xml:20612 msgid "Unlock two files in your working copy:" msgstr "解锁工作拷贝中的两个文件：" #. (screen) -#: ../source/book.xml:20625 +#: ../source/book.xml:20613 #, no-wrap msgid "" "\n" @@ -22817,12 +22807,12 @@ msgstr "" "'house.jpg' unlocked.\n" #. (para) -#: ../source/book.xml:20631 +#: ../source/book.xml:20619 msgid "Unlock a file in your working copy that is currently locked by another user:" msgstr "解锁工作拷贝的一个被其他用户锁定的文件：" #. (screen) -#: ../source/book.xml:20633 +#: ../source/book.xml:20621 #, no-wrap msgid "" "\n" @@ -22838,12 +22828,12 @@ msgstr "" "'tree.jpg' unlocked.\n" #. (para) -#: ../source/book.xml:20639 +#: ../source/book.xml:20627 msgid "Unlock a file without a working copy:" msgstr "没有工作拷贝时解锁一个文件：" #. (screen) -#: ../source/book.xml:20640 +#: ../source/book.xml:20628 #, no-wrap msgid "" "\n" @@ -22855,96 +22845,96 @@ msgstr "" "'tree.jpg unlocked.\n" #. (tertiary) -#: ../source/book.xml:20651 +#: ../source/book.xml:20639 msgid "update" msgstr "update" #. (refpurpose) -#: ../source/book.xml:20655 +#: ../source/book.xml:20643 msgid "Update your working copy." msgstr "更新你的工作拷贝。" #. (programlisting) -#: ../source/book.xml:20661 +#: ../source/book.xml:20649 #, no-wrap msgid "svn update [PATH...]" msgstr "svn update [PATH...]" #. (para) -#: ../source/book.xml:20667 +#: ../source/book.xml:20655 #, fuzzy msgid "svn update brings changes from the repository into your working copy. If no revision is given, it brings your working copy up-to-date with the HEAD revision. Otherwise, it synchronizes the working copy to the revision given by the option. As part of the synchronization, svn update also removes any stale locks (see ) found in the working copy." msgstr "svn update会把版本库的修改带到工作拷贝，如果没有给定修订版本，它会把你的工作拷贝更新到HEAD修订版本，否则，它会把工作拷贝更新到你用指定的修订版本。为了保持同步，svn update也会删除所有在工作拷贝发现的无效锁定（见）。" #. (para) -#: ../source/book.xml:20676 +#: ../source/book.xml:20664 #, fuzzy 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 "对于每一个更新的项目开头都有一个表示所做动作的字符，这些字符有下面的意思：" #. (term) -#: ../source/book.xml:20681 +#: ../source/book.xml:20669 msgid "A" msgstr "A" #. (para) -#: ../source/book.xml:20683 +#: ../source/book.xml:20671 msgid "Added" msgstr "添加" #. (term) -#: ../source/book.xml:20687 +#: ../source/book.xml:20675 msgid "D" msgstr "D" #. (para) -#: ../source/book.xml:20689 +#: ../source/book.xml:20677 msgid "Deleted" msgstr "删除" #. (term) -#: ../source/book.xml:20693 +#: ../source/book.xml:20681 msgid "U" msgstr "U" #. (para) -#: ../source/book.xml:20695 +#: ../source/book.xml:20683 msgid "Updated" msgstr "更新" #. (term) -#: ../source/book.xml:20699 +#: ../source/book.xml:20687 msgid "C" msgstr "C" #. (para) -#: ../source/book.xml:20701 +#: ../source/book.xml:20689 #, fuzzy msgid "Conflicted" msgstr "冲突" #. (term) -#: ../source/book.xml:20705 +#: ../source/book.xml:20693 msgid "G" msgstr "G" #. (para) -#: ../source/book.xml:20707 +#: ../source/book.xml:20695 msgid "Merged" msgstr "合并" #. (para) -#: ../source/book.xml:20711 +#: ../source/book.xml:20699 msgid "A character in the first column signifies an update to the actual file, while updates to the file's properties are shown in the second column." msgstr "第一列的字符反映文件本身的更新，而第二列会反映文件属性的更新。" #. (para) -#: ../source/book.xml:20719 +#: ../source/book.xml:20707 msgid "up" msgstr "up" #. (screen) -#: ../source/book.xml:20737 +#: ../source/book.xml:20725 #, no-wrap msgid "" "\n" @@ -22976,12 +22966,12 @@ msgstr "" "--ignore-externals\n" #. (para) -#: ../source/book.xml:20756 +#: ../source/book.xml:20744 msgid "Pick up repository changes that have happened since your last update:" msgstr "获取你上次更新之后版本库的修改：" #. (screen) -#: ../source/book.xml:20758 +#: ../source/book.xml:20746 #, no-wrap msgid "" "\n" @@ -23001,13 +22991,13 @@ msgstr "" "Updated to revision 32.\n" #. (para) -#: ../source/book.xml:20766 +#: ../source/book.xml:20754 #, fuzzy msgid "You can also update your working copy to an older revision (Subversion doesn't have the concept of sticky files like CVS does; see ):" msgstr "你也可以将工作拷贝更新到旧的修订版本（Subversion没有CVS的sticky文件的概念；见）：" #. (screen) -#: ../source/book.xml:20769 +#: ../source/book.xml:20757 #, no-wrap msgid "" "\n" @@ -23029,188 +23019,188 @@ msgstr "" "Updated to revision 30.\n" #. (para) -#: ../source/book.xml:20779 +#: ../source/book.xml:20767 #, fuzzy msgid "If you want to examine an older revision of a single file, you may want to use svn cat instead—it won't change your working copy." msgstr "如果你希望检查单个文件的旧的修订版本，你会希望使用svn cat。" #. (para) -#: ../source/book.xml:20796 +#: ../source/book.xml:20784 #, fuzzy msgid "svnadmin is the administrative tool for monitoring and repairing your Subversion repository. For detailed information, see ." msgstr "svnadmin是一个用来监控和修改Subversion版本库的管理工具，详情请见。" #. (para) -#: ../source/book.xml:20799 +#: ../source/book.xml:20787 #, fuzzy msgid "Since svnadmin 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 "因为svnadmin直接访问版本库（因此只可以在存放版本库的机器上使用），它通过路径访问版本库，而不是URL。" #. (title) -#: ../source/book.xml:20805 +#: ../source/book.xml:20793 #, fuzzy msgid "svnadmin Options" msgstr "svnadmin 选项" #. (option) -#: ../source/book.xml:20810 +#: ../source/book.xml:20798 msgid "--bdb-log-keep" msgstr "--bdb-log-keep" #. (para) -#: ../source/book.xml:20813 +#: ../source/book.xml:20801 msgid "(Berkeley DB specific) Disable automatic log removal of database log files. Having these log files around can be convenient if you need to restore from a catastrophic repository failure." msgstr "" #. (option) -#: ../source/book.xml:20821 +#: ../source/book.xml:20809 msgid "--bdb-txn-nosync" msgstr "--bdb-txn-nosync" #. (para) -#: ../source/book.xml:20824 +#: ../source/book.xml:20812 msgid "(Berkeley DB specific) Disables fsync when committing database transactions. Used with the svnadmin create command to create a Berkeley DB backed repository with DB_TXN_NOSYNC enabled (which improves speed but has some risks associated with it)." msgstr "" #. (option) -#: ../source/book.xml:20834 +#: ../source/book.xml:20822 msgid "--bypass-hooks" msgstr "--bypass-hooks" #. (para) -#: ../source/book.xml:20837 +#: ../source/book.xml:20825 msgid "Bypass the repository hook system." msgstr "绕过版本库钩子系统。" #. (option) -#: ../source/book.xml:20842 +#: ../source/book.xml:20830 msgid "--clean-logs" msgstr "--clean-logs" #. (para) -#: ../source/book.xml:20845 +#: ../source/book.xml:20833 msgid "Removes unused Berkeley DB logs." msgstr "删除不使用的Berkeley DB日志。" #. (option) -#: ../source/book.xml:20851 +#: ../source/book.xml:20839 msgid "--force-uuid" msgstr "--force-uuid" #. (para) -#: ../source/book.xml:20854 +#: ../source/book.xml:20842 #, fuzzy msgid "By default, when loading data into repository that already contains revisions, svnadmin will ignore the UUID from the dump stream. This option will cause the repository's UUID to be set to the UUID from the stream." msgstr "缺省情况下，当版本库加载已经包含修订版本的数据时svnadmin会忽略流中的UUID，这个选项会导致版本库的UUID设置为流的UUID。" #. (option) -#: ../source/book.xml:20864 +#: ../source/book.xml:20852 msgid "--ignore-uuid" msgstr "--ignore-uuid" #. (para) -#: ../source/book.xml:20867 +#: ../source/book.xml:20855 #, fuzzy msgid "By default, when loading an empty repository, svnadmin will ignore the UUID from the dump stream. This option will force that UUID to be ignored (useful for overriding your configuration file if it has set)." msgstr "缺省情况下，当加载空版本库时，svnadmin会使用来自流中的UUID，这个选项会导致忽略UUID。" #. (para) -#: ../source/book.xml:20880 +#: ../source/book.xml:20868 msgid "Dump a revision only as a diff against the previous revision, instead of the usual fulltext." msgstr "导出一个修订版本针对前一个修订版本的区别，而不是通常的完全结果。" #. (option) -#: ../source/book.xml:20887 +#: ../source/book.xml:20875 msgid "--parent-dir " msgstr "--parent-dir " #. (para) -#: ../source/book.xml:20891 +#: ../source/book.xml:20879 #, fuzzy msgid "When loading a dump file, root paths at DIR instead of /." msgstr "当加载一个转储文件时，根路径为DIR而不是/。" #. (term) -#: ../source/book.xml:20897 +#: ../source/book.xml:20885 msgid " () ARG" msgstr " () ARG" #. (para) -#: ../source/book.xml:20900 +#: ../source/book.xml:20888 msgid "Specify a particular revision to operate on." msgstr "指定一个操作的修订版本。" #. (option) -#: ../source/book.xml:20906 +#: ../source/book.xml:20894 msgid "--quiet" msgstr "--quiet" #. (para) -#: ../source/book.xml:20909 +#: ../source/book.xml:20897 msgid "Do not show normal progress—show only errors." msgstr "不显示通常的过程—只显示错误。" #. (option) -#: ../source/book.xml:20915 +#: ../source/book.xml:20903 msgid "--use-post-commit-hook" msgstr "--use-post-commit-hook" #. (para) -#: ../source/book.xml:20918 +#: ../source/book.xml:20906 msgid "When loading a dump file, run the repository's post-commit hook after finalizing each newly loaded revision." msgstr "当导入使用一个转储文件时，在每次新的修订版本产生时运行版本库post-commit钩子。" #. (option) -#: ../source/book.xml:20925 +#: ../source/book.xml:20913 msgid "--use-pre-commit-hook" msgstr "--use-pre-commit-hook" #. (para) -#: ../source/book.xml:20928 +#: ../source/book.xml:20916 msgid "When loading a dump file, run the repository's pre-commit hook before finalizing each newly loaded revision. If the hook fails, abort the commit and terminate the load process." msgstr "当加载一个转储文件时，每次新加修订版本之前运行版本库的pre-commit钩子。如果钩子失败，终止提交并中断加载进程。" #. (title) -#: ../source/book.xml:20939 +#: ../source/book.xml:20927 #, fuzzy msgid "svnadmin Subcommands" msgstr "svnadmin 子命令" #. (tertiary) -#: ../source/book.xml:20945 +#: ../source/book.xml:20933 msgid "create" msgstr "create" #. (refname) -#: ../source/book.xml:20948 +#: ../source/book.xml:20936 msgid "svnadmin create" msgstr "svnadmin create" #. (refpurpose) -#: ../source/book.xml:20949 +#: ../source/book.xml:20937 msgid "Create a new, empty repository." msgstr "创建一个新的空的版本库。" #. (programlisting) -#: ../source/book.xml:20955 +#: ../source/book.xml:20943 #, no-wrap msgid "svnadmin create REPOS_PATH" msgstr "svnadmin create REPOS_PATH" #. (para) -#: ../source/book.xml:20963 +#: ../source/book.xml:20951 #, fuzzy msgid "Remember, svnadmin works only with local paths, not URLs." msgstr "记住svnadmin只工作在本地路径，而不是URL。" #. (para) -#: ../source/book.xml:20961 +#: ../source/book.xml:20949 #, fuzzy msgid "Create a new, empty repository at the path provided. If the provided directory does not exist, it will be created for you. As of Subversion 1.2, svnadmin creates new repositories with the fsfs filesystem backend by default." msgstr "在提供的路径上创建一个新的空的版本库，如果提供的目录不存在，它会为你创建。对于Subversion 1.2，svnadmin缺省使用fsfs文件系统后端创建版本库。" #. (screen) -#: ../source/book.xml:20975 +#: ../source/book.xml:20963 #, no-wrap msgid "" "\n" @@ -23226,12 +23216,12 @@ msgstr "" "--fs-type TYPE\n" #. (para) -#: ../source/book.xml:20986 +#: ../source/book.xml:20974 msgid "Creating a new repository is just this easy:" msgstr "创建一个版本库就是这样简单：" #. (screen) -#: ../source/book.xml:20987 +#: ../source/book.xml:20975 #, no-wrap msgid "" "\n" @@ -23241,12 +23231,12 @@ msgstr "" "$ svnadmin create /usr/local/svn/repos\n" #. (para) -#: ../source/book.xml:20990 +#: ../source/book.xml:20978 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:" msgstr "在Subversion 1.0，一定会创建一个Berkeley DB版本库，在Subversion 1.1，Berkeley DB版本库是缺省类型，但是一个FSFS版本库也是可以创建，使用选项：" #. (screen) -#: ../source/book.xml:20995 +#: ../source/book.xml:20983 #, no-wrap msgid "" "\n" @@ -23256,39 +23246,39 @@ msgstr "" "$ svnadmin create /usr/local/svn/repos --fs-type fsfs\n" #. (tertiary) -#: ../source/book.xml:21004 +#: ../source/book.xml:20992 msgid "deltify" msgstr "deltify" #. (refname) -#: ../source/book.xml:21007 +#: ../source/book.xml:20995 msgid "svnadmin deltify" msgstr "svnadmin deltify" #. (refpurpose) -#: ../source/book.xml:21008 +#: ../source/book.xml:20996 msgid "Deltify changed paths in a revision range." msgstr "修订版本范围的路径的增量变化。" #. (programlisting) -#: ../source/book.xml:21014 +#: ../source/book.xml:21002 #, no-wrap msgid "svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH" msgstr "svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH" #. (para) -#: ../source/book.xml:21020 +#: ../source/book.xml:21008 #, fuzzy msgid "svnadmin deltify exists in current versions of Subversion only for historical reasons. This command is deprecated and no longer needed." msgstr "svnadmin deltify因为历史原因只存在于1.0.x，这个命令已经废弃，不再需要。" #. (para) -#: ../source/book.xml:21023 +#: ../source/book.xml:21011 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 very little gain, and this feature was deprecated." msgstr "它开始于当Subversion提供了管理员控制版本库压缩策略的能力，结果是复杂工作得到了非常小的收益，所以这个特性被废弃了。" #. (screen) -#: ../source/book.xml:21033 +#: ../source/book.xml:21021 #, no-wrap msgid "" "\n" @@ -23300,50 +23290,50 @@ msgstr "" "--quiet (-q)\n" #. (tertiary) -#: ../source/book.xml:21043 +#: ../source/book.xml:21031 msgid "dump" msgstr "dump" #. (refname) -#: ../source/book.xml:21046 +#: ../source/book.xml:21034 msgid "svnadmin dump" msgstr "svnadmin dump" #. (refpurpose) -#: ../source/book.xml:21047 +#: ../source/book.xml:21035 msgid "Dump the contents of filesystem to stdout." msgstr "将文件系统的内容转储到标准输出。" #. (programlisting) -#: ../source/book.xml:21053 +#: ../source/book.xml:21041 #, no-wrap msgid "svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]" msgstr "svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]" #. (para) -#: ../source/book.xml:21059 +#: ../source/book.xml:21047 msgid "Dump the contents of filesystem to stdout in a dumpfile portable format, sending feedback to stderr. Dump revisions LOWER rev through UPPER rev. If no revisions are given, dump all revision trees. If only LOWER is given, dump that one revision tree. See for a practical use." msgstr "使用dumpfile可移植格式将文件系统的内容转储到标准输出，将反馈发送到标准错误，导出的修订版本从LOWER到UPPER。如果没有提供修订版本，会导出所有的修订版本树，如果只提供LOWER，导出一个修订版本树，通常的用法见。" #. (para) -#: ../source/book.xml:21068 +#: ../source/book.xml:21056 msgid "By default, the Subversion dumpfile 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 if 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 which were modified in those revisions. For a modified file, the complete fulltext representation of its contents, as well as all of its properties, are presented in the dumpfile; for a directory, all of its properties are presented." msgstr "缺省情况下，Subversion的转储流包含了一个包括所有文件和目录的单独修订版本（请求的修订版本范围的第一个），后面是其它的只包含本修订所修改的文件和目录的修订版本（请求范围的其它版本）。对于修改的文件，转储文件包括所有的内容和属性，对于目录，包括所有的属性。" #. (para) -#: ../source/book.xml:21079 +#: ../source/book.xml:21067 #, fuzzy msgid "There are two useful options which modify the dumpfile generator's behavior. The first is the option, which simply causes that first revision in the dumpfile 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 dumpfile is presented. This is useful for generating a relatively small dumpfile to be loaded into another repository which already has the files and directories that exist in the original repository." msgstr "有一对有用的选项可以改变转储文件产生的方式，第一个是，使得第一个修订版本只显示其修改的文件和目录，而不是整个目录树，就像转储文件中其它的修订版本。这对产生一个准备导入到已经有数据的版本库时非常有用。" #. (para) -#: ../source/book.xml:21090 +#: ../source/book.xml:21078 #, fuzzy msgid "The second useful option is . This option causes svnadmin dump to, instead of emitting fulltext 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 dumpfile that svnadmin dump creates. There are, however, disadvantages to using this option—deltified dumpfiles are more CPU intensive to create, cannot be operated on by svndumpfilter, and tend not to compress as well as their non-deltified counterparts when using third-party tools like gzip and bzip2." msgstr "第二个有用的选项是，这个选项导致svnadmin dump不会保留修改文件的所有内容，而只是记录修改的部分。这样减少（有些情况下是非常大的）了svnadmin dump产生的转储文件的大小。然而，也有缺点—增量转储文件需要更多的CPU来创建，也不可以用svndumpfilter操作，也不如非增量文件容易被如gzip和bzip2等第三方工具压缩。" #. (screen) -#: ../source/book.xml:21108 +#: ../source/book.xml:21096 #, no-wrap msgid "" "\n" @@ -23359,12 +23349,12 @@ msgstr "" "--deltas\n" #. (para) -#: ../source/book.xml:21119 +#: ../source/book.xml:21107 msgid "Dump your whole repository:" msgstr "转储整个版本库：" #. (screen) -#: ../source/book.xml:21120 +#: ../source/book.xml:21108 #, no-wrap msgid "" "\n" @@ -23386,12 +23376,12 @@ msgstr "" "…\n" #. (para) -#: ../source/book.xml:21129 +#: ../source/book.xml:21117 msgid "Incrementally dump a single transaction from your repository:" msgstr "从版本库增量转储一个单独的事务：" #. (screen) -#: ../source/book.xml:21131 +#: ../source/book.xml:21119 #, no-wrap msgid "" "\n" @@ -23413,50 +23403,50 @@ msgstr "" "…\n" #. (refname) -#: ../source/book.xml:21149 +#: ../source/book.xml:21137 msgid "svnadmin help" msgstr "svnadmin help" #. (programlisting) -#: ../source/book.xml:21156 +#: ../source/book.xml:21144 #, no-wrap msgid "svnadmin help [SUBCOMMAND...]" msgstr "svnadmin help [SUBCOMMAND...]" #. (para) -#: ../source/book.xml:21162 +#: ../source/book.xml:21150 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 "当你困于一个没有网络连接和本书的沙漠岛屿时，这个子命令非常有用。" #. (tertiary) -#: ../source/book.xml:21179 +#: ../source/book.xml:21167 msgid "hotcopy" msgstr "hotcopy" #. (refname) -#: ../source/book.xml:21182 +#: ../source/book.xml:21170 msgid "svnadmin hotcopy" msgstr "svnadmin hotcopy" #. (refpurpose) -#: ../source/book.xml:21183 +#: ../source/book.xml:21171 msgid "Make a hot copy of a repository." msgstr "制作一个版本库的热备份。" #. (programlisting) -#: ../source/book.xml:21189 +#: ../source/book.xml:21177 #, no-wrap msgid "svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH" msgstr "svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH" #. (para) -#: ../source/book.xml:21195 +#: ../source/book.xml:21183 #, fuzzy msgid "This subcommand makes a full hot backup of your repository, including all hooks, configuration files, and, of course, database files. If you pass the option, svnadmin will perform a hotcopy 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 "这个子命令会制作一个版本库的完全热拷贝，包括所有的钩子，配置文件，当然还有数据库文件。如果你传递选项，svnadmin会执行热拷贝操作，然后删除不用的Berkeley DB日志文件。你可以在任何时候运行这个命令得到一个版本库的安全拷贝，不管其它进程是否使用这个版本库。" #. (screen) -#: ../source/book.xml:21209 +#: ../source/book.xml:21197 #, no-wrap msgid "" "\n" @@ -23466,70 +23456,70 @@ msgstr "" "--clean-logs\n" #. (para) -#: ../source/book.xml:21213 +#: ../source/book.xml:21201 msgid "As described in , hot-copied Berkeley DB repositories are not portable across operating systems, nor will they work on machines with a different endianness than the machine where they were created." msgstr "" #. (tertiary) -#: ../source/book.xml:21225 +#: ../source/book.xml:21213 msgid "list-dblogs" msgstr "list-dblogs" #. (refname) -#: ../source/book.xml:21228 +#: ../source/book.xml:21216 msgid "svnadmin list-dblogs" msgstr "svnadmin list-dblogs" #. (literal) -#: ../source/book.xml:21232 ../source/book.xml:21263 ../source/book.xml:21456 +#: ../source/book.xml:21220 ../source/book.xml:21251 ../source/book.xml:21444 msgid "bdb" msgstr "bdb" #. (refpurpose) -#: ../source/book.xml:21229 +#: ../source/book.xml:21217 msgid "Ask Berkeley DB which log files exist for a given Subversion repository (applies only to repositories using the backend)." msgstr "询问Berkeley DB在给定的Subversion版本库有哪些日志文件存在（只有在版本库使用作为后端时使用）。" #. (programlisting) -#: ../source/book.xml:21238 +#: ../source/book.xml:21226 #, no-wrap msgid "svnadmin list-dblogs REPOS_PATH" msgstr "svnadmin list-dblogs REPOS_PATH" #. (para) -#: ../source/book.xml:21244 ../source/book.xml:21275 +#: ../source/book.xml:21232 ../source/book.xml:21263 #, fuzzy msgid "Berkeley DB creates logs of all changes to the repository, which allow it to recover in the face of catastrophe. Unless you enable DB_LOG_AUTOREMOVE, the log files accumulate, although most are no longer used and can be deleted to reclaim disk space. See for more information." msgstr "Berkeley DB创建了记录所有版本库修改的日志，允许我们在面对大灾难时恢复。除非你开启了DB_LOG_AUTOREMOVE，否则日志文件会累积，尽管大多数是不再使用可以从磁盘删除得到空间。详情见。" #. (tertiary) -#: ../source/book.xml:21257 +#: ../source/book.xml:21245 msgid "list-unused-dblogs" msgstr "list-unused-dblogs" #. (refname) -#: ../source/book.xml:21260 +#: ../source/book.xml:21248 msgid "svnadmin list-unused-dblogs" msgstr "svnadmin list-unused-dblogs" #. (refpurpose) -#: ../source/book.xml:21261 +#: ../source/book.xml:21249 msgid "Ask Berkeley DB which log files can be safely deleted (applies only to repositories using the backend)." msgstr "询问Berkeley DB哪些日志文件可以安全的删除（只有在版本库使用作为后端时使用）。" #. (programlisting) -#: ../source/book.xml:21269 +#: ../source/book.xml:21257 #, no-wrap msgid "svnadmin list-unused-dblogs REPOS_PATH" msgstr "svnadmin list-unused-dblogs REPOS_PATH" #. (para) -#: ../source/book.xml:21287 +#: ../source/book.xml:21275 msgid "Remove all unused log files from a repository:" msgstr "Berkeley DB创建了记录所有版本库修改的日志，允许我们在面对大灾难时恢复。除非你开启了DB_LOG_AUTOREMOVE，否则日志文件会累积，尽管大多数是不再使用，可以从磁盘删除得到空间。详情见。" #. (screen) -#: ../source/book.xml:21288 +#: ../source/book.xml:21276 #, no-wrap msgid "" "\n" @@ -23551,38 +23541,38 @@ msgstr "" "## disk space reclaimed!\n" #. (tertiary) -#: ../source/book.xml:21303 +#: ../source/book.xml:21291 msgid "load" msgstr "load" #. (refname) -#: ../source/book.xml:21306 +#: ../source/book.xml:21294 msgid "svnadmin load" msgstr "svnadmin load" #. (quote) -#: ../source/book.xml:21308 +#: ../source/book.xml:21296 msgid "dumpfile" msgstr "svnadmin load" #. (refpurpose) -#: ../source/book.xml:21307 +#: ../source/book.xml:21295 msgid "Read a -formatted stream from stdin." msgstr "从标准输入读进一个格式化的流。" #. (programlisting) -#: ../source/book.xml:21315 +#: ../source/book.xml:21303 #, no-wrap msgid "svnadmin load REPOS_PATH" msgstr "svnadmin load REPOS_PATH" #. (para) -#: ../source/book.xml:21321 +#: ../source/book.xml:21309 msgid "Read a dumpfile-formatted stream from stdin, committing new revisions into the repository's filesystem. Send progress feedback to stdout." msgstr "从标准输入读取格式化流dumpfile，提交新修订版本到版本库的文件系统，在标准输出返回进度。" #. (screen) -#: ../source/book.xml:21329 +#: ../source/book.xml:21317 #, no-wrap msgid "" "\n" @@ -23602,18 +23592,18 @@ msgstr "" "--parent-dir\n" #. (title) -#: ../source/book.xml:21340 ../source/book.xml:21392 ../source/book.xml:21554 +#: ../source/book.xml:21328 ../source/book.xml:21380 ../source/book.xml:21542 msgid "Example" msgstr "例子" #. (para) -#: ../source/book.xml:21342 +#: ../source/book.xml:21330 #, fuzzy msgid "This shows the beginning of loading a repository from a backup file (made, of course, with svnadmin dump):" msgstr "这里显示了加载一个备份文件到版本库（当然，使用svnadmin dump）：" #. (screen) -#: ../source/book.xml:21345 +#: ../source/book.xml:21333 #, no-wrap msgid "" "\n" @@ -23631,12 +23621,12 @@ msgstr "" "…\n" #. (para) -#: ../source/book.xml:21352 +#: ../source/book.xml:21340 msgid "Or if you want to load into a subdirectory:" msgstr "或者你希望加载到一个子目录：" #. (screen) -#: ../source/book.xml:21353 +#: ../source/book.xml:21341 #, no-wrap msgid "" "\n" @@ -23654,39 +23644,39 @@ msgstr "" "…\n" #. (tertiary) -#: ../source/book.xml:21366 +#: ../source/book.xml:21354 msgid "lslocks" msgstr "lslocks" #. (refname) -#: ../source/book.xml:21369 +#: ../source/book.xml:21357 msgid "svnadmin lslocks" msgstr "svnadmin lslocks" #. (refpurpose) -#: ../source/book.xml:21370 +#: ../source/book.xml:21358 msgid "Print descriptions of all locks." msgstr "打印所有锁定的描述。" #. (programlisting) -#: ../source/book.xml:21376 +#: ../source/book.xml:21364 #, no-wrap msgid "svnadmin lslocks REPOS_PATH" msgstr "svnadmin lslocks REPOS_PATH" #. (para) -#: ../source/book.xml:21382 +#: ../source/book.xml:21370 msgid "Print descriptions of all locks in a repository." msgstr "打印版本库所有锁定的描述。" #. (para) -#: ../source/book.xml:21394 +#: ../source/book.xml:21382 #, fuzzy msgid "This lists the one locked file in the repository at /svn/repos:" msgstr "显示了版本库/svn/repos中一个锁定的文件：" #. (screen) -#: ../source/book.xml:21396 +#: ../source/book.xml:21384 #, no-wrap msgid "" "\n" @@ -23710,38 +23700,38 @@ msgstr "" "Rework the uppermost branches on the bald cypress in the foreground.\n" #. (tertiary) -#: ../source/book.xml:21412 +#: ../source/book.xml:21400 msgid "lstxns" msgstr "lstxns" #. (refname) -#: ../source/book.xml:21415 +#: ../source/book.xml:21403 msgid "svnadmin lstxns" msgstr "svnadmin lstxns" #. (refpurpose) -#: ../source/book.xml:21416 +#: ../source/book.xml:21404 msgid "Print the names of all uncommitted transactions." msgstr "打印所有未提交的事物名称。" #. (programlisting) -#: ../source/book.xml:21422 +#: ../source/book.xml:21410 #, no-wrap msgid "svnadmin lstxns REPOS_PATH" msgstr "svnadmin lstxns REPOS_PATH" #. (para) -#: ../source/book.xml:21428 +#: ../source/book.xml:21416 msgid "Print the names of all uncommitted transactions. See for information on how uncommitted transactions are created and what you should do with them." msgstr "打印所有未提交的事物名称。关于未提交事物是怎样创建和如何使用的信息见。" #. (para) -#: ../source/book.xml:21437 +#: ../source/book.xml:21425 msgid "List all outstanding transactions in a repository." msgstr "列出版本库所有突出的事物。" #. (screen) -#: ../source/book.xml:21439 +#: ../source/book.xml:21427 #, no-wrap msgid "" "\n" @@ -23755,38 +23745,38 @@ msgstr "" "1x\n" #. (tertiary) -#: ../source/book.xml:21450 +#: ../source/book.xml:21438 msgid "recover" msgstr "recover" #. (refname) -#: ../source/book.xml:21453 +#: ../source/book.xml:21441 msgid "svnadmin recover" msgstr "svnadmin recover" #. (filename) -#: ../source/book.xml:21457 +#: ../source/book.xml:21445 msgid "repos/conf/passwd" msgstr "repos/conf/passwd" #. (refpurpose) -#: ../source/book.xml:21454 +#: ../source/book.xml:21442 msgid "Bring a repository database back into a consistent state (applies only to repositories using the backend). In addition, if does not exist, it will create a default password file ." msgstr "将版本库数据库恢复到稳定状态（只有在版本库使用作为后端时使用），此外，如果不存在，它会创建一个默认的密码文件。" #. (programlisting) -#: ../source/book.xml:21464 +#: ../source/book.xml:21452 #, no-wrap msgid "svnadmin recover REPOS_PATH" msgstr "svnadmin recover REPOS_PATH" #. (para) -#: ../source/book.xml:21470 +#: ../source/book.xml:21458 msgid "Run this command if you get an error indicating that your repository needs to be recovered." msgstr "在你得到的错误说明你需要恢复版本库时运行这个命令。" #. (screen) -#: ../source/book.xml:21477 +#: ../source/book.xml:21465 #, no-wrap msgid "" "\n" @@ -23796,12 +23786,12 @@ msgstr "" "--wait\n" #. (para) -#: ../source/book.xml:21485 +#: ../source/book.xml:21473 msgid "Recover a hung repository:" msgstr "恢复挂起的版本库：" #. (screen) -#: ../source/book.xml:21486 +#: ../source/book.xml:21474 #, no-wrap msgid "" "\n" @@ -23821,13 +23811,13 @@ msgstr "" "The latest repos revision is 34.\n" #. (para) -#: ../source/book.xml:21494 +#: ../source/book.xml:21482 #, fuzzy msgid "Recovering the database requires an exclusive lock on the repository. (This is a database lock; see .) If another process is accessing the repository, then svnadmin recover will error:" msgstr "恢复数据库需要一个版本库的独占锁（这是一个数据库锁；见），如果另一个进程访问版本库，svnadmin recover会出错：" #. (screen) -#: ../source/book.xml:21499 +#: ../source/book.xml:21487 #, no-wrap msgid "" "\n" @@ -23845,13 +23835,13 @@ msgstr "" "$\n" #. (para) -#: ../source/book.xml:21506 +#: ../source/book.xml:21494 #, fuzzy msgid "The option, however, will cause svnadmin recover to wait indefinitely for other processes to disconnect:" msgstr "选项可以导致svnadmin recover一直等待其它进程断开连接：" #. (screen) -#: ../source/book.xml:21509 +#: ../source/book.xml:21497 #, no-wrap msgid "" "\n" @@ -23879,39 +23869,39 @@ msgstr "" "The latest repos revision is 34.\n" #. (tertiary) -#: ../source/book.xml:21527 +#: ../source/book.xml:21515 msgid "rmlocks" msgstr "rmlocks" #. (refname) -#: ../source/book.xml:21530 +#: ../source/book.xml:21518 msgid "svnadmin rmlocks" msgstr "svnadmin rmlocks" #. (refpurpose) -#: ../source/book.xml:21531 +#: ../source/book.xml:21519 msgid "Unconditionally remove one or more locks from a repository." msgstr "无条件的删除版本库的一个或多个锁定。" #. (programlisting) -#: ../source/book.xml:21538 +#: ../source/book.xml:21526 #, no-wrap msgid "svnadmin rmlocks REPOS_PATH LOCKED_PATH..." msgstr "svnadmin rmlocks REPOS_PATH LOCKED_PATH..." #. (para) -#: ../source/book.xml:21544 +#: ../source/book.xml:21532 msgid "Remove lock from each LOCKED_PATH." msgstr "从LOCKED_PATH删除没个锁定。" #. (para) -#: ../source/book.xml:21556 +#: ../source/book.xml:21544 #, fuzzy msgid "This deletes the locks on tree.jpg and house.jpg in the repository at /svn/repos" msgstr "这删除了版本库/svn/repos里tree.jpg和house.jpg文件上的锁定：" #. (screen) -#: ../source/book.xml:21560 +#: ../source/book.xml:21548 #, no-wrap msgid "" "\n" @@ -23925,33 +23915,33 @@ msgstr "" "Removed lock on '/house.jpg.\n" #. (tertiary) -#: ../source/book.xml:21571 +#: ../source/book.xml:21559 msgid "rmtxns" msgstr "rmtxns" #. (refname) -#: ../source/book.xml:21574 +#: ../source/book.xml:21562 msgid "svnadmin rmtxns" msgstr "svnadmin rmtxns" #. (refpurpose) -#: ../source/book.xml:21575 +#: ../source/book.xml:21563 msgid "Delete transactions from a repository." msgstr "从版本库删除事物。" #. (programlisting) -#: ../source/book.xml:21581 +#: ../source/book.xml:21569 #, no-wrap msgid "svnadmin rmtxns REPOS_PATH TXN_NAME..." msgstr "svnadmin rmtxns REPOS_PATH TXN_NAME..." #. (para) -#: ../source/book.xml:21587 +#: ../source/book.xml:21575 msgid "Delete outstanding transactions from a repository. This is covered in detail in ." msgstr "删除版本库的事物，更多细节在。" #. (screen) -#: ../source/book.xml:21594 +#: ../source/book.xml:21582 #, no-wrap msgid "" "\n" @@ -23961,12 +23951,12 @@ msgstr "" "--quiet (-q)\n" #. (para) -#: ../source/book.xml:21602 +#: ../source/book.xml:21590 msgid "Remove named transactions:" msgstr "删除命名的事物：" #. (screen) -#: ../source/book.xml:21603 +#: ../source/book.xml:21591 #, no-wrap msgid "" "\n" @@ -23976,13 +23966,13 @@ msgstr "" "$ svnadmin rmtxns /usr/local/svn/repos/ 1w 1x\n" #. (para) -#: ../source/book.xml:21606 +#: ../source/book.xml:21594 #, fuzzy msgid "Fortunately, the output of lstxns works great as the input for rmtxns:" msgstr "很幸运，lstxns的输出作为rmtxns输入工作良好：" #. (screen) -#: ../source/book.xml:21608 +#: ../source/book.xml:21596 #, no-wrap msgid "" "\n" @@ -23992,49 +23982,49 @@ msgstr "" "$ svnadmin rmtxns /usr/local/svn/repos/ `svnadmin lstxns /usr/local/svn/repos/`\n" #. (para) -#: ../source/book.xml:21611 +#: ../source/book.xml:21599 msgid "Which will remove all uncommitted transactions from your repository." msgstr "从版本库删除所有未提交的事务。" #. (tertiary) -#: ../source/book.xml:21619 +#: ../source/book.xml:21607 msgid "setlog" msgstr "setlog" #. (refname) -#: ../source/book.xml:21622 +#: ../source/book.xml:21610 msgid "svnadmin setlog" msgstr "svnadmin setlog" #. (refpurpose) -#: ../source/book.xml:21623 +#: ../source/book.xml:21611 msgid "Set the log-message on a revision." msgstr "设置某个修订版本的日志信息。" #. (programlisting) -#: ../source/book.xml:21629 +#: ../source/book.xml:21617 #, no-wrap msgid "svnadmin setlog REPOS_PATH -r REVISION FILE" msgstr "svnadmin setlog REPOS_PATH -r REVISION FILE" #. (para) -#: ../source/book.xml:21635 +#: ../source/book.xml:21623 msgid "Set the log-message on revision REVISION to the contents of FILE." msgstr "设置修订版本REVISION的日志信息为FILE的内容。" #. (para) -#: ../source/book.xml:21637 +#: ../source/book.xml:21625 #, fuzzy msgid "This is similar to using svn propset --revprop to set the svn:log property on a revision, except that you can also use the 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 pre-revprop-change hook." msgstr "这与使用svn propset --revprop设置某一修订版本的svn:log属性效果一样，除了你也可以使用选项绕过的所有pre-或post-commit的钩子脚本，这在pre-revprop-change钩子脚本中禁止修改修订版本属性时非常有用。" #. (para) -#: ../source/book.xml:21645 +#: ../source/book.xml:21633 msgid "Revision properties are not under version control, so this command will permanently overwrite the previous log message." msgstr "修订版本属性不在版本控制之下的，所以这个命令会永久覆盖前一个日志信息。" #. (screen) -#: ../source/book.xml:21654 +#: ../source/book.xml:21642 #, no-wrap msgid "" "\n" @@ -24046,13 +24036,13 @@ msgstr "" "--bypass-hooks\n" #. (para) -#: ../source/book.xml:21663 +#: ../source/book.xml:21651 #, fuzzy msgid "Set the log message for revision 19 to the contents of the file msg:" msgstr "设置修订版本19的日志信息为文件msg的内容：" #. (screen) -#: ../source/book.xml:21665 +#: ../source/book.xml:21653 #, no-wrap msgid "" "\n" @@ -24062,38 +24052,38 @@ msgstr "" "$ svnadmin setlog /usr/local/svn/repos/ -r 19 msg\n" #. (tertiary) -#: ../source/book.xml:21676 +#: ../source/book.xml:21664 msgid "verify" msgstr "verify" #. (refname) -#: ../source/book.xml:21679 +#: ../source/book.xml:21667 msgid "svnadmin verify" msgstr "svnadmin verify" #. (refpurpose) -#: ../source/book.xml:21680 +#: ../source/book.xml:21668 msgid "Verify the data stored in the repository." msgstr "验证版本库保存的数据。" #. (programlisting) -#: ../source/book.xml:21686 +#: ../source/book.xml:21674 #, no-wrap msgid "svnadmin verify REPOS_PATH" msgstr "svnadmin verify REPOS_PATH" #. (para) -#: ../source/book.xml:21692 +#: ../source/book.xml:21680 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 bitrot. If this command fails—which it will do at the first sign of a problem—that means that 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 "" #. (para) -#: ../source/book.xml:21708 +#: ../source/book.xml:21696 msgid "Verify a hung repository:" msgstr "检验挂起的版本库：" #. (screen) -#: ../source/book.xml:21709 +#: ../source/book.xml:21697 #, no-wrap msgid "" "\n" @@ -24105,41 +24095,52 @@ msgstr "" "* Verified revision 1729.\n" #. (para) -#: ../source/book.xml:21726 +#: ../source/book.xml:21714 #, fuzzy msgid "svnlook 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 peeking. svnlook is typically used by the repository hooks, but a repository administrator might find it useful for diagnostic purposes." msgstr "svnlook是检验Subversion版本库不同方面的命令行工具，它不会对版本库有任何修改—它只是用来看。svnlook通常被版本库钩子使用，但是版本库管理也会发现它在诊断目的上也非常有用。" #. (para) -#: ../source/book.xml:21733 +#: ../source/book.xml:21721 #, fuzzy msgid "Since svnlook 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 "因为svnlook通过直接版本库访问（因此只可以在保存版本库的机器上工作）工作，所以他通过版本库的路径访问，而不是URL。" #. (para) -#: ../source/book.xml:21736 +#: ../source/book.xml:21724 #, fuzzy msgid "If no revision or transaction is specified, svnlook defaults to the youngest (most recent) revision of the repository." msgstr "如果没有指定修订版本或事物，svnlook缺省的是版本库最年轻的（最新的）修订版本。" #. (title) -#: ../source/book.xml:21742 +#: ../source/book.xml:21730 #, fuzzy msgid "svnlook Options" msgstr "svnlook 选项" #. (para) -#: ../source/book.xml:21744 +#: ../source/book.xml:21732 #, fuzzy msgid "Options in svnlook are global, just like in svn and svnadmin; however, most options only apply to one subcommand since the functionality of svnlook is (intentionally) limited in scope." msgstr "svnlook的选项是全局的，就像svn和svnadmin；然而，大多数选项只会应用到一个子命令，因为svnlook的功能是（有意的）限制在一定范围的。" #. (para) -#: ../source/book.xml:21756 +#: ../source/book.xml:21744 #, fuzzy -msgid "Prevents svnlook 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." +msgid "Prevents svnlook diff 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 "防止svnlook打印删除文件的区别，缺省的行为方式是当一个文件在一次事物/修订版本中删除后，得到的结果与保留这个文件的内容变成空相同。" +#. (option) +#: ../source/book.xml:21753 +msgid "--no-diff-added" +msgstr "--no-diff-added" + +#. (para) +#: ../source/book.xml:21756 +#, fuzzy +msgid "Prevents svnlook diff 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 "防止Subversion打印添加文件的区别。缺省的行为方式是，当添加一个文件时，svn diff打印的信息和比较一个空白文件相同。" + #. (term) #: ../source/book.xml:21764 msgid " ()" diff --git a/doc/svnbook/source/book.txt b/doc/svnbook/source/book.txt index a8f2b89..493a276 100644 --- a/doc/svnbook/source/book.txt +++ b/doc/svnbook/source/book.txt @@ -2,9 +2,9 @@ vi book.xml file:///C:/wc/svn/i18n-zh/trunk/lib/docbook/docbook4/docbookx.dtd vi version.xml - + - + 2. Upgrade to DocBook v5 xsltproc -o book-v5-tmp.xml db4-upgrade.xsl book.xml @@ -12,7 +12,7 @@ 3. Clean up vi book-v5-tmp.xml Version Control with Subversion - For Subversion 1.5(Compiled from r2880) + For Subversion 1.5(Compiled from r2881) java -jar jing.jar docbook.rng book-v5-tmp.xml diff --git a/doc/svnbook/source/book.xml b/doc/svnbook/source/book.xml index 9a6a97f..d5790eb 100644 --- a/doc/svnbook/source/book.xml +++ b/doc/svnbook/source/book.xml @@ -2,7 +2,7 @@ Version Control with Subversion - For Subversion 1.5(Compiled from r2880) + For Subversion 1.5(Compiled from r2881) Second ?-?????-???-? @@ -16775,18 +16775,6 @@ $ svn commit -m "They don't make Sunday." - - - - Prevents Subversion from printing differences for - added files. The default behavior when you add a file is - for svn diff to print the same - differences that you would see if you had added the entire - contents of an existing (empty) file. - - - - @@ -21753,7 +21741,7 @@ $ svnadmin verify /usr/local/svn/repos/ - Prevents svnlook from printing + Prevents svnlook diff 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 @@ -21761,6 +21749,18 @@ $ svnadmin verify /usr/local/svn/repos/ + + + + + Prevents svnlook diff 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. + + + () diff --git a/doc/svnbook/stylesheets/zh_CN/fo.xsl b/doc/svnbook/stylesheets/zh_CN/fo.xsl index 61f70bc..c0d52fc 100644 --- a/doc/svnbook/stylesheets/zh_CN/fo.xsl +++ b/doc/svnbook/stylesheets/zh_CN/fo.xsl @@ -9,8 +9,18 @@ simsun + 12 simhei - simsun + CourierNew simhei + + + + simsun + 10102 + + + + diff --git a/doc/svnbook/version b/doc/svnbook/version index d3beed2..11f34cc 100644 --- a/doc/svnbook/version +++ b/doc/svnbook/version @@ -1 +1 @@ -Version Control with Subversion 1.5(Compiled from r2880, 2007-09-28 23:40:41 +0800) +Version Control with Subversion 1.5(Compiled from r2881, 2007-11-02 15:44:24 +0800) -- 2.11.4.GIT