On Fri, Dec 06, 2013 at 03:18:27PM +0100, Bert Huijben wrote: > It is a check if dst_cp_relpath is the root node or any of its descendants. > The root of a move can never be shadowed (as the maximum op_depth of a node > is its own op depth... which is the move)
Then why not use something like svn_relpath_skip_ancestor()? I think using strcmp() in this context is misleading. > A string comparision is quite heavy if we really only need this check. (The > db query already assures that there will only be nodes at or below > dst_relpath) > > Bert > > > > > > @@ -1643,6 +1644,11 @@ replace_moved_layer(const char *src_relp > > > scratch_pool)); > > > if (!err) > > > err = svn_sqlite__step_done(stmt2); > > > + > > > + if (!err && strlen(dst_cp_relpath) > strlen(dst_relpath)) > > > + err = svn_wc__db_extend_parent_delete(wcroot, dst_cp_relpath, > > kind, > > > + dst_op_depth, > scratch_pool); > > > + > > > if (err) > > > return svn_error_compose_create(err, svn_sqlite__reset(stmt)); > > > > > >
