You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/08/03 18:36:47 UTC
svn commit: r1369093 - in /subversion/trunk: contrib/client-side/emacs/
contrib/hook-scripts/enforcer/ notes/merge-tracking/ subversion/include/
subversion/libsvn_fs_base/ subversion/libsvn_fs_fs/
subversion/libsvn_repos/ subversion/libsvn_subr/ subver...
Author: philip
Date: Fri Aug 3 16:36:46 2012
New Revision: 1369093
URL: http://svn.apache.org/viewvc?rev=1369093&view=rev
Log:
Remove the mistake "the the" from various files.
* subversion/libsvn_repos/repos.c
(create_conf): Tweak svnserve.conf text.
* subversion/include/svn_dav.h
(SVN_DAV_VTXN_NAME_HEADER): Tweak comment.
* subversion/include/svn_mergeinfo.h
(svn_rangelist_intersect): Tweak comment.
* subversion/include/svn_wc.h
(svn_wc_conflict_version_create2, svn_wc_add4): Tweak comment.
* subversion/libsvn_fs_base/dag.c
(svn_fs_base__things_different): Tweak comment.
* subversion/libsvn_fs_base/uuid.h
(svn_fs_base__populate_uuid): Tweak comment.
* subversion/libsvn_fs_fs/fs_fs.c
(get_revprop_packname, hotcopy_io_dir_file_copy): Tweak comment.
* subversion/libsvn_subr/base64.c
(BASE64_LINELEN): Tweak comment.
* subversion/libsvn_subr/cache-membuffer.c: Tweak comment.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_global_commit): Tweak comment.
* contrib/client-side/emacs/psvn.el
(svn-status-goto-file-name): Tweak comment.
* contrib/hook-scripts/enforcer/enforcer: Tweak comment.
* notes/merge-tracking/func-spec.html: Tweak text.
Modified:
subversion/trunk/contrib/client-side/emacs/psvn.el
subversion/trunk/contrib/hook-scripts/enforcer/enforcer
subversion/trunk/notes/merge-tracking/func-spec.html
subversion/trunk/subversion/include/svn_dav.h
subversion/trunk/subversion/include/svn_mergeinfo.h
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_fs_base/dag.c
subversion/trunk/subversion/libsvn_fs_base/uuid.h
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_repos/repos.c
subversion/trunk/subversion/libsvn_subr/base64.c
subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/contrib/client-side/emacs/psvn.el
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/emacs/psvn.el?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/emacs/psvn.el (original)
+++ subversion/trunk/contrib/client-side/emacs/psvn.el Fri Aug 3 16:36:46 2012
@@ -3575,7 +3575,7 @@ If the file is not found, return nil."
(and found start-pos)))
(defun svn-status-goto-file-name (name)
- "Move the cursor the the line that displays NAME."
+ "Move the cursor to the line that displays NAME."
(let ((pos (svn-status-get-file-name-buffer-position name)))
(if pos
(goto-char pos)
Modified: subversion/trunk/contrib/hook-scripts/enforcer/enforcer
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/hook-scripts/enforcer/enforcer?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/contrib/hook-scripts/enforcer/enforcer (original)
+++ subversion/trunk/contrib/hook-scripts/enforcer/enforcer Fri Aug 3 16:36:46 2012
@@ -129,7 +129,7 @@ configuration file "enforcer.conf".
When writing hooks, it is usually easier to test the hooks on committed
transactions already in the repository, rather than installing the
-hook and making commits to test the them. Enforcer allows you to
+hook and making commits to test them. Enforcer allows you to
specify either a transaction ID (for use in a hook script) or a
revision number (for testing). You can then, for example, find a
revision that you would like to have blocked (or not) and test your
Modified: subversion/trunk/notes/merge-tracking/func-spec.html
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/merge-tracking/func-spec.html?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/notes/merge-tracking/func-spec.html (original)
+++ subversion/trunk/notes/merge-tracking/func-spec.html Fri Aug 3 16:36:46 2012
@@ -672,7 +672,7 @@ Whitespace fixes. No functional change.
<p>The <code>--verbose</code> flag also triggers additional information.
In addition to the date of the revision, <code>--verbose</code>, in
- combination with <code>-g</code>, also displays the the original path, relative
+ combination with <code>-g</code>, also displays the original path, relative
to the repository root, where the modifications were made. Given the above
example, <code>svn blame -g --verbose</code> will be something like this:</p>
<pre>
Modified: subversion/trunk/subversion/include/svn_dav.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_dav.h?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_dav.h (original)
+++ subversion/trunk/subversion/include/svn_dav.h Fri Aug 3 16:36:46 2012
@@ -171,7 +171,7 @@ extern "C" {
#define SVN_DAV_TXN_NAME_HEADER "SVN-Txn-Name"
/** This header is used in the POST request, to pass a client supplied
- * alternative transaction name to the server, and in the the POST
+ * alternative transaction name to the server, and in the POST
* response, to tell the client that the alternative transaction
* resource names should be used. (HTTP protocol v2 only)
* @since New in 1.7. */
Modified: subversion/trunk/subversion/include/svn_mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_mergeinfo.h?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_mergeinfo.h (original)
+++ subversion/trunk/subversion/include/svn_mergeinfo.h Fri Aug 3 16:36:46 2012
@@ -395,7 +395,7 @@ svn_mergeinfo_intersect(svn_mergeinfo_t
* @a consider_inheritance determines how to account for the inheritability
* of the two rangelist's ranges when calculating the intersection,
* @see svn_mergeinfo_diff(). If @a consider_inheritance is FALSE then
- * ranges with different inheritance can intersect, but the the resulting
+ * ranges with different inheritance can intersect, but the resulting
* @a *rangelist is non-inheritable only if the corresponding ranges from
* both @a rangelist1 and @a rangelist2 are non-inheritable.
* If @a consider_inheritance is TRUE, then ranges with different
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Fri Aug 3 16:36:46 2012
@@ -1685,7 +1685,7 @@ typedef struct svn_wc_conflict_version_t
*
* Set the @c repos_url field of the created struct to @a repos_url, the
* @c path_in_repos field to @a path_in_repos, the @c peg_rev field to
- * @a peg_rev and the the @c node_kind to @c node_kind. Make only shallow
+ * @a peg_rev and the @c node_kind to @c node_kind. Make only shallow
* copies of the pointer arguments.
*
* @since New in 1.8.
@@ -4566,7 +4566,7 @@ svn_wc_add_from_disk(svn_wc_context_t *w
* working copy as a copy of the original location. The separate working
* copy will be integrated by this step. In this case, which is only used
* by code like that of "svn cp URL@rev path" @a copyfrom_url and
- * @a copyfrom_rev MUST BE the the url and revision of @a local_abspath
+ * @a copyfrom_rev MUST BE the url and revision of @a local_abspath
* in the separate working copy.
*
* 2a) If the node was not versioned before it will be scheduled as a local
Modified: subversion/trunk/subversion/libsvn_fs_base/dag.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/dag.c?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/dag.c Fri Aug 3 16:36:46 2012
@@ -1632,7 +1632,7 @@ svn_fs_base__things_different(svn_boolea
if (! props_changed && ! contents_changed)
return SVN_NO_ERROR;
- /* The the node revision skels for these two nodes. */
+ /* The node revision skels for these two nodes. */
SVN_ERR(svn_fs_bdb__get_node_revision(&noderev1, node1->fs, node1->id,
trail, pool));
SVN_ERR(svn_fs_bdb__get_node_revision(&noderev2, node2->fs, node2->id,
Modified: subversion/trunk/subversion/libsvn_fs_base/uuid.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/uuid.h?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/uuid.h (original)
+++ subversion/trunk/subversion/libsvn_fs_base/uuid.h Fri Aug 3 16:36:46 2012
@@ -29,7 +29,7 @@ extern "C" {
-/* Set FS->UUID to the the value read from the database, allocated
+/* Set FS->UUID to the value read from the database, allocated
in FS->POOL. Use SCRATCH_POOL for temporary allocations. */
svn_error_t *svn_fs_base__populate_uuid(svn_fs_t *fs,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Fri Aug 3 16:36:46 2012
@@ -3429,7 +3429,7 @@ get_revprop_packname(svn_fs_t *fs,
const char *manifest_file_path;
int idx;
- /* read content of the the manifest file */
+ /* read content of the manifest file */
revprops->folder = path_revprops_pack_shard(fs, revprops->revision, pool);
manifest_file_path = svn_dirent_join(revprops->folder, PATH_MANIFEST, pool);
@@ -9799,7 +9799,7 @@ hotcopy_io_dir_file_copy(const char *src
}
/* Set *NAME_P to the UTF-8 representation of directory entry NAME.
- * NAME is in the the internal encoding used by APR; PARENT is in
+ * NAME is in the internal encoding used by APR; PARENT is in
* UTF-8 and in internal (not local) style.
*
* Use PARENT only for generating an error string if the conversion
Modified: subversion/trunk/subversion/libsvn_repos/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/repos.c?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/repos.c (original)
+++ subversion/trunk/subversion/libsvn_repos/repos.c Fri Aug 3 16:36:46 2012
@@ -1018,7 +1018,7 @@ create_conf(svn_repos_t *repos, apr_pool
"# password-db = passwd" NL
"### The authz-db option controls the location of the authorization" NL
"### rules for path-based access control. Unless you specify a path" NL
-"### starting with a /, the file's location is relative to the the" NL
+"### starting with a /, the file's location is relative to the" NL
"### directory containing this file. If you don't specify an" NL
"### authz-db, no path-based access control is done." NL
"### Uncomment the line below to use the default authorization file." NL
Modified: subversion/trunk/subversion/libsvn_subr/base64.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/base64.c?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/base64.c (original)
+++ subversion/trunk/subversion/libsvn_subr/base64.c Fri Aug 3 16:36:46 2012
@@ -36,7 +36,7 @@
#include "private/svn_string_private.h"
#include "private/svn_subr_private.h"
-/* When asked to format the the base64-encoded output as multiple lines,
+/* When asked to format the base64-encoded output as multiple lines,
we put this many chars in each line (plus one new line char) unless
we run out of data.
It is vital for some of the optimizations below that this value is
Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Fri Aug 3 16:36:46 2012
@@ -58,7 +58,7 @@
* The data buffer usage information is implicitly given by the directory
* entries. Every USED entry has a reference to the previous and the next
* used dictionary entry and this double-linked list is ordered by the
- * offsets of their item data within the the data buffer. So removing data,
+ * offsets of their item data within the data buffer. So removing data,
* for instance, is done simply by unlinking it from the chain, implicitly
* marking the entry as well as the data buffer section previously
* associated to it as unused.
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1369093&r1=1369092&r2=1369093&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Fri Aug 3 16:36:46 2012
@@ -2291,7 +2291,7 @@ svn_wc__db_global_relocate(svn_wc__db_t
the commit. It will become the BASE node's 'revnum' and 'changed_rev'
values in the BASE_NODE table.
- CHANGED_REVISION is the the new 'last changed' revision. If the node is
+ CHANGED_REVISION is the new 'last changed' revision. If the node is
modified its value is equivalent to NEW_REVISION, but in case of a
decendant of a copy/move it can be an older revision.