subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ne...@apache.org
Subject svn commit: r1169770 - in /subversion/trunk/subversion/libsvn_client: cmdline.c copy.c externals.c merge.c update.c
Date Mon, 12 Sep 2011 14:34:39 GMT
Author: neels
Date: Mon Sep 12 14:34:39 2011
New Revision: 1169770

URL: http://svn.apache.org/viewvc?rev=1169770&view=rev
Log:
Cosmetic.

* subversion/libsvn_client/cmdline.c
  (check_root_url_of_target): Whitespace & typo.

* subversion/libsvn_client/copy.c
  (try_copy): Comment, "move"->"copy", because in an implicit "if (! is_move)".

* subversion/libsvn_client/externals.c
  (handle_external_item_change): Indent.

* subversion/libsvn_client/merge.c
  (record_mergeinfo_for_dir_merge): Typo.

* subversion/libsvn_client/update.c
  (is_empty_wc): Typo.

Modified:
    subversion/trunk/subversion/libsvn_client/cmdline.c
    subversion/trunk/subversion/libsvn_client/copy.c
    subversion/trunk/subversion/libsvn_client/externals.c
    subversion/trunk/subversion/libsvn_client/merge.c
    subversion/trunk/subversion/libsvn_client/update.c

Modified: subversion/trunk/subversion/libsvn_client/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cmdline.c?rev=1169770&r1=1169769&r2=1169770&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cmdline.c (original)
+++ subversion/trunk/subversion/libsvn_client/cmdline.c Mon Sep 12 14:34:39 2011
@@ -114,8 +114,8 @@ check_root_url_of_target(const char **ro
   if (!svn_path_is_url(truepath))
     SVN_ERR(svn_dirent_get_absolute(&truepath, truepath, pool));
 
-  err =  svn_client__get_repos_root(&tmp_root_url, truepath,
-                                    ctx, pool, pool);
+  err = svn_client__get_repos_root(&tmp_root_url, truepath,
+                                   ctx, pool, pool);
 
   if (err)
     {
@@ -125,7 +125,7 @@ check_root_url_of_target(const char **ro
        *
        * If the target itself is a URL to a repository that does not exist,
        * that's fine, too. The callers will deal with this argument in an
-       * appropriate manter if it does not make any sense.
+       * appropriate manner if it does not make any sense.
        *
        * Also tolerate locally added targets ("bad revision" error).
        */

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1169770&r1=1169769&r2=1169770&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Mon Sep 12 14:34:39 2011
@@ -2161,9 +2161,9 @@ try_copy(const apr_array_header_t *sourc
     {
       if (!srcs_are_urls)
         {
-          /* If we are doing a wc->* move, but with an operational revision
+          /* If we are doing a wc->* copy, but with an operational revision
              other than the working copy revision, we are really doing a
-             repo->* move, because we're going to need to get the rev from the
+             repo->* copy, because we're going to need to get the rev from the
              repo. */
 
           svn_boolean_t need_repos_op_rev = FALSE;

Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1169770&r1=1169769&r2=1169770&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Mon Sep 12 14:34:39 2011
@@ -832,10 +832,10 @@ handle_external_item_change(const struct
      iterpool, since the hash table values outlive the iterpool and
      any pointers they have should also outlive the iterpool.  */
 
-   SVN_ERR(resolve_relative_external_url(&new_url,
-                                         new_item, eb->repos_root_url,
-                                         parent_dir_url,
-                                         scratch_pool, scratch_pool));
+  SVN_ERR(resolve_relative_external_url(&new_url,
+                                        new_item, eb->repos_root_url,
+                                        parent_dir_url,
+                                        scratch_pool, scratch_pool));
 
   /* If the external is being checked out, exported or updated,
      determine if the external is a file or directory. */

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1169770&r1=1169769&r2=1169770&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Sep 12 14:34:39 2011
@@ -7911,7 +7911,7 @@ record_mergeinfo_for_dir_merge(svn_merge
              were no copies in MERGE_SOURCE_PATH's history going back to
              RANGE->START then we know that
              MERGE_SOURCE_PATH:MERGED_RANGE->START exists too and the two
-             describe and unbroken line of history and thus
+             describe an unbroken line of history, and thus
              MERGE_SOURCE_PATH:MERGED_RANGE->START:
              MERGE_SOURCE_PATH:MERGED_RANGE->END is a valid description of
              the merge -- see normalize_merge_sources() and the global comment

Modified: subversion/trunk/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=1169770&r1=1169769&r2=1169770&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Mon Sep 12 14:34:39 2011
@@ -169,7 +169,7 @@ is_empty_wc(svn_boolean_t *clean_checkou
    This is typically either the same as LOCAL_ABSPATH, or the
    immediate parent of LOCAL_ABSPATH.
 
-   If NOTIFY_SUMMARY is set (and there's a notification hander in
+   If NOTIFY_SUMMARY is set (and there's a notification handler in
    CTX), transmit the final update summary upon successful
    completion of the update.
 */



Mime
View raw message