When adding a copied node where the copyfrom "matches" the parent set the op_depth to that of the parent. This means that merge adds trees with a single op_depth.
When adding a copied node where the copyfrom "matches" the parent set
the op_depth to that of the parent. This means that merge adds trees
with a single op_depth.

* subversion/libsvn_wc/wc_db.c
  (convert_to_working_status): Forward declare.
  (op_depth_for_copy): New.
  (svn_wc__db_op_copy_dir, svn_wc__db_op_copy_file): Use op_depth_for_copy.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion