Re: "is missing or not locked" error executing 'svn move dir1 dir2' if dir1 contains its own directory called dir2

John Szakmeister <john@szakmeister.net> writes:

> --- subversion/libsvn_subr/io.c (revision 15153)
> +++ subversion/libsvn_subr/io.c (working copy)
> @@ -641,6 +641,7 @@
> apr_finfo_t this_entry;
> apr_int32_t flags = APR_FINFO_TYPE | APR_FINFO_NAME;
>
> + printf ("HERE\n");

check

> /* Make a subpool for recursion */
> apr_pool_t *subpool = svn_pool_create (pool);
>
> @@ -714,8 +715,11 @@
> {
> /* Prevent infinite recursion by filtering off our
> newly created destination path. */
> - if (strcmp (this_entry.name, dst_basename) == 0)
> - continue;
> + if (svn_path_is_child (src_target, dst_path, subpool)
> + && strcmp (this_entry.name, dst_basename) == 0)
> + {
> + continue;
> + }

svn_path_is_child looks like it might trigger too often, I think it
should be more like:

              if (strcmp (this_entry.name, dst_basename) == 0
                  && strcmp (src, dst_parent) == 0)

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org