C. Michael Pilato wrote:
> Blair, in r32673 you added some logic and related error messages for
> externals definitions. I gave a -0 on backporting that change (and its
> related changes), listing the reason as: 'don't use "old style" and "new
> style" in error messages'. I wanted to give you a heads-up on dev@ so this
> would catch your attention.
>
> To be clear, I'm fine with the logical changes made. But ignoring the fact
> that they should be hyphenated, I don't think "old style" and "new style"
> are altogether descriptive terms. What happens if we change the format
> again in Subversion 1.7 -- "new new style"? I think you can see where I'm
> coming from.
>
> Is there a better way to identify the two versions of the externals
> definition syntax?
Well, besides that fact that adding a new-new-style would probably be impossible
to distinguish from the old-style and new-style externals :) we could call them
"external definitions that support peg revisions" and "external definitions that
has no peg revision support"
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 32732)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -3315,16 +3315,16 @@
return svn_error_createf
(SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION, NULL,
_("Invalid %s property on '%s': "
- "cannot use a URL '%s' as the target directory for a new style "
- "external"),
+ "cannot use a URL '%s' as the target directory for an external "
+ "definition that supports peg revisions"),
SVN_PROP_EXTERNALS, parent_directory_display, token1);
if (1 == rev_idx && token0_is_url)
return svn_error_createf
(SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION, NULL,
_("Invalid %s property on '%s': "
- "cannot use a URL '%s' as the target directory for an old style "
- "external"),
+ "cannot use a URL '%s' as the target directory for an external "
+ "definition that has no peg revision support"),
SVN_PROP_EXTERNALS, parent_directory_display, token0);
/* The appearence of -r N or -rN forces the type of external.
Or simpler is just to drop the type of external, as it doesn't matter:
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 32732)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -3315,16 +3315,16 @@
return svn_error_createf
(SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION, NULL,
_("Invalid %s property on '%s': "
- "cannot use a URL '%s' as the target directory for a new style "
- "external"),
+ "cannot use a URL '%s' as the target directory for an external "
+ "definition"),
SVN_PROP_EXTERNALS, parent_directory_display, token1);
if (1 == rev_idx && token0_is_url)
return svn_error_createf
(SVN_ERR_CLIENT_INVALID_EXTERNALS_DESCRIPTION, NULL,
_("Invalid %s property on '%s': "
- "cannot use a URL '%s' as the target directory for an old style "
- "external"),
+ "cannot use a URL '%s' as the target directory for an external "
+ "definition"),
SVN_PROP_EXTERNALS, parent_directory_display, token0);
/* The appearence of -r N or -rN forces the type of external.
Regards,
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-26 19:58:06 CEST