Ben, just FYI, would appreciate it if you especially could review the
correctness of this commit.
Thanks,
-K
kfogel@tigris.org writes:
> New Revision: 2446
> Log:
> Partially address issue #756:
>
> * subversion/libsvn_wc/copy.c
> (copy_file_administratively): Be stricter about disallowing copies
> of copies, and improve error message for that case.
>
> Note that this doesn't fully resolve the issue. The truly golden fix
> is rather more complex, see the issue for details.
>
>
> Modified: trunk/subversion/libsvn_wc/copy.c
> ==============================================================================
> --- trunk/subversion/libsvn_wc/copy.c (original)
> +++ trunk/subversion/libsvn_wc/copy.c Tue Jul 9 15:46:00 2002
> @@ -146,11 +146,14 @@
> "Cannot copy or move '%s' -- it's not under revision control",
> src_path);
> }
> - else if ((src_entry->schedule == svn_wc_schedule_add) || (! src_entry->url))
> + else if ((src_entry->schedule == svn_wc_schedule_add)
> + || (! src_entry->url)
> + || (src_entry->copied))
> {
> return svn_error_createf
> (SVN_ERR_UNSUPPORTED_FEATURE, 0, NULL, pool,
> - "Cannot copy or move '%s' -- it's not in the repository yet.\n"
> + "Cannot copy or move '%s' -- it's not in the repository yet,\n"
> + "perhaps because it is a copy or is inside a copied tree.\n"
> "Try committing first.",
> src_path);
> }
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 9 23:29:56 2002