[svnbook commit] r3101 - trunk/src/en/book
fitz
noreply at red-bean.com
Wed Jun 4 00:56:34 CDT 2008
Author: fitz
Date: Wed Jun 4 00:56:33 2008
New Revision: 3101
Log:
Document svn resolve and deprecated svn resolved.
This fixes issue #112.
* src/en/book/ch09-reference.xml: svn resolve work, + s/fitz/harry in
a later example.
Modified:
trunk/src/en/book/ch09-reference.xml
Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml (original)
+++ trunk/src/en/book/ch09-reference.xml Wed Jun 4 00:56:33 2008
@@ -4115,6 +4115,138 @@
</refsect1>
</refentry>
+ <refentry id="svn.ref.svn.c.resolve">
+
+ <indexterm>
+ <primary>svn</primary>
+ <secondary>subcommands</secondary>
+ <tertiary>resolve</tertiary>
+ </indexterm>
+
+ <refnamediv>
+ <refname>svn resolve</refname>
+ <refpurpose>Resolve conflicts on working copy files or
+ directories.</refpurpose>
+ </refnamediv>
+ <refsect1>
+ <title>Synopsis</title>
+ <programlisting>svn resolve PATH...</programlisting>
+ </refsect1>
+ <refsect1>
+ <title>Description</title>
+
+ <para>Resolve <quote>conflicted</quote> state on working
+ copy files or directories. This routine does not
+ semantically resolve conflict markers, however, it
+ replaces <replaceable>PATH</replaceable> with the version
+ specified by the <option>--accept</option> argument and
+ then removes conflict-related artifact files. This allows
+ <replaceable>PATH</replaceable> to be committed
+ again—that is, it tells Subversion that the
+ conflicts have been
+ <quote>resolved.</quote>. You can pass the following
+ arguments to the <option>--accept</option> command
+ depending on your desired resolution:</para>
+
+ <variablelist>
+
+ <varlistentry>
+ <term>base</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>working</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>mine-full</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>theirs-full</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>
+
+ </variablelist>
+
+ <para>See <xref
+ linkend="svn.tour.cycle.resolve"/> for an in-depth look at
+ resolving conflicts.</para>
+
+ </refsect1>
+
+ <refsect1>
+ <title>Alternate Names</title>
+ <para>None</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Changes</title>
+ <para>Working copy</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Accesses Repository</title>
+ <para>No</para>
+ </refsect1>
+
+ <refsect1>
+ <title>Options</title>
+
+ <screen>
+--targets FILENAME
+--depth ARG
+--accept ARG
+--quiet (-q)
+--accept ARG
+--config-dir DIR
+</screen>
+ </refsect1>
+
+ <refsect1>
+ <title>Example</title>
+
+ <para>Here's an example where, after a postponed conflict
+ resolution during update, <command>svn resolve</command>
+ replaces the all conflicts in
+ file <literal>foo.c</literal> with your edits:</para>
+
+ <screen>
+$ svn up
+Conflict discovered in 'foo.c'.
+Select: (p) postpone, (df) diff-full, (e) edit,
+ (h) help for more options: p
+C foo.c
+Updated to revision 5.
+
+$ svn resolve --accept mine-full foo.c
+Resolved conflicted state of 'foo.c'
+</screen>
+
+ </refsect1>
+ </refentry>
+
<refentry id="svn.ref.svn.c.resolved">
<indexterm>
@@ -4125,8 +4257,9 @@
<refnamediv>
<refname>svn resolved</refname>
- <refpurpose>Remove <quote>conflicted</quote> state on
- working copy files or directories.</refpurpose>
+ <refpurpose><emphasis>Deprecated</emphasis>.
+ Remove <quote>conflicted</quote> state on working copy
+ files or directories.</refpurpose>
</refnamediv>
<refsect1>
<title>Synopsis</title>
@@ -4135,6 +4268,11 @@
<refsect1>
<title>Description</title>
+ <para>This command has been deprecated in favor of
+ running <command>svn resolve --accept working</command>.
+ See <xref linkend="svn.ref.svn.c.resolve"/> for
+ details.</para>
+
<para>Remove <quote>conflicted</quote> state on working copy
files or directories. This routine does not semantically
resolve conflict markers; it merely removes
@@ -7093,7 +7231,7 @@
<screen>
$ svnlook --verbose proplist /var/svn/repos /trunk/README
- original-author : fitz
+ original-author : harry
svn:mime-type : text/plain
</screen>
More information about the svnbook-dev
mailing list