On 11/12/12 00:46, Daniel Shahaf wrote:

<snip>
>
> subversion/svnrdump/svnrdump.c:554: (apr_err=125005)
> subversion/libsvn_repos/load.c:583: (apr_err=125005)
> subversion/libsvn_repos/load.c:260: (apr_err=125005)
> subversion/svnrdump/load_editor.c:858: (apr_err=125005)
> subversion/libsvn_repos/fs-wrap.c:193: (apr_err=125005)
> svnrdump: E125005: Cannot accept non-LF line endings in 'svn:log'
> property
>
Thanks for this.  This morphs into:

subversion/svnrdump/svnrdump.c:554: (apr_err=125005)
  This is (load_cmd)
subversion/libsvn_repos/load.c:583: (apr_err=125005)
  (svn_repos_parse_dumpstream3)-> (parse_property_block)
subversion/libsvn_repos/load.c:260: (apr_err=125005)
  (parse_property_block)-> (parse_fns->set_revision_property)
subversion/svnrdump/load_editor.c:858: (apr_err=125005)
  (set_revision_property)-> (svn_repos__validate_prop)
subversion/libsvn_repos/fs-wrap.c:193: (apr_err=125005)
  (svn_repos__validate_prop)

I'm concerned that I shouldn't be altering fs-wrap.c.  So a logical
place to put a fix is probably in (set_revision_property).

I could either hand code a "for" loop, or call the function
(svn_rdump__normalize_props) in svnrdump/util.c

So, to summarise, my options seem to be:

1.  Alter (svn_repos__validate_prop) to replace '\r' with '<space>'.
2.  Hand code a loop at load_editor.c:857
3.  Make a call to (svn_rdump__normalize_props) at load_editor.c:857
4.  Make a call to to (svn_subst_translate_cstring2) at
    load_editor.c:857

Which is the preferred option?

Regards

Gabriela

Reply via email to