Re: svn commit: r16244 - in trunk: . subversion/clients/cmdline subversion/include subversion/libsvn_client subversion/libsvn_wc subversion/svnversion subversion/tests/clients/cmdline subversion/tests/clients/cmdline/svntest tools/examples

On 9/24/05, brane@tigris.org <brane@tigris.org> wrote:

One more thought...

> /* Skip over SVN admin directories. */
> - if (strcmp (this_entry.name, SVN_WC_ADM_DIR_NAME) == 0)
> + if (svn_wc_is_adm_dir (this_entry.name, subpool))
> continue;

It seems like this check...

> - if (strcmp (filename, SVN_WC_ADM_DIR_NAME) == 0)
> + if (svn_wc_is_adm_dir (filename, subpool))
> {
> /* If someone's trying to import a directory named the same
> as our administrative directories, that's probably not
> @@ -747,15 +747,20 @@
>
> /* The repository doesn't know about the reserved administrative
> directory. */
> - if (new_entries->nelts &&
> - (strcmp (APR_ARRAY_IDX (new_entries,
> - new_entries->nelts - 1,
> - const char *), SVN_WC_ADM_DIR_NAME) == 0))
> + if (new_entries->nelts
> + /* What's this, what's this? This assignment is here because we
> + use the value to construct the error message just below. It
> + may not be asethetically pleasing, but it's less ugly than
> + calling APR_ARRAY_IDX twice. */
> + && svn_wc_is_adm_dir (temp = APR_ARRAY_IDX (new_entries,
> + new_entries->nelts - 1,
> + const char *),
> + pool))

And this one, are less than entirely effective now. Depending on what
environment variables are set, we prevent different directories from
entering the repository. Should we be looking for both .svn and _svn?
 If so, what about the (very unlikely, but possible) case where users
already have an _svn file/directory in their repository?

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Sep 25 04:41:08 2005