Mercurial > hg
changeset 17251:98166640b356 stable
help: fix some instances of 'the the'
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 26 Jul 2012 02:54:13 +0200 |
| parents | 18f935b4c05a |
| children | 16fad7323e56 |
| files | contrib/wix/README.txt hgext/convert/__init__.py mercurial/discovery.py mercurial/help/config.txt mercurial/hook.py mercurial/keepalive.py tests/test-convert.t |
| diffstat | 7 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/wix/README.txt Fri Jul 06 18:06:52 2012 -0400 +++ b/contrib/wix/README.txt Thu Jul 26 02:54:13 2012 +0200 @@ -7,7 +7,7 @@ must kept up to date with distribution changes within their branch. In other words, the default branch WXS files are expected to diverge from the stable branch WXS files. Storing them within the same repository is -the only sane way to keep the the source tree and the installer in sync. +the only sane way to keep the source tree and the installer in sync. The MSI installer builder uses only the mercurial.ini file from the contrib/win32 folder, the contents of which have been historically used
--- a/hgext/convert/__init__.py Fri Jul 06 18:06:52 2012 -0400 +++ b/hgext/convert/__init__.py Thu Jul 26 02:54:13 2012 +0200 @@ -197,7 +197,7 @@ delete them. :hook.cvschangesets: Specify a Python function to be called after - the changesets are calculated from the the CVS log. The + the changesets are calculated from the CVS log. The function is passed a list with the changeset entries, and can modify the changesets in-place, or add or delete them.
--- a/mercurial/discovery.py Fri Jul 06 18:06:52 2012 -0400 +++ b/mercurial/discovery.py Thu Jul 26 02:54:13 2012 +0200 @@ -95,7 +95,7 @@ (inclusive) are included. If you already know the local repo's heads, passing them in onlyheads is faster than letting them be recomputed here. - If commoninc is given, it must the the result of a prior call to + If commoninc is given, it must be the result of a prior call to findcommonincoming(repo, other, force) to avoid recomputing it here. If portable is given, compute more conservative common and missingheads,
--- a/mercurial/help/config.txt Fri Jul 06 18:06:52 2012 -0400 +++ b/mercurial/help/config.txt Thu Jul 26 02:54:13 2012 +0200 @@ -1065,7 +1065,7 @@ rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``. -Relative subrepository paths are first made absolute, and the the +Relative subrepository paths are first made absolute, and the rewrite rules are then applied on the full (absolute) path. The rules are applied in definition order.
--- a/mercurial/hook.py Fri Jul 06 18:06:52 2012 -0400 +++ b/mercurial/hook.py Thu Jul 26 02:54:13 2012 +0200 @@ -66,7 +66,7 @@ (hname, funcname)) try: try: - # redirect IO descriptors the the ui descriptors so hooks + # redirect IO descriptors to the ui descriptors so hooks # that write directly to these don't mess up the command # protocol when running through the command server old = sys.stdout, sys.stderr, sys.stdin
--- a/mercurial/keepalive.py Fri Jul 06 18:06:52 2012 -0400 +++ b/mercurial/keepalive.py Thu Jul 26 02:54:13 2012 +0200 @@ -211,7 +211,7 @@ h.close() def _request_closed(self, request, host, connection): - """tells us that this request is now closed and the the + """tells us that this request is now closed and that the connection is ready for another request""" self._cm.set_ready(connection, 1)
--- a/tests/test-convert.t Fri Jul 06 18:06:52 2012 -0400 +++ b/tests/test-convert.t Thu Jul 26 02:54:13 2012 +0200 @@ -178,8 +178,8 @@ or delete them. hook.cvschangesets Specify a Python function to be called after the changesets - are calculated from the the CVS log. The function is passed - a list with the changeset entries, and can modify the + are calculated from the CVS log. The function is passed a + list with the changeset entries, and can modify the changesets in-place, or add or delete them. An additional "debugcvsps" Mercurial command allows the builtin changeset