[svnbook] r4721 committed - Added references needed for chapter 3 translation.
svnbook at googlecode.com
svnbook at googlecode.com
Fri Mar 14 01:13:15 CDT 2014
Revision: 4721
Author: jmfelderhoff at gmx.eu
Date: Fri Mar 14 06:12:47 2014 UTC
Log: Added references needed for chapter 3 translation.
http://code.google.com/p/svnbook/source/detail?r=4721
Modified:
/branches/1.7/de/book/ch04-branching-and-merging.xml
/branches/1.7/de/book/ch09-reference.xml
=======================================
--- /branches/1.7/de/book/ch04-branching-and-merging.xml Sat Nov 2
13:33:44 2013 UTC
+++ /branches/1.7/de/book/ch04-branching-and-merging.xml Fri Mar 14
06:12:47 2014 UTC
@@ -1001,6 +1001,25 @@
sicherzustellen, dass Ihr Client und Server mindestens die
Version 1.5 haben.</para>
+ <sidebar id="svn.branchmerge.basicmerging.mergetracking">
+ <title>Merge Tracking</title>
+ <para>
+ <indexterm>
+ <primary>merge tracking</primary>
+ </indexterm>
+ Subversion 1.5 introduced the
+ <firstterm>merge tracking</firstterm> feature to Subversion.
+ Prior to this feature keeping track of merges required cumbersome
+ manual procedures or the use of external tools. Subsequent
+ releases of Subversion introduced many enhancements and bug
+ fixes to merge tracking, which is why we recommend using the
+ most recent versions on both your server and client. Keep in
+ mind that even if your server is running 1.5 or 1.6, you can still
+ use a 1.7 client. This is particularly important as regards merge
+ tracking, because the overwhelming majority of fixes to it are on
+ the client side.</para>
+ </sidebar>
+
<!-- ===============================================================
-->
<sect2 id="svn.branchmerge.changesets">
<!--
=======================================
--- /branches/1.7/de/book/ch09-reference.xml Thu Mar 13 16:05:53 2014 UTC
+++ /branches/1.7/de/book/ch09-reference.xml Fri Mar 14 06:12:47 2014 UTC
@@ -1289,7 +1289,7 @@
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry id="svn.ref.svn.sw.quiet">
<term><option>--quiet</option> (<option>-q</option>)</term>
<listitem>
<!--
@@ -1384,6 +1384,15 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.reverse_diff">
+ <term><option>--reverse-diff</option></term>
+ <listitem>
+ <para>Causes <command>svn patch</command> to interpret the
+ input patch instructions in reverse—treating added
+ lines as removed ones and vice-versa.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>--revision</option> (<option>-r</option>)
<replaceable>REV</replaceable>
@@ -1538,6 +1547,16 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.strip">
+ <term><option>--strip</option>
<replaceable>NUM</replaceable></term>
+ <listitem>
+ <para>Used by <command>svn patch</command> to
+ ignore <replaceable>NUM</replaceable> leading path
+ components found on paths specified in the patch input
+ file.</para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>--summarize</option></term>
<listitem>
@@ -6306,6 +6325,254 @@
</screen>
</informalexample>
+ </refsect1>
+ </refentry>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
+ <refentry id="svn.ref.svn.c.patch">
+
+ <indexterm>
+ <primary>svn</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>patch</tertiary>
+ </indexterm>
+
+ <refnamediv>
+ <refname>svn patch</refname>
+ <refpurpose>Apply changes represented in a unidiff patch to
+ the working copy.</refpurpose>
+ </refnamediv>
+ <refsect1>
+ <title>Synopsis</title>
+ <para><literal>svn patch PATCHFILE [WCPATH]</literal></para>
+ </refsect1>
+ <refsect1>
+ <title>Description</title>
+
+ <para>This subcommand will apply changes described a
+ unidiff-formatted patch
+ file <replaceable>PATCHFILE</replaceable> to the working
+ copy <replaceable>WCPATH</replaceable>. As with most
+ other working copy subcommands,
+ if <replaceable>WCPATH</replaceable> is omitted, the
+ changes are applied to the current working directory. A
+ unidiff patch suitable for application to a working copy
+ can be produced with the <command>svn diff</command>
+ command or third-party differencing tools. Any
+ non-unidiff content found in the patch file is
+ ignored.</para>
+
+ <para>Changes listed in the patch file will either be
+ applied or rejected. If a change does not match at its
+ exact line offset, it may be applied earlier or later in
+ the file if a match is found elsewhere for the surrounding
+ lines of context provided by the patch. A change may also
+ be applied with <firstterm>fuzz</firstterm>—meaning,
+ one or more lines of context are ignored when attempting
+ to match the change location. If no matching context can
+ be found for a change, the change conflicts and will be
+ written to a reject file which bears the extension
+ <filename>.svnpatch.rej</filename>.</para>
+
+ <para><command>svn patch</command> reports a status line for
+ patched file or directory using letter codes, very similar
+ to the way that <command>svn update</command> provides
+ notification. The letter codes have the following
+ meanings:</para>
+
+ <variablelist>
+
+ <varlistentry>
+ <term><literal>A</literal></term>
+ <listitem>
+ <para>Added</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>D</literal></term>
+ <listitem>
+ <para>Deleted</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>C</literal></term>
+ <listitem>
+ <para>Conflicted</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>G</literal></term>
+ <listitem>
+ <para>Merged</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>U</literal></term>
+ <listitem>
+ <para>Updated</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ <para>Changes applied with an offset or fuzz are reported on
+ lines starting with the '<literal>></literal>'
+ symbol. You should review such changes carefully.</para>
+
+ <para>If the patch removes all content from a file, that
+ file is automatically scheduled for deletion. Likewise,
+ if the patch creates a new file, that file is
+ automatically scheduled for addition. Use <command>svn
+ revert</command> to undo undesired deletions and
+ additions.</para>
+
+ </refsect1>
+
+ <refsect1>
+ <title>Options</title>
+
+ <informalexample>
+ <screen>
+<xref linkend="svn.ref.svn.sw.dry_run" />
+<xref linkend="svn.ref.svn.sw.ignore_whitespace" />
+<xref linkend="svn.ref.svn.sw.quiet" />
+<xref linkend="svn.ref.svn.sw.reverse_diff" />
+<xref linkend="svn.ref.svn.sw.strip" />
+</screen>
+ </informalexample>
+ </refsect1>
+
+ <refsect1>
+ <title>Examples</title>
+
+ <para>Apply a simple patch file generated by
+ the <command>svn diff</command> command. Our patch file
+ will create a new file, delete another file, and modify a
+ third's contents and properties. Here's the patch file
+ itself (which we'll assume is creatively named
+ <filename>PATCH</filename>):</para>
+
+ <informalexample>
+ <programlisting>
+Index: deleted-file
+===================================================================
+--- deleted-file (revision 3)
++++ deleted-file (working copy)
+@@ -1 +0,0 @@
+-This file will be deleted.
+Index: changed-file
+===================================================================
+--- changed-file (revision 4)
++++ changed-file (working copy)
+@@ -1,6 +1,6 @@
+ The letters in a line of text
+ Could make your day much better.
+ But expanded into paragraphs,
+-I'd tell of kangaroos and calves
++I'd tell of monkeys and giraffes
+ Until you were all smiles and laughs
+ From my letter made of letters.
+
+Property changes on: changed-file
+___________________________________________________________________
+Added: propname
+## -0,0 +1 ##
++propvalue
+Index: added-file
+===================================================================
+--- added-file (revision 0)
++++ added-file (working copy)
+@@ -0,0 +1 @@
++This is an added file.
+</programlisting>
+ </informalexample>
+
+ <para>We can apply the previous patch file to another
+ working copy from our repository using <command>svn
+ patch</command>, and verify that it did the right thing by
+ using <command>svn diff</command>:</para>
+
+ <informalexample>
+ <screen>
+$ cd /some/other/workingcopy
+$ svn patch /path/to/PATCH
+D deleted-file
+UU changed-file
+A added-file
+$ svn diff
+Index: deleted-file
+===================================================================
+--- deleted-file (revision 3)
++++ deleted-file (working copy)
+@@ -1 +0,0 @@
+-This file will be deleted.
+Index: changed-file
+===================================================================
+--- changed-file (revision 4)
++++ changed-file (working copy)
+@@ -1,6 +1,6 @@
+ The letters in a line of text
+ Could make your day much better.
+ But expanded into paragraphs,
+-I'd tell of kangaroos and calves
++I'd tell of monkeys and giraffes
+ Until you were all smiles and laughs
+ From my letter made of letters.
+
+Property changes on: changed-file
+___________________________________________________________________
+Added: propname
+## -0,0 +1 ##
++propvalue
+Index: added-file
+===================================================================
+--- added-file (revision 0)
++++ added-file (working copy)
+@@ -0,0 +1 @@
++This is an added file.
+$
+</screen>
+ </informalexample>
+
+ <para>Sometimes you might need Subversion to interpret a
+ patch <quote>in reverse</quote>—where added things
+ get treated as removed things, and vice-versa. Use
+ the <option>--reverse-diff</option> option for this
+ purpose. In the following example, we'll squirrel away
+ a patch file which describes the changes in our working
+ copy, and then use a reverse patch operation to undo those
+ changes.</para>
+
+ <informalexample>
+ <screen>
+$ svn status
+M foo.c
+$ svn diff > PATCH
+$ cat PATCH
+Index: foo.c
+===================================================================
+--- foo.c (revision 128)
++++ foo.c (working copy)
+@@ -1003,7 +1003,7 @@
+ return ERROR_ON_THE_G_STRING;
+
+ /* Do something in a loop. */
+- for (i = 0; i < txns->nelts; i++)
++ for (i = 0; i < txns->nelts; i--)
+ {
+ status = do_something(i);
+ if (status)
+$ svn patch --reverse-diff PATCH
+U foo.c
+$ svn status
+$
+</screen>
+ </informalexample>
+
</refsect1>
</refentry>
@@ -9417,7 +9684,7 @@
</listitem>
</varlistentry>
- <varlistentry>
+ <varlistentry id="svn.ref.svnadmin.sw.quiet">
<term><option>--quiet</option> (<option>-q</option>)</term>
<listitem>
<!--
More information about the svnbook-dev
mailing list