[svnbook] r4204 committed - Merge from ^/trunk/en r4192 and r4193.
svnbook at googlecode.com
svnbook at googlecode.com
Fri Nov 11 11:20:04 CST 2011
Revision: 4204
Author: cmpilato at gmail.com
Date: Fri Nov 11 09:12:54 2011
Log: Merge from ^/trunk/en r4192 and r4193.
http://code.google.com/p/svnbook/source/detail?r=4204
Modified:
/branches/1.6/en
/branches/1.6/en/book/ch09-reference.xml
=======================================
--- /branches/1.6/en/book/ch09-reference.xml Wed Nov 2 12:36:14 2011
+++ /branches/1.6/en/book/ch09-reference.xml Fri Nov 11 09:12:54 2011
@@ -1463,11 +1463,11 @@
<para>If, for some reason, an <command>svn update</command>
fails due to a problem running an external diff program
(e.g., user input or network failure), pass the
- <option>--diff3-cmd</option> to allow cleanup to complete
- any merging with your external diff program. You can also
- specify any configuration directory with the
- <option>--config-dir</option> option, but you should need
- these options extremely infrequently.</para>
+ <option>--diff3-cmd</option> to allow the cleanup process
+ to complete any required merging using your external diff
+ program. You can also specify any configuration directory
+ with the <option>--config-dir</option> option, but you
+ should need these options extremely infrequently.</para>
</refsect1>
@@ -1940,6 +1940,30 @@
D over-there
</screen>
</informalexample>
+
+ <para>Use the <option>--keep-local</option> option to
+ override the default <command>svn delete</command>
+ behavior of also removing the target file that was
+ scheduled for versioned deletion. This is helpful when
+ you realize that you've accidentally committed the
+ addition of a file that you need to keep around in your
+ working copy, but which shouldn't have been added to
+ version control.</para>
+
+ <informalexample>
+ <screen>
+$ svn delete --keep-local conf/program.conf
+D conf/program.conf
+
+$ svn commit -m "Remove accidentally-added configuration file."
+Deleting conf/program.conf
+Transmitting file data .
+Committed revision 21.
+$ svn status
+? conf/program.conf
+$
+</screen>
+ </informalexample>
</refsect1>
</refentry>
@@ -1967,13 +1991,11 @@
<refsect1>
<title>Description</title>
+ <para>Display the differences between two paths. You can
+ use <command>svn diff</command> in the following ways:</para>
+
<itemizedlist>
- <listitem>
- <para>Display the differences between two paths. You can
- use <command>svn diff</command> in the following ways:</para>
- </listitem>
-
<listitem>
<para>Use just <command>svn diff</command> to display local
modifications in a working copy.</para>
@@ -2532,42 +2554,21 @@
<refsect1>
<title>Description</title>
- <para>Print information about the working copy paths or
- URLs specified. The information shown for both may
- include:</para>
+ <para>Print information about the working copy paths or URLs
+ specified. The information displayed for each path may
+ include (as pertinent to the object at that path):</para>
<itemizedlist>
- <listitem><para>Path</para></listitem>
- <listitem><para>Name</para></listitem>
- <listitem><para>URL</para></listitem>
- <listitem><para>Repository root</para></listitem>
- <listitem><para>Repository UUID</para></listitem>
- <listitem><para>Revision</para></listitem>
- <listitem><para>Node kind</para></listitem>
- <listitem><para>Last changed author</para></listitem>
- <listitem><para>Last changed revision</para></listitem>
- <listitem><para>Last changed date</para></listitem>
- <listitem><para>Lock token</para></listitem>
- <listitem><para>Lock owner</para></listitem>
- <listitem><para>Lock created (date)</para></listitem>
- <listitem><para>Lock expires (date)</para></listitem>
+ <listitem><para>information about the repository in which
+ the object is versioned</para></listitem>
+ <listitem><para>the most recent commit made to the
+ specified version of the object</para></listitem>
+ <listitem><para>any user-level locks held on the
+ object</para></listitem>
+ <listitem><para>local scheduling information (added,
+ deleted, copied, etc.)</para></listitem>
+ <listitem><para>local conflict information</para></listitem>
</itemizedlist>
-
- <para>Additional kinds of information available only for
- working copy paths are:</para>
-
- <itemizedlist>
- <listitem><para>Schedule</para></listitem>
- <listitem><para>Copied from URL</para></listitem>
- <listitem><para>Copied from rev</para></listitem>
- <listitem><para>Text last updated</para></listitem>
- <listitem><para>Properties last updated</para></listitem>
- <listitem><para>Checksum</para></listitem>
- <listitem><para>Conflict previous base file</para></listitem>
- <listitem><para>Conflict previous working
file</para></listitem>
- <listitem><para>Conflict current base file</para></listitem>
- <listitem><para>Conflict properties file</para></listitem>
- </itemizedlist>
</refsect1>
<refsect1>
@@ -4491,10 +4492,10 @@
changes.</para>
<para>If you provide no targets to <command>svn
- revert</command>, it will do nothing—to protect
- you from accidentally losing changes in your working
+ revert</command>, it will do nothing. To protect you
+ from accidentally losing changes in your working
copy, <command>svn revert</command> requires you to
- provide at least one target.</para>
+ explicitly provide at least one target.</para>
</warning>
</refsect1>
More information about the svnbook-dev
mailing list