You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Erik Huelsmann <e....@gmx.net> on 2003/11/12 17:35:20 UTC
[PATCH] Eliminate duplicate error code (SVN_ERR_CLIENT_UNVERSIONED)
The patch below eliminates the duplicate error code from the svn code base.
I could not find any differences or compelling reasons to keep
SVN_ERR_CLIENT_UNVERSIONED in.
bye,
Erik.
dionisos@tigris.org
PS: This patch is also available
from
http://encorps.dnsalias.com/patches/eliminate-SVN_ERR_CLIENT_UNVERSIONED.patch
Log:
[[[
Eliminate duplicate error code SVN_ERR_CLIENT_UNVERSIONED. Use
SVN_ERR_UNVERSIONED_RESOURCE instead.
* subversion/include/svn_error_codes.h
eliminate SVN_ERR_CLIENT_UNVERSIONED
* subversion/libsvn_client/delete.c
* subversion/clients/cmdline/delete-cmd.c
replace SVN_ERR_CLIENT_UNVERSIONED with SVN_ERR_UNVERSIONED_RESOURCE
]]]
Index: subversion/include/svn_error_codes.h
===================================================================
--- subversion/include/svn_error_codes.h (revision 7690)
+++ subversion/include/svn_error_codes.h (working copy)
@@ -701,9 +701,7 @@
SVN_ERR_CLIENT_CATEGORY_START + 3,
"Attempting to commit to a URL more than once")
- SVN_ERRDEF (SVN_ERR_CLIENT_UNVERSIONED,
- SVN_ERR_CLIENT_CATEGORY_START + 4,
- "Attempting restricted operation for unversioned resource")
+ /* UNUSED error slot: + 4 */
SVN_ERRDEF (SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION,
SVN_ERR_CLIENT_CATEGORY_START + 5,
Index: subversion/libsvn_client/delete.c
===================================================================
--- subversion/libsvn_client/delete.c (revision 7690)
+++ subversion/libsvn_client/delete.c (working copy)
@@ -61,7 +61,7 @@
"'%s' is in the way of the resource "
"actually under version control.", path);
else if (! status->entry)
- sb->err = svn_error_createf (SVN_ERR_CLIENT_UNVERSIONED, NULL,
+ sb->err = svn_error_createf (SVN_ERR_UNVERSIONED_RESOURCE, NULL,
"'%s' is not under version control",
path);
else if ((status->text_status != svn_wc_status_normal
Index: subversion/clients/cmdline/delete-cmd.c
===================================================================
--- subversion/clients/cmdline/delete-cmd.c (revision 7690)
+++ subversion/clients/cmdline/delete-cmd.c (working copy)
@@ -39,7 +39,7 @@
svn_cl__may_need_force (svn_error_t *err)
{
if (err
- && (err->apr_err == SVN_ERR_CLIENT_UNVERSIONED ||
+ && (err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE ||
err->apr_err == SVN_ERR_CLIENT_MODIFIED))
{
/* Should this svn_error_compose a new error number? Probably not,
--
NEU FÜR ALLE - GMX MediaCenter - für Fotos, Musik, Dateien...
Fotoalbum, File Sharing, MMS, Multimedia-Gruß, GMX FotoService
Jetzt kostenlos anmelden unter http://www.gmx.net
+++ GMX - die erste Adresse für Mail, Message, More! +++
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Eliminate duplicate error code (SVN_ERR_CLIENT_UNVERSIONED)
Posted by Julian Foad <ju...@btopenworld.com>.
Erik Huelsmann wrote:
> The patch below eliminates the duplicate error code from the svn code base.
> I could not find any differences or compelling reasons to keep
> SVN_ERR_CLIENT_UNVERSIONED in.
I agree with that. Committed in r7714. Thanks.
- Julian
> Eliminate duplicate error code SVN_ERR_CLIENT_UNVERSIONED. Use
> SVN_ERR_UNVERSIONED_RESOURCE instead.
>
> * subversion/include/svn_error_codes.h
> eliminate SVN_ERR_CLIENT_UNVERSIONED
>
> * subversion/libsvn_client/delete.c
> * subversion/clients/cmdline/delete-cmd.c
> replace SVN_ERR_CLIENT_UNVERSIONED with SVN_ERR_UNVERSIONED_RESOURCE
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org