You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/11/29 20:28:23 UTC
svn commit: r1040237 - in /subversion/trunk/subversion:
bindings/javahl/native/JNIUtil.h include/svn_editor.h libsvn_subr/eol.c
svn/export-cmd.c svn/switch-cmd.c svn/update-cmd.c
tests/cmdline/merge_tests.py
Author: julianfoad
Date: Mon Nov 29 19:28:22 2010
New Revision: 1040237
URL: http://svn.apache.org/viewvc?rev=1040237&view=rev
Log:
In this revision a mass spelling correction OCCURRED.
* subversion/bindings/javahl/native/JNIUtil.h (JNIUtil),
subversion/include/svn_editor.h (svn_editor_t),
subversion/libsvn_subr/eol.c (svn_eol__detect_file_eol),
subversion/tests/cmdline/merge_tests.py (natural_history_filtering):
s/occured/occurred/ in comments.
* subversion/svn/export-cmd.c (svn_cl__export),
subversion/svn/switch-cmd.c (svn_cl__switch),
subversion/svn/update-cmd.c (svn_cl__update):
s/occured/occurred/ in an error message.
Modified:
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
subversion/trunk/subversion/include/svn_editor.h
subversion/trunk/subversion/libsvn_subr/eol.c
subversion/trunk/subversion/svn/export-cmd.c
subversion/trunk/subversion/svn/switch-cmd.c
subversion/trunk/subversion/svn/update-cmd.c
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h?rev=1040237&r1=1040236&r2=1040237&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.h Mon Nov 29 19:28:22 2010
@@ -179,7 +179,7 @@ class JNIUtil
static JNIMutex *g_logMutex;
/**
- * Flag, that an exception occured during our initialization.
+ * Flag, that an exception occurred during our initialization.
*/
static bool g_initException;
Modified: subversion/trunk/subversion/include/svn_editor.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_editor.h?rev=1040237&r1=1040236&r2=1040237&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_editor.h (original)
+++ subversion/trunk/subversion/include/svn_editor.h Mon Nov 29 19:28:22 2010
@@ -198,7 +198,7 @@ extern "C" {
*
* - @b Complete/Abort: The driver will end transmission by calling \n
* svn_editor_complete() if successful, or \n
- * svn_editor_abort() if an error or cancellation occured.
+ * svn_editor_abort() if an error or cancellation occurred.
* \n\n
*
* <h3>Driving Order Restrictions</h3>
Modified: subversion/trunk/subversion/libsvn_subr/eol.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/eol.c?rev=1040237&r1=1040236&r2=1040237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/eol.c (original)
+++ subversion/trunk/subversion/libsvn_subr/eol.c Mon Nov 29 19:28:22 2010
@@ -84,7 +84,7 @@ svn_eol__detect_file_eol(const char **eo
err = svn_io_file_read(file, buf, &nbytes, pool);
if (err)
{
- /* An error occured. We're going to return in any case,
+ /* An error occurred. We're going to return in any case,
* so reset the file cursor right now. */
pos = orig_pos;
SVN_ERR(svn_io_file_seek(file, APR_SET, &pos, pool));
Modified: subversion/trunk/subversion/svn/export-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/export-cmd.c?rev=1040237&r1=1040236&r2=1040237&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/export-cmd.c (original)
+++ subversion/trunk/subversion/svn/export-cmd.c Mon Nov 29 19:28:22 2010
@@ -114,7 +114,7 @@ svn_cl__export(apr_getopt_t *os,
if (nwb.had_externals_error)
return svn_error_create(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS, NULL,
- _("Failure occured processing one or more "
+ _("Failure occurred processing one or more "
"externals definitions"));
return svn_error_return(err);
Modified: subversion/trunk/subversion/svn/switch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/switch-cmd.c?rev=1040237&r1=1040236&r2=1040237&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/switch-cmd.c (original)
+++ subversion/trunk/subversion/svn/switch-cmd.c Mon Nov 29 19:28:22 2010
@@ -182,7 +182,7 @@ svn_cl__switch(apr_getopt_t *os,
if (nwb.had_externals_error)
return svn_error_create(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS, NULL,
- _("Failure occured processing one or more "
+ _("Failure occurred processing one or more "
"externals definitions"));
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/svn/update-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/update-cmd.c?rev=1040237&r1=1040236&r2=1040237&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/update-cmd.c (original)
+++ subversion/trunk/subversion/svn/update-cmd.c Mon Nov 29 19:28:22 2010
@@ -194,7 +194,7 @@ svn_cl__update(apr_getopt_t *os,
if (nwb.had_externals_error)
return svn_error_create(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS, NULL,
- _("Failure occured processing one or more "
+ _("Failure occurred processing one or more "
"externals definitions"));
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1040237&r1=1040236&r2=1040237&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Nov 29 19:28:22 2010
@@ -13340,7 +13340,7 @@ def natural_history_filtering(sbox):
#
# 7) Merge all available revisions from 'branch1' to 'branch2'.
# 'branch2' should have explicit merginfo for both 'branch1' *and* for
- # the revisions on 'trunk' which occured after 'branch2' was copied as
+ # the revisions on 'trunk' which occurred after 'branch2' was copied as
# these are not part of 'branch2's natural history.
sbox.build()