[svnbook] r4273 committed - * en/book/ch09-reference.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Fri Jun 1 13:37:10 CDT 2012
Revision: 4273
Author: cmpilato at gmail.com
Date: Fri Jun 1 11:36:53 2012
Log: * en/book/ch09-reference.xml
For issue 168, move (and expand) the more detailed list of --accept
actions to the description of that option, instead of covering only a
subset of those actions as part of the 'svn resolve' documentation.
http://code.google.com/p/svnbook/source/detail?r=4273
Modified:
/trunk/en/book/ch09-reference.xml
=======================================
--- /trunk/en/book/ch09-reference.xml Thu May 3 05:31:37 2012
+++ /trunk/en/book/ch09-reference.xml Fri Jun 1 11:36:53 2012
@@ -203,11 +203,101 @@
<varlistentry id="svn.ref.svn.sw.accept">
<term><option>--accept</option>
<replaceable>ACTION</replaceable></term>
<listitem>
- <para>Specifies an action for automatic conflict resolution.
- Possible actions are <literal>postpone</literal>,
- <literal>base</literal>, <literal>mine-full</literal>,
- <literal>theirs-full</literal>, <literal>edit</literal>, and
- <literal>launch</literal>.</para>
+ <para>Specifies an action for automatic conflict
+ resolution, disabling the interactive prompts which ask
+ the user how to handle each conflict as it is noticed.
+ Though which of the specific actions are applicable
+ differs depending on which subcommand is in use,
+ Subversion supports the following long (and short)
+ values for <replaceable>ACTION</replaceable>:</para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>postpone</literal>
+ (<literal>p</literal>)</term>
+ <listitem>
+ <para>Take no resolution action at all and instead
+ allow the conflicts to be recorded for future
+ resolution.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>edit</literal>
+ (<literal>e</literal>)</term>
+ <listitem>
+ <para>Open each conflicted file in a text editor for
+ manual resolution of line-based conflicts.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>launch</literal>
+ (<literal>l</literal>)</term>
+ <listitem>
+ <para>Launch an interactive merge conflict
+ resolution tool for each conflicted file.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>base</literal></term>
+ <listitem>
+ <para>Choose the file that was the (unmodified)
+ <literal>BASE</literal> revision before you tried
+ to integrate changes from the server into
+ your working copy.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>working</literal></term>
+ <listitem>
+ <para>Assuming that you've manually handled the
+ conflict resolution, choose the version of the file
+ as it currently stands in your working copy.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>mine-full</literal>
+ (<literal>mf</literal>)</term>
+ <listitem>
+ <para>Resolve conflicted files by preserving all
+ local modifications and discarding all changes
+ fetched from the server during the operation which
+ caused the conflict.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>theirs-full</literal>
+ (<literal>tf</literal>)</term>
+ <listitem>
+ <para>Resolve conflicted files by discarding all
+ local modifications and integrating all changes
+ fetched from the server during the operation which
+ caused the conflict.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>mine-conflict</literal>
+ (<literal>mc</literal>)</term>
+ <listitem>
+ <para>Resolve conflicted files by preferring local
+ modifications over the changes fetched from the
+ server in conflicting regions of each file's
+ content.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>theirs-conflict</literal>
+ (<literal>tc</literal>)</term>
+ <listitem>
+ <para>Resolve conflicted files by preferring the
+ changes fetched from the server over local
+ modifications in conflicting regions of each file's
+ content.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <para>Consult the output of <command>svn help
+ <replaceable>SUBCOMMAND</replaceable></command> to see
+ exactly which actions are supported by the specific
+ subcommand of interest.</para>
</listitem>
</varlistentry>
@@ -5055,72 +5145,7 @@
then removes conflict-related artifact files. This allows
<replaceable>PATH</replaceable> to be committed
again—that is, it tells Subversion that the
- conflicts have been
- <quote>resolved.</quote>. You can pass the following
- arguments to the <option>--accept</option> command
- depending on your desired resolution:</para>
-
- <variablelist>
-
- <varlistentry>
- <term><literal>base</literal></term>
- <listitem>
- <para>Choose the file that was the
- <literal>BASE</literal> revision before you updated
- your working copy. That is, the file that you
- checked out before you made your latest
- edits.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><literal>working</literal></term>
- <listitem>
- <para>Assuming that you've manually handled the
- conflict resolution, choose the version of the file
- as it currently stands in your working copy.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><literal>mine-full</literal></term>
- <listitem>
- <para>Resolve all conflicted files with copies of the
- files as they stood immediately before you
- ran <command>svn update</command>.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><literal>theirs-full</literal></term>
- <listitem>
- <para>Resolve all conflicted files with copies of the
- files that were fetched from the server when you
- ran <command>svn update</command>.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><literal>mine-conflict</literal></term>
- <listitem>
- <para>Resolve all conflicted files by preferring local
- modifications over the changes fetched from the
- server in conflicting regions of each file's
- content.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><literal>theirs-conflict</literal></term>
- <listitem>
- <para>Resolve all conflicted files by preferring the
- changes fetched from the server over local
- modifications in conflicting regions of each file's
- content.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
+ conflicts have been <quote>resolved.</quote></para>
<para>See <xref
linkend="svn.tour.cycle.resolve"/> for an in-depth look at
More information about the svnbook-dev
mailing list