Bryan O'Sullivan avatar Bryan O'Sullivan committed 1813116

New IDs

Comments (0)

Files changed (3)

en/appB-mq-ref.xml

       <title><command role="hg-ext-mq">qfold</command>&emdash;move
 	applied patches into repository history</title>
 
-      <para>The <command>hg qfinish</command> command converts the
+      <para id="x_72d">The <command>hg qfinish</command> command converts the
 	specified applied patches into permanent changes by moving
 	them out of MQ's control so that they will be treated as
 	normal repository history.</para>

en/ch02-tour-merge.xml

   <sect1>
     <title>Renaming, copying, and merging</title>
 
-    <para>During the life of a project, we will often want to change
+    <para id="x_729">During the life of a project, we will often want to change
       the layout of its files and directories. This can be as simple
       as renaming a single file, or as complex as restructuring the
       entire hierarchy of files within the project.</para>
 
-    <para>Mercurial supports these kinds of complex changes fluently,
+    <para id="x_72a">Mercurial supports these kinds of complex changes fluently,
       provided we tell it what we're doing.  If we want to rename a
       file, we should use the <command>hg rename</command><footnote>
-	<para>If you're a Unix user, you'll be glad to know that the
+	<para id="x_72b">If you're a Unix user, you'll be glad to know that the
 	  <command>hg rename</command> command can be abbreviated as
 	  <command>hg mv</command>.</para>
       </footnote> command to rename it, so that Mercurial can do the
       right thing later when we merge.</para>
 
-    <para>We will cover the use of these commands in more detail in
+    <para id="x_72c">We will cover the use of these commands in more detail in
       <xref linkend="chap:daily.copy"/>.</para>
   </sect1>
 </chapter>

en/ch03-concepts.xml

 	Mercurial tracks hasn't changed between two changesets, the
 	entry for that file in the two revisions of the manifest will
 	point to the same revision of its filelog<footnote>
-	  <para>It is possible (though unusual) for the manifest to
+	  <para id="x_725">It is possible (though unusual) for the manifest to
 	    remain the same between two changesets, in which case the
 	    changelog entries for those changesets will point to the
 	    same revision of the manifest.</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>When Mercurial checks the state of a file in the
+	  <para id="x_726">When Mercurial checks the state of a file in the
 	    working directory, it first checks a file's modification
 	    time against the time in the dirstate that records when
 	    Mercurial last wrote the file. If the last modified time
 	    need to check any further.</para>
 	</listitem>
 	<listitem>
-	  <para>If the file's size has changed, the file must have
+	  <para id="x_727">If the file's size has changed, the file must have
 	    been modified.  If the modification time has changed, but
 	    the size has not, only then does Mercurial need to
 	    actually read the contents of the file to see if it has
 	</listitem>
       </itemizedlist>
 
-      <para>Storing the modification time and size dramatically
+      <para id="x_728">Storing the modification time and size dramatically
 	reduces the number of read operations that Mercurial needs to
 	perform when we run commands like <command>hg status</command>.
 	This results in large performance improvements.</para>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.