subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r920986 [1/2] - in /subversion/trunk: build/generator/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/javahl/src/org/tigris/subversion/javahl/ subversion/bindings/javahl/t...
Date Tue, 09 Mar 2010 17:13:31 GMT
Author: hwright
Date: Tue Mar  9 17:13:29 2010
New Revision: 920986

URL: http://svn.apache.org/viewvc?rev=920986&view=rev
Log:
Trailing whitespace scrub.

* subversion/libsvn_subr/prompt.c,
  subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java,
  subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java,
  subversion/bindings/javahl/native/CreateJ.cpp,
  subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java,
  subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java,
  subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java,
  subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java,
  subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java,
  subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c,
  subversion/bindings/swig/ruby/test/test_wc.rb,
  subversion/bindings/swig/ruby/svn/wc.rb,
  subversion/tests/libsvn_subr/mergeinfo-test.c,
  subversion/tests/cmdline/mergeinfo_tests.py,
  subversion/tests/cmdline/log_tests.py,
  subversion/tests/cmdline/upgrade_tests.py,
  subversion/tests/cmdline/lock_tests.py,
  subversion/tests/cmdline/switch_tests.py,
  subversion/tests/cmdline/merge_authz_tests.py,
  subversion/tests/cmdline/update_tests.py,
  subversion/tests/cmdline/svntest/actions.py,
  subversion/tests/cmdline/patch_tests.py,
  subversion/tests/cmdline/merge_tests.py,
  subversion/tests/cmdline/checkout_tests.py,
  subversion/tests/libsvn_fs_fs/fs-pack-test.c,
  subversion/libsvn_ra_svn/client.c,
  subversion/svn/cl.h,
  subversion/svn/notify.c,
  subversion/include/svn_io.h,
  subversion/include/svn_wc.h,
  subversion/include/private/svn_wc_private.h,
  subversion/libsvn_wc/util.c,
  subversion/libsvn_wc/adm_ops.c,
  subversion/libsvn_wc/status.c,
  subversion/libsvn_wc/update_editor.c,
  subversion/libsvn_wc/wc_db.c,
  subversion/libsvn_wc/wc_db.h,
  subversion/libsvn_wc/upgrade.c,
  subversion/libsvn_wc/workqueue.c,
  subversion/libsvn_client/switch.c,
  subversion/libsvn_client/externals.c,
  subversion/libsvn_client/merge.c,
  subversion/libsvn_client/patch.c,
  subversion/libsvn_client/revert.c,
  subversion/libsvn_client/copy.c,
  subversion/libsvn_client/mergeinfo.c,
  subversion/libsvn_client/update.c,
  subversion/libsvn_client/commit_util.c,
  subversion/libsvn_client/cleanup.c,
  subversion/libsvn_ra_neon/ra_neon.h,
  subversion/libsvn_repos/load.c,
  subversion/libsvn_fs_fs/fs_fs.c,
  subversion/libsvn_fs_fs/fs.h,
  build/generator/gen_vcnet_vcproj.py,
  build/generator/gen_win.py:
    Scrub trailing whitespace.

Modified:
    subversion/trunk/build/generator/gen_vcnet_vcproj.py
    subversion/trunk/build/generator/gen_win.py
    subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
    subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
    subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
    subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
    subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
    subversion/trunk/subversion/bindings/swig/ruby/svn/wc.rb
    subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb
    subversion/trunk/subversion/include/private/svn_wc_private.h
    subversion/trunk/subversion/include/svn_io.h
    subversion/trunk/subversion/include/svn_wc.h
    subversion/trunk/subversion/libsvn_client/cleanup.c
    subversion/trunk/subversion/libsvn_client/commit_util.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/mergeinfo.c
    subversion/trunk/subversion/libsvn_client/patch.c
    subversion/trunk/subversion/libsvn_client/revert.c
    subversion/trunk/subversion/libsvn_client/switch.c
    subversion/trunk/subversion/libsvn_client/update.c
    subversion/trunk/subversion/libsvn_fs_fs/fs.h
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
    subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h
    subversion/trunk/subversion/libsvn_ra_svn/client.c
    subversion/trunk/subversion/libsvn_repos/load.c
    subversion/trunk/subversion/libsvn_subr/prompt.c
    subversion/trunk/subversion/libsvn_wc/adm_ops.c
    subversion/trunk/subversion/libsvn_wc/status.c
    subversion/trunk/subversion/libsvn_wc/update_editor.c
    subversion/trunk/subversion/libsvn_wc/upgrade.c
    subversion/trunk/subversion/libsvn_wc/util.c
    subversion/trunk/subversion/libsvn_wc/wc_db.c
    subversion/trunk/subversion/libsvn_wc/wc_db.h
    subversion/trunk/subversion/libsvn_wc/workqueue.c
    subversion/trunk/subversion/svn/cl.h
    subversion/trunk/subversion/svn/notify.c
    subversion/trunk/subversion/tests/cmdline/checkout_tests.py
    subversion/trunk/subversion/tests/cmdline/lock_tests.py
    subversion/trunk/subversion/tests/cmdline/log_tests.py
    subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
    subversion/trunk/subversion/tests/cmdline/merge_tests.py
    subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
    subversion/trunk/subversion/tests/cmdline/patch_tests.py
    subversion/trunk/subversion/tests/cmdline/svntest/actions.py
    subversion/trunk/subversion/tests/cmdline/switch_tests.py
    subversion/trunk/subversion/tests/cmdline/update_tests.py
    subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
    subversion/trunk/subversion/tests/libsvn_fs_fs/fs-pack-test.c
    subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c

Modified: subversion/trunk/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_vcnet_vcproj.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/trunk/build/generator/gen_vcnet_vcproj.py Tue Mar  9 17:13:29 2010
@@ -141,7 +141,7 @@ class Generator(gen_win.WinGeneratorBase
 
     # apr doesn't supply vcproj files, the user must convert them
     # manually before loading the generated solution
-    self.move_proj_file(os.path.join('build', 'win32'), 
+    self.move_proj_file(os.path.join('build', 'win32'),
                         'svn_config' + self.vcproj_extension,
                           (
                             ('sql', sql),
@@ -180,7 +180,7 @@ class Generator(gen_win.WinGeneratorBase
     for target in install_targets:
       fname = self.get_external_project(target, self.vcproj_extension[1:])
       if fname is None:
-        fname = os.path.join(self.projfilesdir, "%s%s" % 
+        fname = os.path.join(self.projfilesdir, "%s%s" %
                              (target.proj_name, self.vcproj_extension))
       target.fname = fname
 

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Tue Mar  9 17:13:29 2010
@@ -395,7 +395,7 @@ class WinGeneratorBase(GeneratorBase):
           else:
             dll_targets.append(self.create_dll_target(target))
     install_targets.extend(dll_targets)
-    
+
     for target in install_targets:
       target.project_guid = self.makeguid(target.name)
 

Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Tue Mar  9 17:13:29 2010
@@ -419,7 +419,7 @@ CreateJ::StringSet(apr_array_header_t *s
       jstring jstr = JNIUtil::makeJString(str);
       if (JNIUtil::isJavaExceptionThrown())
         return NULL;
-      
+
       jstrs.push_back(jstr);
     }
 

Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java Tue Mar  9 17:13:29 2010
@@ -36,12 +36,12 @@ public class NativeResources
      * @return Version information about the underlying native libraries.
      */
     private static Version version;
-    
+
     /**
      * Returns version information about the underlying native libraries.
-     * 
+     *
      * @return version
-     * 
+     *
      */
     public static Version getVersion() {
         return version;

Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Tue Mar  9 17:13:29 2010
@@ -500,7 +500,7 @@ public class SVNClient implements ISVNCl
                     changelists == null ? null :
                       changelists.toArray(new String[changelists.size()]),
                     ignoreAncestry, noDiffDeleted, force, copiesAsAdds);
-                
+
     }
 
     private native void diff(String target1, Revision revision1, String target2,
@@ -879,7 +879,7 @@ public class SVNClient implements ISVNCl
                       Collection<String> changelists, InfoCallback callback)
             throws ClientException
     {
-        this.info2(pathOrUrl, revision, pegRevision, depth, 
+        this.info2(pathOrUrl, revision, pegRevision, depth,
                    changelists == null ? null :
                      changelists.toArray(new String[changelists.size()]),
                    callback);

Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java Tue Mar  9 17:13:29 2010
@@ -269,7 +269,7 @@ public class Info2 implements java.io.Se
              aInfo.getConflictWrk(), aInfo.getPrejfile(),
              aInfo.getChangelistName(), aInfo.getWorkingSize(),
              aInfo.getReposSize(), aInfo.getDepth(),
-             aInfo.getConflictDescriptor() == null ? null 
+             aInfo.getConflictDescriptor() == null ? null
                 : new ConflictDescriptor(aInfo.getConflictDescriptor()));
     }
 

Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java Tue Mar  9 17:13:29 2010
@@ -426,7 +426,7 @@ public class SVNAdmin
                        Revision start, Revision end)
             throws ClientException
     {
-        try 
+        try
         {
             aSVNAdmin.verify(path, messageOut,
                              start == null ? null : start.toApache(),
@@ -452,7 +452,7 @@ public class SVNAdmin
             Set<org.apache.subversion.javahl.Lock> aLocks =
                                                     aSVNAdmin.lslocks(path);
             Lock[] locks = new Lock[aLocks.size()];
-            
+
             int i = 0;
             for (org.apache.subversion.javahl.Lock lock : aLocks)
             {

Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Tue Mar  9 17:13:29 2010
@@ -477,7 +477,7 @@ public class SVNClient implements SVNCli
                 Map<String, String> oldRevprops =
                                                 new HashMap<String, String>();
                 ChangePath[] changedPaths;
-                
+
                 if (aChangedPaths != null)
                 {
                     changedPaths = new ChangePath[aChangedPaths.size()];
@@ -508,7 +508,7 @@ public class SVNClient implements SVNCli
 
         try
         {
-            List<org.apache.subversion.javahl.RevisionRange> aRevisions = 
+            List<org.apache.subversion.javahl.RevisionRange> aRevisions =
               new ArrayList<org.apache.subversion.javahl.RevisionRange>(revisionRanges.length);
 
             for (RevisionRange range : revisionRanges)
@@ -1274,7 +1274,7 @@ public class SVNClient implements SVNCli
     {
         try
         {
-            List<org.apache.subversion.javahl.RevisionRange> aRevisions = 
+            List<org.apache.subversion.javahl.RevisionRange> aRevisions =
               new ArrayList<org.apache.subversion.javahl.RevisionRange>(revisions.length);
 
             for (RevisionRange range : revisions )
@@ -1320,7 +1320,7 @@ public class SVNClient implements SVNCli
     {
         try
         {
-            org.apache.subversion.javahl.Mergeinfo aMergeinfo = 
+            org.apache.subversion.javahl.Mergeinfo aMergeinfo =
                          aSVNClient.getMergeinfo(path,
                          pegRevision == null ? null : pegRevision.toApache());
 

Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Tue Mar  9 17:13:29 2010
@@ -42,7 +42,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.Map;
 import java.text.DateFormat;
-import java.text.SimpleDateFormat; 
+import java.text.SimpleDateFormat;
 
 
 /**
@@ -2355,7 +2355,7 @@ public class BasicTests extends SVNTests
     private long[] getMergeinfoRevisions(int kind, String pathOrUrl,
                                          Revision pegRevision,
                                          String mergeSourceUrl,
-                                         Revision srcPegRevision) 
+                                         Revision srcPegRevision)
         throws SubversionException
     {
         class Callback implements LogMessageCallback {
@@ -3629,7 +3629,7 @@ public class BasicTests extends SVNTests
         {
             return propMap.get(path);
         }
-    } 
+    }
 
     private class MyStatusCallback implements StatusCallback
     {
@@ -4103,5 +4103,5 @@ public class BasicTests extends SVNTests
                 sb.append(val);
             }
         }
-    }    
+    }
 }

Modified: subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java Tue Mar  9 17:13:29 2010
@@ -2247,7 +2247,7 @@ public class BasicTests extends SVNTests
     private long[] getMergeinfoRevisions(int kind, String pathOrUrl,
                                          Revision pegRevision,
                                          String mergeSourceUrl,
-                                         Revision srcPegRevision) 
+                                         Revision srcPegRevision)
         throws SubversionException
     {
         class Callback implements LogMessageCallback {

Modified: subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original)
+++ subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Tue Mar  9 17:13:29 2010
@@ -1145,7 +1145,7 @@ svn_swig_py_unwrap_string(PyObject *sour
 {
     const char **ptr_dest = destination;
     *ptr_dest = PyString_AsString(source);
-    
+
     if (*ptr_dest != NULL)
         return 0;
     else
@@ -1238,7 +1238,7 @@ svn_swig_py_seq_to_array(PyObject *seq,
 
         if (o == NULL)
             return NULL;
-        
+
         elt_ptr = apr_array_push(temp);
         status = unwrap_func(o, elt_ptr, unwrap_baton);
         Py_DECREF(o);

Modified: subversion/trunk/subversion/bindings/swig/ruby/svn/wc.rb
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/svn/wc.rb?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/svn/wc.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/svn/wc.rb Tue Mar  9 17:13:29 2010
@@ -725,7 +725,7 @@ module Svn
           return context
         end
 
-        # Creates an new instance of Context for use in the block, the context 
+        # Creates an new instance of Context for use in the block, the context
         # is destroyed when the block completes.
         #
         # ==== arguments

Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_wc.rb Tue Mar  9 17:13:29 2010
@@ -1091,7 +1091,7 @@ EOE
 
   def test_context_create
     assert_nothing_raised do
-      result = Svn::Wc::Context.create do |context| 
+      result = Svn::Wc::Context.create do |context|
         assert_not_nil context
         assert_kind_of Svn::Wc::Context, context
       end

Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Tue Mar  9 17:13:29 2010
@@ -502,7 +502,7 @@ svn_wc__node_get_lock_token(const char *
  * @a anchor_abspath is NULL.  If @a anchor_abspath is not NULL then
  * recursively acquire write locks for the anchor of @a local_abspath
  * and return the anchor path in @a *anchor_abspath.  Use @a wc_ctx
- * for working copy access. 
+ * for working copy access.
  *
  * Returns @c SVN_ERR_WC_LOCKED an existing lock is encountered, but
  * may have set locks of it's own; it's not clear how the caller is
@@ -551,7 +551,7 @@ svn_wc__call_with_write_lock(svn_wc__wit
                              const char *local_abspath,
                              apr_pool_t *result_pool,
                              apr_pool_t *scratch_pool);
-                      
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/trunk/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_io.h?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_io.h (original)
+++ subversion/trunk/subversion/include/svn_io.h Tue Mar  9 17:13:29 2010
@@ -794,7 +794,7 @@ void
 svn_stream_set_reset(svn_stream_t *stream,
                      svn_io_reset_fn_t reset_fn);
 
-/** Set @a stream's mark function to @a mark_fn 
+/** Set @a stream's mark function to @a mark_fn
  *
  * @since New in 1.7.
  */
@@ -802,7 +802,7 @@ void
 svn_stream_set_mark(svn_stream_t *stream,
                     svn_io_mark_fn_t mark_fn);
 
-/** Set @a stream's seek function to @a seek_fn 
+/** Set @a stream's seek function to @a seek_fn
  *
  * @since New in 1.7.
  */

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Tue Mar  9 17:13:29 2010
@@ -1248,7 +1248,7 @@ typedef struct svn_wc_notify_t {
    * @since New in 1.7. */
   svn_linenum_t hunk_matched_line;
 
-  /* The fuzz factor the hunk was applied with. 
+  /* The fuzz factor the hunk was applied with.
    * @since New in 1.7 */
   int hunk_fuzz;
 

Modified: subversion/trunk/subversion/libsvn_client/cleanup.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cleanup.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_client/cleanup.c Tue Mar  9 17:13:29 2010
@@ -130,17 +130,17 @@ svn_client_upgrade(const char *path,
                          ctx->notify_func2, ctx->notify_baton2,
                          scratch_pool));
 
-  /* Now it's time to upgrade the externals too. We do it after the wc 
+  /* Now it's time to upgrade the externals too. We do it after the wc
      upgrade to avoid that errors in the externals causes the wc upgrade to
-     fail. Thanks to caching the performance penalty of walking the wc a 
+     fail. Thanks to caching the performance penalty of walking the wc a
      second time shouldn't be too severe */
-  SVN_ERR(svn_client_propget3(&externals, SVN_PROP_EXTERNALS, path, &rev, 
-                              &rev, NULL, svn_depth_infinity, NULL, ctx, 
+  SVN_ERR(svn_client_propget3(&externals, SVN_PROP_EXTERNALS, path, &rev,
+                              &rev, NULL, svn_depth_infinity, NULL, ctx,
                               scratch_pool));
 
   iterpool = svn_pool_create(scratch_pool);
 
-  for (hi = apr_hash_first(scratch_pool, externals); hi; 
+  for (hi = apr_hash_first(scratch_pool, externals); hi;
        hi = apr_hash_next(hi))
     {
       const char *key;
@@ -148,7 +148,7 @@ svn_client_upgrade(const char *path,
       apr_ssize_t klen;
       svn_string_t *external_desc;
       apr_array_header_t *externals_p;
-      
+
       svn_pool_clear(iterpool);
       externals_p = apr_array_make(iterpool, 1,
                                    sizeof(svn_wc_external_item2_t*));
@@ -157,8 +157,8 @@ svn_client_upgrade(const char *path,
 
       external_desc = apr_hash_get(externals, key, klen);
 
-      SVN_ERR(svn_wc_parse_externals_description3(&externals_p, 
-                                            svn_dirent_dirname(path, 
+      SVN_ERR(svn_wc_parse_externals_description3(&externals_p,
+                                            svn_dirent_dirname(path,
                                                                iterpool),
                                                   external_desc->data, TRUE,
                                                   iterpool));

Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Tue Mar  9 17:13:29 2010
@@ -197,7 +197,7 @@ add_lock_token(const char *local_abspath
   apr_pool_t *token_pool = apr_hash_pool_get(altb->lock_tokens);
   const char* lock_token;
   const char* url;
-  
+
   /* I want every lock-token I can get my dirty hands on!
      If this entry is switched, so what.  We will send an irrelevant lock
      token. */
@@ -206,7 +206,7 @@ add_lock_token(const char *local_abspath
   if (!lock_token)
     return SVN_NO_ERROR;
 
-  SVN_ERR(svn_wc__node_get_url(&url, altb->wc_ctx, local_abspath, 
+  SVN_ERR(svn_wc__node_get_url(&url, altb->wc_ctx, local_abspath,
                                token_pool, scratch_pool));
   if (url)
     apr_hash_set(altb->lock_tokens, url,

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Tue Mar  9 17:13:29 2010
@@ -124,7 +124,7 @@ calculate_target_mergeinfo(svn_ra_sessio
           /* Fetch any existing (explicit) mergeinfo.  We'll temporarily
              reparent to the target URL here, just to keep the code simple.
              We could, as an alternative, first see if the target URL was a
-             child of the session URL and use the relative "remainder", 
+             child of the session URL and use the relative "remainder",
              falling back to this reparenting as necessary.  */
           const char *old_session_url = NULL;
           SVN_ERR(svn_client__ensure_ra_session_url(&old_session_url,
@@ -689,9 +689,9 @@ find_absent_parents1(svn_ra_session_t *r
    found. Push each nonexistent URL onto the array NEW_DIRS,
    allocating in POOL.  Raise an error if the existing node is not a
    directory.
- 
+
    Set *TOP_DST_URL and the RA session's root to the existing node's URL.
-  
+
    ### Multiple requests for HEAD (SVN_INVALID_REVNUM) make this
    ### implementation susceptible to race conditions.  */
 static svn_error_t *
@@ -803,7 +803,7 @@ repos_to_repos_copy(svn_commit_info_t **
                                           pair->src, &pair->src_peg_revision,
                                           &pair->src_op_revision,
                                           &dead_end_rev, ctx, pool));
-     
+
       /* Go ahead and grab mergeinfo from the source, too. */
       SVN_ERR(svn_client__ensure_ra_session_url(&ignored_url, ra_session,
                                                 pair->src, pool));

Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Tue Mar  9 17:13:29 2010
@@ -400,7 +400,7 @@ switch_file_external(const char *path,
                                  anchor_abspath, subpool);
       if (err)
         goto cleanup;
-  
+
       if (text_conflicted || prop_conflicted || tree_conflicted)
         return svn_error_createf
           (SVN_ERR_WC_FOUND_CONFLICT, 0,
@@ -897,7 +897,7 @@ handle_external_item_change(const void *
 
       svn_error_t *err;
       const char *remove_target_abspath;
-      svn_boolean_t lock_existed; 
+      svn_boolean_t lock_existed;
 
       SVN_ERR(svn_dirent_get_absolute(&remove_target_abspath,
                                       path,
@@ -909,7 +909,7 @@ handle_external_item_change(const void *
       if (! lock_existed)
         {
           SVN_ERR(svn_wc__acquire_write_lock(NULL, ib->ctx->wc_ctx,
-                                             remove_target_abspath, 
+                                             remove_target_abspath,
                                              ib->iter_pool,
                                              ib->iter_pool));
         }
@@ -941,7 +941,7 @@ handle_external_item_change(const void *
       if (! lock_existed
           && (! err || err->apr_err == SVN_ERR_WC_LEFT_LOCAL_MOD))
         {
-          svn_error_t *err2 = svn_wc__release_write_lock(ib->ctx->wc_ctx, 
+          svn_error_t *err2 = svn_wc__release_write_lock(ib->ctx->wc_ctx,
                                                          remove_target_abspath,
                                                          ib->iter_pool);
           if (err2)
@@ -1163,13 +1163,13 @@ handle_externals_desc_change(const void 
   ib.pool              = cb->pool;
   ib.iter_pool         = svn_pool_create(cb->pool);
 
-  SVN_ERR(svn_dirent_get_absolute(&abs_parent_dir, ib.parent_dir, 
+  SVN_ERR(svn_dirent_get_absolute(&abs_parent_dir, ib.parent_dir,
                                   cb->pool));
 
-  err = svn_wc__node_get_url(&url, cb->ctx->wc_ctx, 
+  err = svn_wc__node_get_url(&url, cb->ctx->wc_ctx,
                              abs_parent_dir, cb->pool, cb->pool);
 
-  /* If we're doing an 'svn export' the current dir will not be a 
+  /* If we're doing an 'svn export' the current dir will not be a
      working copy. We can't get the parent_dir. */
   if (err)
     {
@@ -1190,7 +1190,7 @@ handle_externals_desc_change(const void 
                                                           cb->pool);
           svn_error_clear(err);
         }
-      else 
+      else
         return svn_error_return(err);
     }
   else

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Mar  9 17:13:29 2010
@@ -8647,7 +8647,7 @@ mergeinfo_in_catalog(svn_boolean_t *in_c
                                            scratch_pool, scratch_pool));
           SVN_ERR(svn_mergeinfo__equals(in_catalog, mergeinfo_in_cat,
                                         mergeinfo, TRUE, scratch_pool));
-        }    
+        }
     }
 
   return SVN_NO_ERROR;
@@ -8699,7 +8699,7 @@ log_find_operative_revs(void *baton,
       /* Easy out: The path is not within the tree of interest. */
       if (!svn_uri_is_ancestor(log_baton->target_abspath, path))
         continue;
-  
+
       rel_path = svn_uri_skip_ancestor(log_baton->target_abspath, path);
       source_rel_path = svn_relpath_join(log_baton->source_repos_rel_path,
                                          rel_path, pool);
@@ -8751,7 +8751,7 @@ log_find_operative_revs(void *baton,
             {
               SVN_ERR(svn_mergeinfo_merge(unmerged_for_key,
                                           log_entry_as_mergeinfo,
-                                          log_baton->result_pool)); 
+                                          log_baton->result_pool));
             }
           else
             {
@@ -8781,7 +8781,7 @@ log_find_operative_revs(void *baton,
    Using RA_SESSION, which is pointed at the repository root, check that all
    of the unmerged revisions in UNMERGED_CATALOG's mergeinfos are "phantoms",
    that is, one of the following conditions holds:
-   
+
      1) The revision effects no corresponding paths in SOURCE_REPOS_REL_PATH.
 
      2) The revision effects corresponding paths in SOURCE_REPOS_REL_PATH,
@@ -8828,11 +8828,11 @@ find_unsynced_ranges(const char *source_
             {
               apr_array_header_t *rangelist =
                 svn_apr_hash_index_val(hi_mergeinfo);
-              
+
               SVN_ERR(svn_rangelist_merge(&potentially_unmerged_ranges,
                                           rangelist, scratch_pool));
-            }  
-        }  
+            }
+        }
     }
 
   /* Find any unmerged revisions which both effect the source and

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Tue Mar  9 17:13:29 2010
@@ -1008,7 +1008,7 @@ get_mergeinfo(svn_mergeinfo_catalog_t *m
                                              result_pool, scratch_pool));
         }
 
-      
+
       if (peg_rev.kind == svn_opt_revision_date
           || peg_rev.kind == svn_opt_revision_head
           || peg_rev.kind == svn_opt_revision_previous
@@ -1311,7 +1311,7 @@ filter_log_entry_with_rangelist(void *ba
   this_rangelist = svn_rangelist__initialize(log_entry->revision - 1,
                                              log_entry->revision,
                                              TRUE, pool);
-  
+
   /* Don't consider inheritance yet, see if LOG_ENTRY->REVISION is
      fully or partially represented in BATON->RANGELIST. */
   SVN_ERR(svn_rangelist_intersect(&intersection, fleb->rangelist,

Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Tue Mar  9 17:13:29 2010
@@ -381,7 +381,7 @@ init_patch_target(patch_target_t **patch
 
       if (target->kind == svn_node_file)
         {
-          /* Open the file. */ 
+          /* Open the file. */
           SVN_ERR(svn_io_file_open(&target->file, target->abs_path,
                                    APR_READ | APR_BINARY | APR_BUFFERED,
                                    APR_OS_DEFAULT, result_pool));
@@ -688,7 +688,7 @@ scan_for_match(svn_linenum_t *matched_li
           for (i = 0; i < target->hunks->nelts; i++)
             {
               const hunk_info_t *hi;
-              
+
               hi = APR_ARRAY_IDX(target->hunks, i, const hunk_info_t *);
               taken = (! hi->rejected &&
                        target->current_line >= hi->matched_line &&
@@ -1091,7 +1091,7 @@ apply_one_patch(patch_target_t **patch_t
 
       /* Determine the line the hunk should be applied at.
        * If no match is found initially, try with fuzz. */
-      do 
+      do
         {
           SVN_ERR(get_hunk_info(&hi, target, hunk, fuzz,
                                 result_pool, iterpool));
@@ -1267,7 +1267,7 @@ install_patched_target(patch_target_t *t
                   /* The WC_DB doesn't know much about this node.
                    * Check what's on disk. */
                   svn_node_kind_t disk_kind;
- 
+
                   SVN_ERR(svn_io_check_path(abs_path, &disk_kind, iterpool));
                   if (disk_kind != svn_node_none)
                     {
@@ -1295,7 +1295,7 @@ install_patched_target(patch_target_t *t
                     {
                       if (ctx->notify_func2)
                         {
-                          /* Just do notification. */ 
+                          /* Just do notification. */
                           svn_wc_notify_t *notify;
                           notify = svn_wc_create_notify(abs_path,
                                                         svn_wc_notify_add,
@@ -1399,7 +1399,7 @@ apply_patches(void *baton,
   apr_array_header_t *targets;
   int i;
   apply_patches_baton_t *btn;
-  
+
   btn = (apply_patches_baton_t *)baton;
 
   /* Try to open the patch file. */

Modified: subversion/trunk/subversion/libsvn_client/revert.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/revert.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/revert.c (original)
+++ subversion/trunk/subversion/libsvn_client/revert.c Tue Mar  9 17:13:29 2010
@@ -50,7 +50,7 @@ struct revert_with_write_lock_baton {
 };
 
 /* (Note: All arguments are in the baton above.)
-  
+
    Attempt to revert LOCAL_ABSPATH.
 
    If DEPTH is svn_depth_empty, revert just the properties on the

Modified: subversion/trunk/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/switch.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/switch.c (original)
+++ subversion/trunk/subversion/libsvn_client/switch.c Tue Mar  9 17:13:29 2010
@@ -216,12 +216,12 @@ switch_internal(svn_revnum_t *result_rev
 
      We pass in an external_func for recording all externals. It
      shouldn't be needed for a switch if it wasn't for the relative
-     externals of type '../path'. All of those must be resolved to 
+     externals of type '../path'. All of those must be resolved to
      the new location.  */
   err = svn_wc_crawl_revisions5(ctx->wc_ctx, local_abspath, reporter,
                                 report_baton, TRUE, depth, (! depth_is_sticky),
                                 (! server_supports_depth),
-                                use_commit_times, 
+                                use_commit_times,
                                 svn_client__external_info_gatherer, &efb,
                                 ctx->notify_func2, ctx->notify_baton2, pool);
 

Modified: subversion/trunk/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Tue Mar  9 17:13:29 2010
@@ -222,7 +222,7 @@ update_internal(svn_revnum_t *result_rev
      the RA driver will call editor->set_target_revision later on. */
   SVN_ERR(svn_wc_get_update_editor4(&update_editor, &update_edit_baton,
                                     &revnum, ctx->wc_ctx, anchor_abspath,
-                                    target, use_commit_times, depth, 
+                                    target, use_commit_times, depth,
                                     depth_is_sticky, allow_unver_obstructions,
                                     diff3_cmd, preserved_exts,
                                     file_fetcher, ffb,
@@ -248,7 +248,7 @@ update_internal(svn_revnum_t *result_rev
   /* Drive the reporter structure, describing the revisions within
      PATH.  When we call reporter->finish_report, the
      update_editor will be driven by svn_repos_dir_delta2. */
-  err = svn_wc_crawl_revisions5(ctx->wc_ctx, local_abspath, reporter, 
+  err = svn_wc_crawl_revisions5(ctx->wc_ctx, local_abspath, reporter,
                                 report_baton, TRUE, depth, (! depth_is_sticky),
                                 (! server_supports_depth),
                                 use_commit_times,
@@ -271,7 +271,7 @@ update_internal(svn_revnum_t *result_rev
   if (SVN_DEPTH_IS_RECURSIVE(depth) && (! ignore_externals))
     {
       SVN_ERR(svn_client__handle_externals(efb.externals_old,
-                                           efb.externals_new, 
+                                           efb.externals_new,
                                            efb.ambient_depths,
                                            anchor_url, anchor,
                                            repos_root,

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.h?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.h Tue Mar  9 17:13:29 2010
@@ -59,8 +59,8 @@ extern "C" {
 #define PATH_LOCKS_DIR        "locks"            /* Directory of locks */
 #define PATH_MIN_UNPACKED_REV "min-unpacked-rev" /* Oldest revision which
                                                     has not been packed. */
-#define PATH_MIN_UNPACKED_REVPROP "min-unpacked-revprop" /* Oldest revision 
-                                                            property which has 
+#define PATH_MIN_UNPACKED_REVPROP "min-unpacked-revprop" /* Oldest revision
+                                                            property which has
                                                             not been packed. */
 #define PATH_REVPROPS_DB "revprops.db"
 /* If you change this, look at tests/svn_test_fs.c(maybe_install_fsfs_conf) */

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=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Tue Mar  9 17:13:29 2010
@@ -1182,7 +1182,7 @@ static svn_error_t *
 update_min_unpacked_revprop(svn_fs_t *fs, apr_pool_t *pool)
 {
   fs_fs_data_t *ffd = fs->fsap_data;
-  
+
   return read_min_unpacked_rev(&ffd->min_unpacked_revprop,
                                path_min_unpacked_revprop(fs, pool),
                                pool);
@@ -2685,7 +2685,7 @@ set_revision_proplist(svn_fs_t *fs,
 
   SVN_ERR(ensure_revision_exists(fs, rev, pool));
 
-  if (ffd->format < SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT || 
+  if (ffd->format < SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT ||
       rev >= ffd->min_unpacked_revprop)
     {
       const char *final_path = path_revprops(fs, rev, pool);
@@ -2727,9 +2727,9 @@ revision_proplist(apr_hash_t **proplist_
 {
   fs_fs_data_t *ffd = fs->fsap_data;
   apr_hash_t *proplist;
- 
+
   SVN_ERR(ensure_revision_exists(fs, rev, pool));
- 
+
   if (ffd->format < SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT ||
       rev >= ffd->min_unpacked_revprop)
     {
@@ -2737,7 +2737,7 @@ revision_proplist(apr_hash_t **proplist_
       svn_error_t *err = SVN_NO_ERROR;
       int i;
       apr_pool_t *iterpool;
- 
+
       proplist = apr_hash_make(pool);
       iterpool = svn_pool_create(pool);
       for (i = 0; i < RECOVERABLE_RETRY_COUNT; i++)
@@ -6354,7 +6354,7 @@ svn_fs_fs__create(svn_fs_t *fs,
                                                         PATH_REVPROPS_DIR,
                                                         pool),
                                         pool));
-  
+
   /* Create the revprops directory. */
   if (format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
     {
@@ -7423,20 +7423,20 @@ pack_revprop_shard(svn_fs_t *fs,
   svn_sqlite__stmt_t *stmt;
   svn_stream_t *tmp_stream;
   apr_pool_t *iterpool;
-  
+
   shard_path = svn_dirent_join(revprops_dir,
                                apr_psprintf(pool, "%" APR_INT64_T_FMT, shard),
                                pool);
-  
+
   /* Notify caller we're starting to pack this shard. */
   if (notify_func)
     SVN_ERR(notify_func(notify_baton, shard, svn_fs_pack_notify_start,
                         pool));
-  
+
   start_rev = (svn_revnum_t) (shard * max_files_per_dir);
   end_rev = (svn_revnum_t) ((shard + 1) * (max_files_per_dir) - 1);
   iterpool = svn_pool_create(pool);
-  
+
   /* Iterate over the revisions in this shard, squashing them together. */
   SVN_ERR(svn_sqlite__get_statement(&stmt, ffd->revprop_db, STMT_SET_REVPROP));
   for (rev = start_rev; rev <= end_rev; rev++)
@@ -7449,7 +7449,7 @@ pack_revprop_shard(svn_fs_t *fs,
       SVN_ERR(svn_sqlite__bind_properties(stmt, 2, proplist, pool));
       SVN_ERR(svn_sqlite__insert(NULL, stmt));
     }
-  
+
   /* Update the min-unpacked-rev file to reflect our newly packed shard.
    * (ffd->min_unpacked_rev will be updated by open_pack_or_rev_file().)
    */
@@ -7461,16 +7461,16 @@ pack_revprop_shard(svn_fs_t *fs,
   SVN_ERR(svn_stream_close(tmp_stream));
   SVN_ERR(move_into_place(tmp_path, final_path, final_path, iterpool));
   svn_pool_destroy(iterpool);
-  
+
   /* Finally, remove the existing shard directory. */
   SVN_ERR(svn_io_remove_dir2(shard_path, TRUE, cancel_func, cancel_baton,
                              pool));
-  
+
   /* Notify caller we're starting to pack this shard. */
   if (notify_func)
     SVN_ERR(notify_func(notify_baton, shard, svn_fs_pack_notify_end,
                         pool));
-  
+
   return SVN_NO_ERROR;
 }
 
@@ -7533,7 +7533,7 @@ pack_body(void *baton,
   completed_shards = (youngest + 1) / max_files_per_dir;
 
   /* See if we've already completed all possible shards thus far. */
-  if (min_unpacked_rev == (completed_shards * max_files_per_dir) && 
+  if (min_unpacked_rev == (completed_shards * max_files_per_dir) &&
       min_unpacked_revprop == (completed_shards * max_files_per_dir))
     return SVN_NO_ERROR;
 

Modified: subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/ra_neon.h Tue Mar  9 17:13:29 2010
@@ -1090,7 +1090,7 @@ svn_ra_neon__has_capability(svn_ra_sessi
    If the server is kind enough to tell us the current youngest
    revision of the target repository, set *YOUNGEST_REV to that value;
    set it to SVN_INVALID_REVNUM otherwise.
- 
+
   NOTE:  This function also expects the server to announce the
    activity collection.  */
 svn_error_t *

Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Tue Mar  9 17:13:29 2010
@@ -491,13 +491,13 @@ static svn_error_t *make_tunnel(const ch
    * the different opinions on this issue.
    *
    * On Win32, APR does not support KILL_ONLY_ONCE. It only has
-   * KILL_ALWAYS and KILL_NEVER. Other modes are converted to 
+   * KILL_ALWAYS and KILL_NEVER. Other modes are converted to
    * KILL_ALWAYS, which immediately calls TerminateProcess().
    * This instantly kills the tunnel, leaving sshd and svnserve
    * on a remote machine running indefinitely. These processes
    * accumulate. The problem is most often seen with a fast client
    * machine and a modest internet connection, as the tunnel
-   * is killed before being able to gracefully complete the 
+   * is killed before being able to gracefully complete the
    * session. In that case, svn is unusable 100% of the time on
    * the windows machine. Thus, on Win32, we use KILL_NEVER and
    * take the lesser of two evils.

Modified: subversion/trunk/subversion/libsvn_repos/load.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/load.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/load.c (original)
+++ subversion/trunk/subversion/libsvn_repos/load.c Tue Mar  9 17:13:29 2010
@@ -243,7 +243,7 @@ prefix_mergeinfo_paths(svn_string_t **me
       /* The svn:mergeinfo property syntax demands absolute repository
          paths, so prepend a leading slash if PARENT_DIR lacks one.  */
       if (*parent_dir != '/')
-        path = svn_path_join_many(pool, "/", parent_dir, 
+        path = svn_path_join_many(pool, "/", parent_dir,
                                   merge_source + 1, NULL);
       else
         path = svn_path_join(parent_dir, merge_source + 1, pool);

Modified: subversion/trunk/subversion/libsvn_subr/prompt.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/prompt.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/prompt.c (original)
+++ subversion/trunk/subversion/libsvn_subr/prompt.c Tue Mar  9 17:13:29 2010
@@ -71,7 +71,7 @@ static apr_status_t wait_for_input(apr_f
    * ourselves here.
    */
   return APR_ENOTIMPL;
-#endif  
+#endif
 }
 
 /* Set @a *result to the result of prompting the user with @a

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Mar  9 17:13:29 2010
@@ -1182,7 +1182,7 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
 
       /* ### The following two operations should be inside one SqLite
              transaction. For even better behavior the tree operation
-             before this block needs the same handling. 
+             before this block needs the same handling.
              Luckily most of this is for free once properties and pristine
              are handled in the WC-NG way. */
       SVN_ERR(svn_wc__db_temp_op_delete(wc_ctx->db, local_abspath, pool));

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Tue Mar  9 17:13:29 2010
@@ -2389,7 +2389,7 @@ internal_status(svn_wc_status2_t **statu
 
       if (hidden)
         entry = NULL;
-    }  
+    }
 
   if (entry && !svn_dirent_is_root(local_abspath, strlen(local_abspath)))
     {

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Mar  9 17:13:29 2010
@@ -203,7 +203,7 @@ struct edit_baton
      that the edit was completed successfully. */
   svn_boolean_t close_edit_complete;
 
-  /* If this is a 'switch' operation, the new relpath of target_abspath, 
+  /* If this is a 'switch' operation, the new relpath of target_abspath,
      else NULL. */
   const char *switch_relpath;
 
@@ -1590,7 +1590,7 @@ tree_has_local_mods(svn_boolean_t *modif
  *
  * THEIR_RELPATH is the involved node's repository relative path on the
  * source-right side, the side that the target should become after the
- * update. Simply put, that's the URL obtained from the node's 
+ * update. Simply put, that's the URL obtained from the node's
  * dir_baton->new_relpath or file_baton->new_relpath (but it's more
  * complex for a delete).
  *
@@ -1791,8 +1791,8 @@ check_tree_conflict(svn_wc_conflict_desc
     svn_node_kind_t conflict_node_kind;
     svn_wc_conflict_version_t *src_left_version;
     svn_wc_conflict_version_t *src_right_version;
-    
-    /* Get the source-left information, i.e. the local state of the node 
+
+    /* Get the source-left information, i.e. the local state of the node
      * before any changes were made to the working copy, i.e. the state the
      * node would have if it was reverted. */
     if (reason == svn_wc_conflict_reason_added)
@@ -1919,7 +1919,7 @@ check_tree_conflict(svn_wc_conflict_desc
                                                         left_revision,
                                                         left_kind,
                                                         pool);
-    
+
     src_right_version = svn_wc_conflict_version_create(repos_root_url,
                                                        right_repos_relpath,
                                                        *eb->target_revision,
@@ -4623,7 +4623,7 @@ merge_props(svn_stringbuf_t *log_accum,
 /* Append to LOG_ACCUM, log commands to update the entry for LOCAL_ABSPATH
    with a NEW_REVISION and a NEW_RELPATH(if non-NULL), making sure
    the entry refers to a file and has no absent or deleted state.
-   Use POOL for temporary allocations. 
+   Use POOL for temporary allocations.
 
    ### REPOS_ROOT must be the current repository root while still using
        entries here */
@@ -5244,7 +5244,7 @@ close_file(void *file_baton,
                    be removed soon anyway.
 
          ### HACK: The loggy stuff checked the preconditions for us,
-                   we just make the property code happy here. 
+                   we just make the property code happy here.
 
          We can also clear entry.deleted here, as we are adding a new
          BASE_NODE anyway */

Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Mar  9 17:13:29 2010
@@ -1060,7 +1060,7 @@ svn_wc__upgrade_sdb(int *result_format,
                                              (void *)wcroot_abspath,
                                              scratch_pool));
 
-        /* If the transaction succeeded, then we don't need the wcprops        
+        /* If the transaction succeeded, then we don't need the wcprops
            files. We stopped writing them partway through format 12, but
            we may be upgrading from an "early 12" and need to toss those
            files. We aren't going to migrate them because it is *also*

Modified: subversion/trunk/subversion/libsvn_wc/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/util.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/util.c Tue Mar  9 17:13:29 2010
@@ -460,8 +460,8 @@ svn_wc__cd2_to_cd(const svn_wc_conflict_
 
       case svn_wc_conflict_kind_text:
         new_conflict->is_binary = conflict->is_binary;
-        new_conflict->mime_type = conflict->mime_type 
-                              ? apr_pstrdup(result_pool, conflict->mime_type) 
+        new_conflict->mime_type = conflict->mime_type
+                              ? apr_pstrdup(result_pool, conflict->mime_type)
                               : NULL;
         new_conflict->base_file = apr_pstrdup(result_pool,
                                               conflict->base_file);
@@ -469,9 +469,9 @@ svn_wc__cd2_to_cd(const svn_wc_conflict_
                                                conflict->their_file);
         new_conflict->my_file = apr_pstrdup(result_pool,
                                             conflict->my_file);
-        new_conflict->merged_file = conflict->merged_file 
+        new_conflict->merged_file = conflict->merged_file
                                     ? apr_pstrdup(result_pool,
-                                                  conflict->merged_file) 
+                                                  conflict->merged_file)
                                     : NULL;
         break;
 
@@ -521,8 +521,8 @@ svn_wc__cd_to_cd2(const svn_wc_conflict_
 
       case svn_wc_conflict_kind_text:
         new_conflict->is_binary = conflict->is_binary;
-        new_conflict->mime_type = conflict->mime_type 
-                              ? apr_pstrdup(result_pool, conflict->mime_type) 
+        new_conflict->mime_type = conflict->mime_type
+                              ? apr_pstrdup(result_pool, conflict->mime_type)
                               : NULL;
         new_conflict->base_file = apr_pstrdup(result_pool,
                                               conflict->base_file);
@@ -530,9 +530,9 @@ svn_wc__cd_to_cd2(const svn_wc_conflict_
                                                conflict->their_file);
         new_conflict->my_file = apr_pstrdup(result_pool,
                                             conflict->my_file);
-        new_conflict->merged_file = conflict->merged_file 
+        new_conflict->merged_file = conflict->merged_file
                                     ? apr_pstrdup(result_pool,
-                                                  conflict->merged_file) 
+                                                  conflict->merged_file)
                                     : NULL;
         break;
 

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Mar  9 17:13:29 2010
@@ -553,7 +553,7 @@ fetch_repos_info(const char **repos_root
 
 /* Scan from LOCAL_RELPATH upwards through parent nodes until we find a parent
    that has values in the 'repos_id' and 'repos_relpath' columns.  Return
-   that information in REPOS_ID and REPOS_RELPATH (either may be NULL). 
+   that information in REPOS_ID and REPOS_RELPATH (either may be NULL).
    Use LOCAL_ABSPATH for diagnostics */
 static svn_error_t *
 scan_upwards_for_repos(apr_int64_t *repos_id,

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Tue Mar  9 17:13:29 2010
@@ -827,7 +827,7 @@ svn_wc__db_pristine_get_tempdir(const ch
    ### This is used for files where we don't know the checksum ahead of
    ### time, so we drop it into a temp area first, computing the checksum
    ### as we write it there.
-   
+
    ### the md5_checksum parameter is temporary. */
 svn_error_t *
 svn_wc__db_pristine_install(svn_wc__db_t *db,

Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Mar  9 17:13:29 2010
@@ -719,7 +719,7 @@ run_remove_revert_files(svn_wc__db_t *db
   const char *local_abspath;
   const char *revert_file;
   svn_node_kind_t kind;
-  
+
   /* We need a NUL-terminated path, so copy it out of the skel.  */
   local_abspath = apr_pstrmemdup(scratch_pool, arg1->data, arg1->len);
 
@@ -1792,7 +1792,7 @@ run_delete(svn_wc__db_t *db,
                                 svn_wc__props_base, scratch_pool));
       SVN_ERR(svn_wc__prop_path(&props_working, local_abspath, kind,
                                 svn_wc__props_working, scratch_pool));
-      
+
       err = svn_io_remove_file2(props_base, TRUE, scratch_pool);
       if (err && !APR_STATUS_IS_ENOENT(err->apr_err))
         return svn_error_quick_wrap(err, _("Can't move source to dest"));

Modified: subversion/trunk/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Tue Mar  9 17:13:29 2010
@@ -381,7 +381,7 @@ svn_cl__time_cstring_to_human_cstring(co
 
    When DETAILED is set, and REPOS_LOCKS is set, treat missing repository locks
    as broken WC locks.
-   
+
    Increment *TEXT_CONFLICTS, *PROP_CONFLICTS, or *TREE_CONFLICTS if
    a conflict was encountered.
    */
@@ -725,8 +725,8 @@ svn_cl__node_description(const svn_wc_co
  * if BASE is an uri, dirent or relative.
  */
 const char *
-svn_cl__path_join(const char *base, 
-                  const char *component, 
+svn_cl__path_join(const char *base,
+                  const char *component,
                   apr_pool_t *pool);
 
 #ifdef __cplusplus

Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Tue Mar  9 17:13:29 2010
@@ -319,7 +319,7 @@ notify(void *baton, const svn_wc_notify_
                                             minus, off, n->hunk_fuzz)))
                 goto print_error;
             }
-          else 
+          else
             {
               s = _(">         applied hunk @@ -%lu,%lu +%lu,%lu @@ "
                     "with offset %s");
@@ -337,7 +337,7 @@ notify(void *baton, const svn_wc_notify_
         }
       else if (n->hunk_fuzz)
         {
-          if ((err = svn_cmdline_printf(pool, 
+          if ((err = svn_cmdline_printf(pool,
                           _(">         applied hunk @@ -%lu,%lu +%lu,%lu @@ "
                                         "with fuzz %d\n"),
                                         n->hunk_original_start,
@@ -692,7 +692,7 @@ notify(void *baton, const svn_wc_notify_
                pool,
                _("--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n"),
                n->merge_range->start, n->merge_range->end + 1, path_local);
- 
+
       if (err)
         goto print_error;
         }

Modified: subversion/trunk/subversion/tests/cmdline/checkout_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/checkout_tests.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/checkout_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/checkout_tests.py Tue Mar  9 17:13:29 2010
@@ -864,7 +864,7 @@ def checkout_wc_from_drive(sbox):
   drive = find_the_next_available_drive_letter()
   if drive is None:
     raise svntest.Skip
-    
+
   subprocess.call(['subst', drive +':', sbox.repo_dir])
   repo_url = 'file:///' + drive + ':/'
   wc_dir = sbox.wc_dir

Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Tue Mar  9 17:13:29 2010
@@ -1451,7 +1451,7 @@ def lock_path_not_in_head(sbox):
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'delete', lambda_path, D_path)
   svntest.actions.run_and_verify_svn(None, None, [], 'commit',
-                                     '-m', 'Some deletions', wc_dir)  
+                                     '-m', 'Some deletions', wc_dir)
   svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r1', wc_dir)
   expected_lock_fail_err_re = "svn: warning:.*" \
   "((Path .* doesn't exist in HEAD revision)" \

Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Tue Mar  9 17:13:29 2010
@@ -1689,7 +1689,7 @@ def log_of_local_copy(sbox):
                                      C_path, C_moved_path)
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
                                      psi_path, psi_moved_path)
-  
+
   # Get the logs for the move destinations.
   #
   # This was failing with:

Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Tue Mar  9 17:13:29 2010
@@ -388,7 +388,7 @@ def mergeinfo_and_skipped_paths(sbox):
   svntest.actions.run_and_verify_merge(A_COPY_2_H_path, '4', '5',
                                        sbox.repo_url + '/A/D/H', None,
                                        expected_output,
-                                       None, # expected_mergeinfo_output, 
+                                       None, # expected_mergeinfo_output,
                                        expected_elision_output,
                                        expected_disk,
                                        expected_status,

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Mar  9 17:13:29 2010
@@ -3011,7 +3011,7 @@ def merge_dir_and_file_replace(sbox):
     'A/C/foo'                : Item(verb='Replacing'),
     'A/C/foo/bar'            : Item(verb='Adding'),
     })
-  
+
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.add({
     'A/B/F/foo'                : Item(status='  ', wc_rev=5),
@@ -7838,7 +7838,7 @@ def merge_away_subtrees_noninheritable_r
     'mu' : Item(status=' G'),
     })
   expected_elision_output = wc.State('.', {
-    })    
+    })
   expected_status = wc.State('.', {
     ''          : Item(status=' M'),
     'B'         : Item(status='  '),
@@ -10746,7 +10746,7 @@ def reintegrate_with_rename(sbox):
     'D/G/tauprime' : Item(status=' G'),
     })
   expected_elision_output = wc.State(A_path, {
-    })    
+    })
   k_expected_status = wc.State(A_path, {
     "B"            : Item(status='  ', wc_rev=9),
     "B/lambda"     : Item(status='  ', wc_rev=9),
@@ -12378,7 +12378,7 @@ def merge_chokes_on_renamed_subtrees(sbo
   # svn: svn: File not found: revision 3, path '/A/D/H/psi'
   svntest.actions.run_and_verify_svn(
     None,
-    expected_merge_output([[5,6],[3,6]], 
+    expected_merge_output([[5,6],[3,6]],
                           ['U    ' + psi_COPY_moved_path + '\n',
                            ' U   ' + psi_COPY_moved_path + '\n',
                            ' G   ' + psi_COPY_moved_path + '\n',],
@@ -13227,7 +13227,7 @@ def subtree_source_missing_in_requested_
     ''          : Item(status=' U'),
     'D/H/psi'   : Item(status=' U'),
     'D/H/omega' : Item(status=' U'),
-    })    
+    })
   expected_status = wc.State(A_COPY_path, {
     ''          : Item(status=' M', wc_rev=13),
     'B'         : Item(status='  ', wc_rev=13),
@@ -18447,7 +18447,7 @@ def merge_into_wc_for_deleted_branch(sbo
   # Some paths we'll care about
   A_COPY_path = os.path.join(wc_dir, "A_COPY")
   gamma_path  = os.path.join(wc_dir, "A", "D", "gamma")
-  
+
   # r7 - Delete the branch on the repository, obviously it still
   # exists in our WC.
   svntest.actions.run_and_verify_svn(None, None, [],
@@ -18539,7 +18539,7 @@ def merge_into_wc_for_deleted_branch(sbo
                                        expected_status,
                                        expected_skip,
                                        None, None, None, None,
-                                       None, 1, 0)  
+                                       None, 1, 0)
 
 # Test for a reintegrate bug which can occur when the merge source
 # has mergeinfo that explicitly describes common history with the reintegrate
@@ -18562,7 +18562,7 @@ def reintegrate_with_self_referential_me
   A2_B_path    = os.path.join(wc_dir, "A2", "B")
   A2_1_path    = os.path.join(wc_dir, "A2.1")
   A2_1_mu_path = os.path.join(wc_dir, "A2.1", "mu")
-  
+
   # r6 Copy A to A2 and then manually set some self-referential mergeinfo on
   # A2/B and A2.
   svntest.actions.run_and_verify_svn(None, ["At revision 5.\n"], [],
@@ -18592,7 +18592,7 @@ def reintegrate_with_self_referential_me
   svntest.actions.run_and_verify_svn(None, None, [], 'ci',
                                      '-m', 'Work done on the A2.1 branch.',
                                      wc_dir)
-  
+
   # Update to uniform revision and reintegrate A2.1 back to A2.
   # Note that the mergeinfo on A2/B is not changed by the reintegration
   # and so is not expected to by updated to describe the merge.

Modified: subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py Tue Mar  9 17:13:29 2010
@@ -371,7 +371,7 @@ def mergeinfo_on_pegged_wc_path(sbox):
   psi_COPY_path   = os.path.join(wc_dir, "A_COPY", "D", "H", "psi")
   omega_COPY_path = os.path.join(wc_dir, "A_COPY", "D", "H", "omega")
   beta_COPY_path  = os.path.join(wc_dir, "A_COPY", "B", "E", "beta")
- 
+
   # Do a couple merges
   #
   # r7 - Merge -c3,6 from A to A_COPY.

Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Tue Mar  9 17:13:29 2010
@@ -838,13 +838,13 @@ def patch_strip1(sbox):
 
 def patch_add_new_dir(sbox):
   "patch with missing dirs"
-  
+
   sbox.build()
   wc_dir = sbox.wc_dir
-  
+
   patch_file_path = tempfile.mkstemp(dir=os.path.abspath(svntest.main.temp_dir))[1]
 
-  # The first diff is adding 'new' with two missing dirs. The second is 
+  # The first diff is adding 'new' with two missing dirs. The second is
   # adding 'new' with one missing dir to a 'A' that is locally deleted
   # (should be skipped). The third is adding 'new' with a directory that
   # is unversioned (should be skipped as well).
@@ -902,7 +902,7 @@ def patch_add_new_dir(sbox):
   expected_skip = wc.State('', {A_C_Y_new_path : Item(),
                                 A_Z_new_path : Item() })
 
-  svntest.actions.run_and_verify_patch(wc_dir, 
+  svntest.actions.run_and_verify_patch(wc_dir,
                                        os.path.abspath(patch_file_path),
                                        expected_output,
                                        expected_disk,

Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Tue Mar  9 17:13:29 2010
@@ -2172,13 +2172,13 @@ class DeepTreesTestCase:
     expected_info = {
       'F/alpha' : {
         'Revision' : '3',
-        'Tree conflict' : 
+        'Tree conflict' :
           '^local delete, incoming edit upon update'
           + ' Source  left: .file.*/F/alpha@2'
           + ' Source right: .file.*/F/alpha@3$',
       },
       'DF/D1' : {
-        'Tree conflict' : 
+        'Tree conflict' :
           '^local delete, incoming edit upon update'
           + ' Source  left: .dir.*/DF/D1@2'
           + ' Source right: .dir.*/DF/D1@3$',

Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=920986&r1=920985&r2=920986&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Tue Mar  9 17:13:29 2010
@@ -2334,37 +2334,37 @@ def tree_conflicts_on_switch_1_1(sbox):
 
   expected_info = {
     'F/alpha' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming edit upon switch'
         + ' Source  left: .file.*/F/alpha@2'
         + ' Source right: .file.*/F/alpha@3$',
     },
     'DF/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming edit upon switch'
         + ' Source  left: .dir.*/DF/D1@2'
         + ' Source right: .dir.*/DF/D1@3$',
     },
     'DDF/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming edit upon switch'
         + ' Source  left: .dir.*/DDF/D1@2'
         + ' Source right: .dir.*/DDF/D1@3$',
     },
     'D/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming edit upon switch'
         + ' Source  left: .dir.*/D/D1@2'
         + ' Source right: .dir.*/D/D1@3$',
     },
     'DD/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming edit upon switch'
         + ' Source  left: .dir.*/DD/D1@2'
         + ' Source right: .dir.*/DD/D1@3$',
     },
     'DDD/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming edit upon switch'
         + ' Source  left: .dir.*/DDD/D1@2'
         + ' Source right: .dir.*/DDD/D1@3$',
@@ -2426,37 +2426,37 @@ def tree_conflicts_on_switch_1_2(sbox):
 
   expected_info = {
     'F/alpha' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .file.*/F/alpha@2'
         + ' Source right: .none.*/F/alpha@3$',
     },
     'DF/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming edit upon switch'
         + ' Source  left: .dir.*/DF/D1@2'
         + ' Source right: .dir.*/DF/D1@3$',
     },
     'DDF/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming edit upon switch'
         + ' Source  left: .dir.*/DDF/D1@2'
         + ' Source right: .dir.*/DDF/D1@3$',
     },
     'D/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/D/D1@2'
         + ' Source right: .none.*/D/D1@3$',
     },
     'DD/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming edit upon switch'
         + ' Source  left: .dir.*/DD/D1@2'
         + ' Source right: .dir.*/DD/D1@3$',
     },
     'DDD/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming edit upon switch'
         + ' Source  left: .dir.*/DDD/D1@2'
         + ' Source right: .dir.*/DDD/D1@3$',
@@ -2508,37 +2508,37 @@ def tree_conflicts_on_switch_2_1(sbox):
 
   expected_info = {
     'F/alpha' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local edit, incoming delete upon switch'
         + ' Source  left: .file.*/F/alpha@2'
         + ' Source right: .none.*/F/alpha@3$',
     },
     'DF/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local edit, incoming delete upon switch'
         + ' Source  left: .dir.*/DF/D1@2'
         + ' Source right: .none.*/DF/D1@3$',
     },
     'DDF/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local edit, incoming delete upon switch'
         + ' Source  left: .dir.*/DDF/D1@2'
         + ' Source right: .none.*/DDF/D1@3$',
     },
     'D/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local edit, incoming delete upon switch'
         + ' Source  left: .dir.*/D/D1@2'
         + ' Source right: .none.*/D/D1@3$',
     },
     'DD/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local edit, incoming delete upon switch'
         + ' Source  left: .dir.*/DD/D1@2'
         + ' Source right: .none.*/DD/D1@3$',
     },
     'DDD/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local edit, incoming delete upon switch'
         + ' Source  left: .dir.*/DDD/D1@2'
         + ' Source right: .none.*/DDD/D1@3$',
@@ -2602,37 +2602,37 @@ def tree_conflicts_on_switch_2_2(sbox):
 
   expected_info = {
     'F/alpha' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .file.*/F/alpha@2'
         + ' Source right: .none.*/F/alpha@3$',
     },
     'DF/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/DF/D1@2'
         + ' Source right: .none.*/DF/D1@3$',
     },
     'DDF/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/DDF/D1@2'
         + ' Source right: .none.*/DDF/D1@3$',
     },
     'D/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/D/D1@2'
         + ' Source right: .none.*/D/D1@3$',
     },
     'DD/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/DD/D1@2'
         + ' Source right: .none.*/DD/D1@3$',
     },
     'DDD/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/DDD/D1@2'
         + ' Source right: .none.*/DDD/D1@3$',
@@ -2691,37 +2691,37 @@ def tree_conflicts_on_switch_3(sbox):
 
   expected_info = {
     'F/alpha' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .file.*/F/alpha@2'
         + ' Source right: .none.*/F/alpha@3$',
     },
     'DF/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/DF/D1@2'
         + ' Source right: .none.*/DF/D1@3$',
     },
     'DDF/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/DDF/D1@2'
         + ' Source right: .none.*/DDF/D1@3$',
     },
     'D/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/D/D1@2'
         + ' Source right: .none.*/D/D1@3$',
     },
     'DD/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/DD/D1@2'
         + ' Source right: .none.*/DD/D1@3$',
     },
     'DDD/D1' : {
-      'Tree conflict' : 
+      'Tree conflict' :
         '^local delete, incoming delete upon switch'
         + ' Source  left: .dir.*/DDD/D1@2'
         + ' Source right: .none.*/DDD/D1@3$',



Mime
View raw message