Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: typos
authorPatrick Mezard <pmezard@gmail.com>
Mon, 26 Jul 2010 22:29:49 +0200
changeset 11685 aade8f133d11
parent 11684 39bac1821b12
child 11686 fc360de66217
cleanup: typos
hgext/convert/__init__.py file | annotate | diff | comparison | revisions
mercurial/help/glossary.txt file | annotate | diff | comparison | revisions
mercurial/transaction.py file | annotate | diff | comparison | revisions
tests/test-convert.out file | annotate | diff | comparison | revisions 
--- a/hgext/convert/__init__.py	Mon Jul 26 22:29:17 2010 +0200
+++ b/hgext/convert/__init__.py	Mon Jul 26 22:29:49 2010 +0200
@@ -86,7 +86,7 @@
 
       rename path/to/source path/to/destination
 
-    Comment lines start with '#'. A specificed path matches if it
+    Comment lines start with '#'. A specified path matches if it
     equals the full relative name of a file or one of its parent
     directories. The 'include' or 'exclude' directive with the longest
     matching path applies, so line order does not matter.
@@ -96,8 +96,8 @@
     exclusion of all other files and directories not explicitly
     included. The 'exclude' directive causes files or directories to
     be omitted. The 'rename' directive renames a file or directory if
-    is converted. To rename from a subdirectory into the root of the
-    repository, use '.' as the path to rename to.
+    it is converted. To rename from a subdirectory into the root of
+    the repository, use '.' as the path to rename to.
 
     The splicemap is a file that allows insertion of synthetic
     history, letting you specify the parents of a revision. This is
--- a/mercurial/help/glossary.txt	Mon Jul 26 22:29:17 2010 +0200
+++ b/mercurial/help/glossary.txt	Mon Jul 26 22:29:49 2010 +0200
@@ -16,7 +16,7 @@
     a remote repository, since new heads may be created by these
     operations. Note that the term branch can also be used informally
     to describe a development process in which certain development is
-    done independently of other development.This is sometimes done
+    done independently of other development. This is sometimes done
     explicitly with a named branch, but it can also be done locally,
     using bookmarks or clones and anonymous branches.
 
--- a/mercurial/transaction.py	Mon Jul 26 22:29:17 2010 +0200
+++ b/mercurial/transaction.py	Mon Jul 26 22:29:49 2010 +0200
@@ -115,7 +115,7 @@
     def release(self):
         if self.count > 0:
             self.usages -= 1
-        # of the transaction scopes are left without being closed, fail
+        # if the transaction scopes are left without being closed, fail
         if self.count > 0 and self.usages == 0:
             self._abort()
 
--- a/tests/test-convert.out	Mon Jul 26 22:29:17 2010 +0200
+++ b/tests/test-convert.out	Mon Jul 26 22:29:49 2010 +0200
@@ -65,7 +65,7 @@
 
       rename path/to/source path/to/destination
 
-    Comment lines start with '#'. A specificed path matches if it equals the
+    Comment lines start with '#'. A specified path matches if it equals the
     full relative name of a file or one of its parent directories. The
     'include' or 'exclude' directive with the longest matching path applies,
     so line order does not matter.
@@ -74,7 +74,7 @@
     be included in the destination repository, and the exclusion of all other
     files and directories not explicitly included. The 'exclude' directive
     causes files or directories to be omitted. The 'rename' directive renames
-    a file or directory if is converted. To rename from a subdirectory into
+    a file or directory if it is converted. To rename from a subdirectory into
     the root of the repository, use '.' as the path to rename to.
 
     The splicemap is a file that allows insertion of synthetic history,
mercurial