# HG changeset patch # User Bryan O'Sullivan # Date 1241506401 25200 # Node ID 18131160f7ee3b81bf39ce2c58f762b8d671cef3 # Parent 477d6a3e50232c27a6dff70a392cff37d09d6017 New IDs diff -r 477d6a3e5023 -r 18131160f7ee en/appB-mq-ref.xml --- a/en/appB-mq-ref.xml Mon May 04 23:52:38 2009 -0700 +++ b/en/appB-mq-ref.xml Mon May 04 23:53:21 2009 -0700 @@ -75,7 +75,7 @@ <command role="hg-ext-mq">qfold</command>&emdash;move applied patches into repository history - The hg qfinish command converts the + The hg qfinish 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. diff -r 477d6a3e5023 -r 18131160f7ee en/ch02-tour-merge.xml --- a/en/ch02-tour-merge.xml Mon May 04 23:52:38 2009 -0700 +++ b/en/ch02-tour-merge.xml Mon May 04 23:53:21 2009 -0700 @@ -428,21 +428,21 @@ Renaming, copying, and merging - During the life of a project, we will often want to change + 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. - Mercurial supports these kinds of complex changes fluently, + 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 hg rename - If you're a Unix user, you'll be glad to know that the + If you're a Unix user, you'll be glad to know that the hg rename command can be abbreviated as hg mv. command to rename it, so that Mercurial can do the right thing later when we merge. - We will cover the use of these commands in more detail in + We will cover the use of these commands in more detail in . diff -r 477d6a3e5023 -r 18131160f7ee en/ch03-concepts.xml --- a/en/ch03-concepts.xml Mon May 04 23:52:38 2009 -0700 +++ b/en/ch03-concepts.xml Mon May 04 23:53:21 2009 -0700 @@ -116,7 +116,7 @@ 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 - It is possible (though unusual) for the manifest to + 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. @@ -746,7 +746,7 @@ - When Mercurial checks the state of a file in the + 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 @@ -755,7 +755,7 @@ need to check any further. - If the file's size has changed, the file must have + 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 @@ -763,7 +763,7 @@ - Storing the modification time and size dramatically + Storing the modification time and size dramatically reduces the number of read operations that Mercurial needs to perform when we run commands like hg status. This results in large performance improvements.