Aaron Turner wrote on Thu, 8 Jul 2010 at 19:14 -0000:
> On Thu, Jul 8, 2010 at 1:22 AM, Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
> > Aaron Turner wrote on Wed, 7 Jul 2010 at 18:12 -0000:
> >> On Wed, Jul 7, 2010 at 12:34 AM, Johan Corveleyn <jcorvel_at_gmail.com> wrote:
> >> > On Wed, Jul 7, 2010 at 7:57 AM, Aaron Turner <synfinatic_at_gmail.com> wrote:
> >> >> *.c = svn:eol-style=native, svn:keywords=Id HeadURL Author Rev Date
> >> >>
> >> >> Honestly, I'm 99.9% sure that this problem started after upgrading to
> >> >> 1.6.12... nothing else changed that I can think of.
> >> >
> >> > I quickly checked the relevant section in the svn book:
> >> >
> >> > http://svnbook.red-bean.com/nightly/en/svn.advanced.confarea.html#svn.advanced.confarea.opts.config
> >> >
> >> > which says that multiple properties must by semi-colon-delimited ("It
> >> > contains any number of key-value pairs in the format PATTERN =
> >> > PROPNAME=VALUE[;PROPNAME=VALUE ...]"). In your config file it's
> >> > comma-delimited, so maybe that's the problem. Maybe the parser of the
> >> > autoprops was more tolerant before 1.6.12?
> >>
> >>
> >> Bingo. That was it. Thanks for solving that mystery!
> >>
> >
> > For the record, I can't reproduce it with trunk:
> >
> > % svn add iota3 --config-option=config:auto-props:*.c="svn:eol-style=native, svn:keywords=Id"
> > A iota3
> > %
>
> You need to add a .c file :) It only breaks if the filename matches the rule.
>
% svn add --config-option=config:auto-props:*.c="svn:eol-style=native, svn:keywords=Id" f.c
..\..\..\subversion\svn\add-cmd.c:84: (apr_err=135001)
..\..\..\subversion\svn\util.c:961: (apr_err=135001)
..\..\..\subversion\libsvn_client\add.c:625: (apr_err=135001)
..\..\..\subversion\libsvn_client\add.c:535: (apr_err=135001)
..\..\..\subversion\libsvn_client\add.c:335: (apr_err=135001)
..\..\..\subversion\libsvn_wc\props.c:2448: (apr_err=135001)
..\..\..\subversion\libsvn_wc\props.c:2448: (apr_err=135001)
..\..\..\subversion\libsvn_wc\props.c:2615: (apr_err=135001)
svn: Unrecognized line ending style for 'C:\tmp\svn\wc1\trunk\f.c'
(where f.c is an empty file)
And of course the "stack trace" yields a patch:
[[[
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 958675)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -2613,7 +2613,8 @@ svn_wc_canonicalize_svn_prop(const svn_string_t **
svn_subst_eol_style_from_value(&eol_style, &ignored_eol, new_value->data);
if (eol_style == svn_subst_eol_style_unknown)
return svn_error_createf(SVN_ERR_IO_UNKNOWN_EOL, NULL,
- _("Unrecognized line ending style for '%s'"),
+ _("Unrecognized line ending style '%s' for '%s'"),
+ new_value->data,
svn_dirent_local_style(path, pool));
SVN_ERR(validate_eol_prop_against_file(path, getter, getter_baton,
pool));
]]]
Received on 2010-07-08 19:33:38 CEST