svn commit: r1022132 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[ju...@apache.org]

Author: julianfoad
Date: Wed Oct 13 15:12:33 2010
New Revision: 1022132

URL: http://svn.apache.org/viewvc?rev=1022132&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_op_copy_file): Set the proper
    op_depth, if SVN_WC__OP_DEPTH is defined.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1022132&r1=1022131&r2=1022132&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Oct 13 15:12:33 2010
@@ -3087,7 +3087,16 @@ svn_wc__db_op_copy_file(svn_wc__db_t *db
       iwb.original_revnum = original_revision;
     }
 
+#ifdef SVN_WC__OP_DEPTH
+  iwb.op_depth = relpath_depth(local_relpath);
+
+  /* ### TODO? If the WC parent dir is already a copy from
+   * dirname(original_repos_relpath)@original_revision, then this is a
+   * redundant copy as far is the repos is concerned, so it should share
+   * the same op_depth.  But that's a degenerate case.  Is it needed? */
+#else
   iwb.op_depth = 2;  /* ### temporary op_depth */
+#endif
 
   iwb.checksum = checksum;