[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    
From:       blair () tigris ! org
Date:       2008-07-31 14:09:51
Message-ID: 200807311409.m6VE9p67007747 () svn2 ! sjc ! collab ! net
[Download RAW message or body]

Author: blair
Date: Thu Jul 31 07:09:51 2008
New Revision: 32341

Log:
On the file externals branch.

* branches/file-externals:
  Merge r32335 through r32340 from trunk.

Modified:
   branches/file-externals/   (props changed)
   branches/file-externals/notes/tree-conflicts/design-overview.txt   (props changed)
   branches/file-externals/subversion/libsvn_client/copy.c
   branches/file-externals/subversion/libsvn_wc/props.c
   branches/file-externals/www/faq.ja.html   (props changed)
   branches/file-externals/www/features.html   (props changed)
   branches/file-externals/www/getting.html   (props changed)
   branches/file-externals/www/mailing-lists.html   (props changed)
   branches/file-externals/www/svn_1.5_releasenotes.html   (props changed)
   branches/file-externals/www/tasks.html   (props changed)

Merged:
   /trunk:r32335-32340

Modified: branches/file-externals/subversion/libsvn_client/copy.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_client/copy.c?pathrev=32341&r1=32340&r2=32341
 ==============================================================================
--- branches/file-externals/subversion/libsvn_client/copy.c	Thu Jul 31 02:49:37 \
                2008	(r32340)
+++ branches/file-externals/subversion/libsvn_client/copy.c	Thu Jul 31 07:09:51 \
2008	(r32341) @@ -814,18 +814,18 @@ repos_to_repos_copy(svn_commit_info_t **
 
       if (dir) 
         {
-    	  SVN_ERR(svn_ra_check_path(ra_session, dir, SVN_INVALID_REVNUM, &kind,
-    			  iterpool));
+          SVN_ERR(svn_ra_check_path(ra_session, dir, SVN_INVALID_REVNUM, &kind,
+                                    iterpool));
 
-    	  while (kind == svn_node_none)
-    	  {
-    		  svn_pool_clear(iterpool);
-    		  APR_ARRAY_PUSH(new_dirs, const char *) = dir;
+          while (kind == svn_node_none)
+            {
+              svn_pool_clear(iterpool);
+              APR_ARRAY_PUSH(new_dirs, const char *) = dir;
 
-    		  svn_path_split(dir, &dir, NULL, pool);
-    		  SVN_ERR(svn_ra_check_path(ra_session, dir, SVN_INVALID_REVNUM,
+              svn_path_split(dir, &dir, NULL, pool);
+              SVN_ERR(svn_ra_check_path(ra_session, dir, SVN_INVALID_REVNUM,
                                         &kind, iterpool));
-    	  }
+            }
         }
     }
 
@@ -1497,7 +1497,7 @@ repos_to_wc_copy_single(svn_client__copy
       SVN_ERR(err);
     }
 
-    return SVN_NO_ERROR;
+  return SVN_NO_ERROR;
 }
 
 static svn_error_t *

Modified: branches/file-externals/subversion/libsvn_wc/props.c
URL: http://svn.collab.net/viewvc/svn/branches/file-externals/subversion/libsvn_wc/props.c?pathrev=32341&r1=32340&r2=32341
 ==============================================================================
--- branches/file-externals/subversion/libsvn_wc/props.c	Thu Jul 31 02:49:37 \
                2008	(r32340)
+++ branches/file-externals/subversion/libsvn_wc/props.c	Thu Jul 31 07:09:51 \
2008	(r32341) @@ -344,11 +344,11 @@ svn_wc__load_props(apr_hash_t **base_pro
  * the WC item with which this file should be associated. */
 static svn_error_t *
 install_props_file(svn_stringbuf_t **log_accum,
-                             svn_wc_adm_access_t *adm_access,
-                             const char *path,
-                             apr_hash_t *props,
-                             svn_wc__props_kind_t wc_prop_kind,
-                             apr_pool_t *pool)
+                   svn_wc_adm_access_t *adm_access,
+                   const char *path,
+                   apr_hash_t *props,
+                   svn_wc__props_kind_t wc_prop_kind,
+                   apr_pool_t *pool)
 {
   svn_node_kind_t node_kind;
   const char *propfile_path;

---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org


[prev in list] [next in list] [prev in thread] [next in thread]