Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC45D774C for ; Fri, 16 Sep 2011 19:03:43 +0000 (UTC) Received: (qmail 46077 invoked by uid 500); 16 Sep 2011 19:03:43 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 46025 invoked by uid 500); 16 Sep 2011 19:03:43 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 46018 invoked by uid 99); 16 Sep 2011 19:03:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Sep 2011 19:03:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Sep 2011 19:03:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EC91F23888EA for ; Fri, 16 Sep 2011 19:03:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1171732 - in /subversion/trunk/subversion: include/svn_ra.h include/svn_wc.h libsvn_client/diff.c libsvn_client/log.c svn/propedit-cmd.c svnversion/main.c tests/cmdline/basic_tests.py tests/cmdline/lock_tests.py tests/cmdline/prop_tests.py Date: Fri, 16 Sep 2011 19:03:21 -0000 To: commits@subversion.apache.org From: cmpilato@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110916190321.EC91F23888EA@eris.apache.org> Author: cmpilato Date: Fri Sep 16 19:03:20 2011 New Revision: 1171732 URL: http://svn.apache.org/viewvc?rev=1171732&view=rev Log: grep -r -e "\ban URL" . \ | grep -v .po: | grep -v 'Binary file ' | grep -v /contrib/ \ | cut -d : -f 1 | uniq | xargs sed -i 's/\ban URL/a URL/' "Earl" was a distant ancestor of mine, not a uniform resource locator. Modified: subversion/trunk/subversion/include/svn_ra.h subversion/trunk/subversion/include/svn_wc.h subversion/trunk/subversion/libsvn_client/diff.c subversion/trunk/subversion/libsvn_client/log.c subversion/trunk/subversion/svn/propedit-cmd.c subversion/trunk/subversion/svnversion/main.c subversion/trunk/subversion/tests/cmdline/basic_tests.py subversion/trunk/subversion/tests/cmdline/lock_tests.py subversion/trunk/subversion/tests/cmdline/prop_tests.py Modified: subversion/trunk/subversion/include/svn_ra.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_ra.h?rev=1171732&r1=1171731&r2=1171732&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_ra.h (original) +++ subversion/trunk/subversion/include/svn_ra.h Fri Sep 16 19:03:20 2011 @@ -573,7 +573,7 @@ svn_ra_create_callbacks(svn_ra_callbacks /** * A repository access session. This object is used to perform requests - * to a repository, identified by an URL. + * to a repository, identified by a URL. * * @since New in 1.2. */ Modified: subversion/trunk/subversion/include/svn_wc.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1171732&r1=1171731&r2=1171732&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_wc.h (original) +++ subversion/trunk/subversion/include/svn_wc.h Fri Sep 16 19:03:20 2011 @@ -6999,7 +6999,7 @@ typedef svn_error_t *(*svn_wc_relocation * the @a root argument. * * If @a root is TRUE, then the implementation should make sure that @a url - * is the repository root. Else, it can be an URL inside the repository. + * is the repository root. Else, it can be a URL inside the repository. * * @deprecated Provided for backwards compatibility with the 1.4 API. */ Modified: subversion/trunk/subversion/libsvn_client/diff.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1171732&r1=1171731&r2=1171732&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/diff.c (original) +++ subversion/trunk/subversion/libsvn_client/diff.c Fri Sep 16 19:03:20 2011 @@ -1321,14 +1321,14 @@ static const svn_wc_diff_callbacks4_t di this knowledge has been grokked yet. There are five cases: - 1. path is not an URL and start_revision != end_revision - 2. path is not an URL and start_revision == end_revision - 3. path is an URL and start_revision != end_revision - 4. path is an URL and start_revision == end_revision - 5. path is not an URL and no revisions given + 1. path is not a URL and start_revision != end_revision + 2. path is not a URL and start_revision == end_revision + 3. path is a URL and start_revision != end_revision + 4. path is a URL and start_revision == end_revision + 5. path is not a URL and no revisions given With only one distinct revision the working copy provides the - other. When path is an URL there is no working copy. Thus + other. When path is a URL there is no working copy. Thus 1: compare repository versions for URL coresponding to working copy 2: compare working copy against repository version Modified: subversion/trunk/subversion/libsvn_client/log.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/log.c?rev=1171732&r1=1171731&r2=1171732&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/log.c (original) +++ subversion/trunk/subversion/libsvn_client/log.c Fri Sep 16 19:03:20 2011 @@ -330,7 +330,7 @@ svn_client_log5(const apr_array_header_t else if (range->start.kind == svn_opt_revision_unspecified) { /* Default to any specified peg revision. Otherwise, if the - * first target is an URL, then we default to HEAD:0. Lastly, + * first target is a URL, then we default to HEAD:0. Lastly, * the default is BASE:0 since WC@HEAD may not exist. */ if (peg_rev.kind == svn_opt_revision_unspecified) { Modified: subversion/trunk/subversion/svn/propedit-cmd.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/propedit-cmd.c?rev=1171732&r1=1171731&r2=1171732&view=diff ============================================================================== --- subversion/trunk/subversion/svn/propedit-cmd.c (original) +++ subversion/trunk/subversion/svn/propedit-cmd.c Fri Sep 16 19:03:20 2011 @@ -326,7 +326,7 @@ svn_cl__propedit(apr_getopt_t *os, return svn_error_trace(err); /* Print a message if we successfully committed or if it - was just a wc propset (but not if the user aborted an URL + was just a wc propset (but not if the user aborted a URL propedit). */ if (!svn_path_is_url(target)) SVN_ERR(svn_cmdline_printf( Modified: subversion/trunk/subversion/svnversion/main.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnversion/main.c?rev=1171732&r1=1171731&r2=1171732&view=diff ============================================================================== --- subversion/trunk/subversion/svnversion/main.c (original) +++ subversion/trunk/subversion/svnversion/main.c Fri Sep 16 19:03:20 2011 @@ -68,7 +68,7 @@ help(const apr_getopt_option_t *options, "\n" " The version number will be a single number if the working\n" " copy is single revision, unmodified, not switched and with\n" - " an URL that matches the TRAIL_URL argument. If the working\n" + " a URL that matches the TRAIL_URL argument. If the working\n" " copy is unusual the version number will be more complex:\n" "\n" " 4123:4168 mixed revision working copy\n" Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1171732&r1=1171731&r2=1171732&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Sep 16 19:03:20 2011 @@ -1182,7 +1182,7 @@ def basic_delete(sbox): 'rm', '--force', foo_path) verify_file_deleted("Failed to remove unversioned file foo", foo_path) - # At one stage deleting an URL dumped core + # At one stage deleting a URL dumped core iota_URL = sbox.repo_url + '/iota' svntest.actions.run_and_verify_svn(None, Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1171732&r1=1171731&r2=1171732&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Fri Sep 16 19:03:20 2011 @@ -1335,7 +1335,7 @@ def unlock_wrong_token(sbox): svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock', file_path) - # Steal the lock as the same author, but using an URL to keep the old token + # Steal the lock as the same author, but using a URL to keep the old token # in the WC. svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock', "--force", file_url) Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1171732&r1=1171731&r2=1171732&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Fri Sep 16 19:03:20 2011 @@ -1125,7 +1125,7 @@ def recursive_base_wc_ops(sbox): #---------------------------------------------------------------------- def url_props_ops(sbox): - "property operations on an URL" + "property operations on a URL" # Bootstrap sbox.build()