diff en/appA-cmdref.xml @ 749:7e7c47481e4f

Oops, this is the real merge for my hg's oddity

--- a/en/appA-cmdref.xml	Fri Mar 20 15:40:06 2009 +0800
+++ b/en/appA-cmdref.xml	Fri Mar 20 16:43:35 2009 +0800
@@ -3,113 +3,113 @@
 <appendix id="cmdref">
 <title>Command reference</title>
 
-<para>\cmdref{add}{add files at the next commit}
+<para id="x_653">\cmdref{add}{add files at the next commit}
 \optref{add}{I}{include}
 \optref{add}{X}{exclude}
 \optref{add}{n}{dry-run}</para>
 
-<para>\cmdref{diff}{print changes in history or working directory}</para>
+<para id="x_654">\cmdref{diff}{print changes in history or working directory}</para>
 
-<para>Show differences between revisions for the specified files or
+<para id="x_655">Show differences between revisions for the specified files or
 directories, using the unified diff format.  For a description of the
 unified diff format, see section <xref linkend="sec.mq.patch"/>.</para>
 
-<para>By default, this command does not print diffs for files that Mercurial
+<para id="x_656">By default, this command does not print diffs for files that Mercurial
 considers to contain binary data.  To control this behaviour, see the
 <option role="hg-opt-diff">-a</option> and <option role="hg-opt-diff">--git</option> options.</para>
 
 <sect2>
 <title>Options</title>
 
-<para>\loptref{diff}{nodates}</para>
+<para id="x_657">\loptref{diff}{nodates}</para>
 
-<para>Omit date and time information when printing diff headers.</para>
+<para id="x_658">Omit date and time information when printing diff headers.</para>
 
-<para>\optref{diff}{B}{ignore-blank-lines}</para>
+<para id="x_659">\optref{diff}{B}{ignore-blank-lines}</para>
 
-<para>Do not print changes that only insert or delete blank lines.  A line
+<para id="x_65a">Do not print changes that only insert or delete blank lines.  A line
 that contains only whitespace is not considered blank.
 </para>
 
-<para>\optref{diff}{I}{include}
+<para id="x_65b">\optref{diff}{I}{include}
 </para>
 
-<para>Include files and directories whose names match the given patterns.
+<para id="x_65c">Include files and directories whose names match the given patterns.
 </para>
 
-<para>\optref{diff}{X}{exclude}
+<para id="x_65d">\optref{diff}{X}{exclude}
 </para>
 
-<para>Exclude files and directories whose names match the given patterns.
+<para id="x_65e">Exclude files and directories whose names match the given patterns.
 </para>
 
-<para>\optref{diff}{a}{text}
+<para id="x_65f">\optref{diff}{a}{text}
 </para>
 
-<para>If this option is not specified, <command role="hg-cmd">hg diff</command> will refuse to print
+<para id="x_660">If this option is not specified, <command role="hg-cmd">hg diff</command> will refuse to print
 diffs for files that it detects as binary. Specifying <option role="hg-opt-diff">-a</option>
 forces <command role="hg-cmd">hg diff</command> to treat all files as text, and generate diffs for
 all of them.
 </para>
 
-<para>This option is useful for files that are <quote>mostly text</quote> but have a
+<para id="x_661">This option is useful for files that are <quote>mostly text</quote> but have a
 few embedded NUL characters.  If you use it on files that contain a
 lot of binary data, its output will be incomprehensible.
 </para>
 
-<para>\optref{diff}{b}{ignore-space-change}
+<para id="x_662">\optref{diff}{b}{ignore-space-change}
 </para>
 
-<para>Do not print a line if the only change to that line is in the amount
+<para id="x_663">Do not print a line if the only change to that line is in the amount
 of white space it contains.
 </para>
 
-<para>\optref{diff}{g}{git}
+<para id="x_664">\optref{diff}{g}{git}
 </para>
 
-<para>Print <command>git</command>-compatible diffs.  XXX reference a format
+<para id="x_665">Print <command>git</command>-compatible diffs.  XXX reference a format
 description.
 </para>
 
-<para>\optref{diff}{p}{show-function}
+<para id="x_666">\optref{diff}{p}{show-function}
 </para>
 
-<para>Display the name of the enclosing function in a hunk header, using a
+<para id="x_667">Display the name of the enclosing function in a hunk header, using a
 simple heuristic.  This functionality is enabled by default, so the
 <option role="hg-opt-diff">-p</option> option has no effect unless you change the value of
 the <envar role="rc-item-diff">showfunc</envar> config item, as in the following example.</para>
 
 <!-- &interaction.cmdref.diff-p; -->
 
-<para>\optref{diff}{r}{rev}
+<para id="x_668">\optref{diff}{r}{rev}
 </para>
 
-<para>Specify one or more revisions to compare.  The <command role="hg-cmd">hg diff</command> command
+<para id="x_669">Specify one or more revisions to compare.  The <command role="hg-cmd">hg diff</command> command
 accepts up to two <option role="hg-opt-diff">-r</option> options to specify the revisions to
 compare.
 </para>
 
 <orderedlist>
-<listitem><para>Display the differences between the parent revision of the
+<listitem><para id="x_66a">Display the differences between the parent revision of the
   working directory and the working directory.
 </para>
 </listitem>
-<listitem><para>Display the differences between the specified changeset and the
+<listitem><para id="x_66b">Display the differences between the specified changeset and the
   working directory.
 </para>
 </listitem>
-<listitem><para>Display the differences between the two specified changesets.
+<listitem><para id="x_66c">Display the differences between the two specified changesets.
 </para>
 </listitem></orderedlist>
 
-<para>You can specify two revisions using either two <option role="hg-opt-diff">-r</option>
+<para id="x_66d">You can specify two revisions using either two <option role="hg-opt-diff">-r</option>
 options or revision range notation.  For example, the two revision
 specifications below are equivalent.
 </para>
 <programlisting>hg diff -r 10 -r 20
 hg diff -r10:20</programlisting>
 
-<para>When you provide two revisions, Mercurial treats the order of those
+<para id="x_66e">When you provide two revisions, Mercurial treats the order of those
 revisions as significant.  Thus, <command role="hg-cmd">hg diff -r10:20</command> will
 produce a diff that will transform files from their contents as of
 revision 10 to their contents as of revision 20, while
@@ -119,23 +119,23 @@
 diffing against the working directory.
 </para>
 
-<para>\optref{diff}{w}{ignore-all-space}
+<para id="x_66f">\optref{diff}{w}{ignore-all-space}
 </para>
 
-<para>\cmdref{version}{print version and copyright information}
+<para id="x_670">\cmdref{version}{print version and copyright information}
 </para>
 
-<para>This command displays the version of Mercurial you are running, and
+<para id="x_671">This command displays the version of Mercurial you are running, and
 its copyright license.  There are four kinds of version string that
 you may see.
 </para>
 <itemizedlist>
-<listitem><para>The string <quote><literal>unknown</literal></quote>. This version of Mercurial was
+<listitem><para id="x_672">The string <quote><literal>unknown</literal></quote>. This version of Mercurial was
   not built in a Mercurial repository, and cannot determine its own
   version.
 </para>
 </listitem>
-<listitem><para>A short numeric string, such as <quote><literal>1.1</literal></quote>. This is a
+<listitem><para id="x_673">A short numeric string, such as <quote><literal>1.1</literal></quote>. This is a
   build of a revision of Mercurial that was identified by a specific
   tag in the repository where it was built.  (This doesn't necessarily
   mean that you're running an official release; someone else could
@@ -143,11 +143,11 @@
   built Mercurial.)
 </para>
 </listitem>
-<listitem><para>A hexadecimal string, such as <quote><literal>875489e31abe</literal></quote>.  This
+<listitem><para id="x_674">A hexadecimal string, such as <quote><literal>875489e31abe</literal></quote>.  This
   is a build of the given revision of Mercurial.
 </para>
 </listitem>
-<listitem><para>A hexadecimal string followed by a date, such as
+<listitem><para id="x_675">A hexadecimal string followed by a date, such as
   <quote><literal>875489e31abe+20070205</literal></quote>.  This is a build of the given
   revision of Mercurial, where the build repository contained some
   local changes that had not been committed.
@@ -161,14 +161,14 @@
 <sect3 id="cmdref.diff-vs-status">
 <title>Why do the results of <command role="hg-cmd">hg diff</command> and <command role="hg-cmd">hg status</command> differ?</title>
 
-<para>When you run the <command role="hg-cmd">hg status</command> command, you'll see a list of files
+<para id="x_676">When you run the <command role="hg-cmd">hg status</command> command, you'll see a list of files
 that Mercurial will record changes for the next time you perform a
 commit.  If you run the <command role="hg-cmd">hg diff</command> command, you may notice that it
 prints diffs for only a <emphasis>subset</emphasis> of the files that <command role="hg-cmd">hg status</command>
 listed.  There are two possible reasons for this.
 </para>
 
-<para>The first is that <command role="hg-cmd">hg status</command> prints some kinds of modifications
+<para id="x_677">The first is that <command role="hg-cmd">hg status</command> prints some kinds of modifications
 that <command role="hg-cmd">hg diff</command> doesn't normally display.  The <command role="hg-cmd">hg diff</command> command
 normally outputs unified diffs, which don't have the ability to
 represent some changes that Mercurial can track.  Most notably,
@@ -176,12 +176,12 @@
 executable, but Mercurial records this information.
 </para>
 
-<para>If you use the <option role="hg-opt-diff">--git</option> option to <command role="hg-cmd">hg diff</command>, it will
+<para id="x_678">If you use the <option role="hg-opt-diff">--git</option> option to <command role="hg-cmd">hg diff</command>, it will
 display <command>git</command>-compatible diffs that <emphasis>can</emphasis> display this
 extra information.
 </para>
 
-<para>The second possible reason that <command role="hg-cmd">hg diff</command> might be printing diffs
+<para id="x_679">The second possible reason that <command role="hg-cmd">hg diff</command> might be printing diffs
 for a subset of the files displayed by <command role="hg-cmd">hg status</command> is that if you
 invoke it without any arguments, <command role="hg-cmd">hg diff</command> prints diffs against the
 first parent of the working directory.  If you have run <command role="hg-cmd">hg merge</command>
@@ -199,14 +199,14 @@
 <sect3>
 <title>Generating safe binary diffs</title>
 
-<para>If you use the <option role="hg-opt-diff">-a</option> option to force Mercurial to print
+<para id="x_67a">If you use the <option role="hg-opt-diff">-a</option> option to force Mercurial to print
 diffs of files that are either <quote>mostly text</quote> or contain lots of
 binary data, those diffs cannot subsequently be applied by either
 Mercurial's <command role="hg-cmd">hg import</command> command or the system's <command>patch</command>
 command.
 </para>
 
-<para>If you want to generate a diff of a binary file that is safe to use as
+<para id="x_67b">If you want to generate a diff of a binary file that is safe to use as
 input for <command role="hg-cmd">hg import</command>, use the <command role="hg-cmd">hg diff</command>{--git} option when you
 generate the patch.  The system <command>patch</command> command cannot handle
 binary patches at all.