svn commit: r1675587 - /subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c

[ju...@apache.org]

Author: julianfoad
Date: Thu Apr 23 12:22:20 2015
New Revision: 1675587

URL: http://svn.apache.org/r1675587
Log:
On the 'move-tracking-2' branch: Disable 'editor3p' shims.

The 'editor3p' stuff is probably obsolete. It might yet turn out to
be of some interest at some point, but is not relevant to the main
developments I'm looking at on this branch.

And there was some bug in the shims causing a test failure in
tree_conflict_tests.py 3.

* subversion/libsvn_delta/compat3p.c
  (svn_editor3p__insert_shims): Disable.

Modified:
    subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c

Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c?rev=1675587&r1=1675586&r2=1675587&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c Thu Apr 23 12:22:20 2015
@@ -122,6 +122,7 @@ svn_editor3p__insert_shims(
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool)
 {
+#if 0
   svn_editor3p_t *editor3;
   svn_editor3p__shim_connector_t *shim_connector;
 
@@ -153,6 +154,10 @@ svn_editor3p__insert_shims(
                                       *new_deditor, *new_dedit_baton,
                                       "[IN]  ", result_pool));*/
 #endif
+#else
+  *new_deditor = old_deditor;
+  *new_dedit_baton = old_dedit_baton;
+#endif
   return SVN_NO_ERROR;
 }