[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn and automatic line ending

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-01-16 03:37:59 CET

karl@freefriends.org (Karl Berry) writes:

> 1) [easy] multi-file adds of mixed binary and text files still fail
> after removing that error, because of another check, at the end of that
> same function (validate_eol_prop_against_file in
> subversion/libsvn_wc/props.c):
> if (err && err->apr_err == SVN_ERR_IO_INCONSISTENT_EOL)
> return svn_error_createf (SVN_ERR_ILLEGAL_TARGET, err,
> _("File '%s' has inconsistent newlines"), path);
> I made this into a do-nothing, and the add then completed ok.

That's the wrong place to do it as it makes the propset succeed.

> 2) [hard] The commit fails, even though the add succeeded:
> svn: File 'whatever' has inconsistent newlines

I *think* that what you need to do is modify libsvn_client. Somewhere
during add the auto-props are retrieved and passed to svn_wc_prop_set2
and you need to detect when SVN_ERR_IO_INCONSISTENT_EOL is returned
and ignore it, possibly generating some sort of feedback.

If you get something that works and want to submit a patch then read

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jan 16 03:39:22 2005

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.