You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jena.apache.org by Robert Vesse <rv...@cray.com> on 2011/11/16 00:18:45 UTC
RE: Patch Generation and svn:eol-style
Yes I did use TortioiseSVN but I also tried using svn diff from the command line and still had the same result either way
Perhaps if I'd had svn:eol-style set appropriately this would have fixed things
Rob
-----Original Message-----
From: Paolo Castagna [mailto:castagna.lists@googlemail.com]
Sent: Tuesday, November 15, 2011 2:50 PM
To: jena-dev@incubator.apache.org
Subject: Re: Adding support for MonetDB
Hi Rob,
I don't remember, did you use TortoiseSVN on Windows to generate your patch?
I am still unsure if we should run svn propset svn:eol-style native
for all the text file (I usually do not do that).
Paolo
On 15 November 2011 23:45, Robert Vesse <rv...@cray.com> wrote:
> Thanks for figuring this out Paolo, sounds like the same issue we had with my RDF/JSON parsing patch
>
> Rob
>
> -----Original Message-----
> From: Paolo Castagna [mailto:castagna.lists@googlemail.com]
> Sent: Tuesday, November 15, 2011 2:42 PM
> To: jena-dev@incubator.apache.org
> Subject: Re: Adding support for MonetDB
>
> Hi,
> I think I might have identified what can go wrong and cause problems
> when users submit patches.
>
> On 11 October 2011 13:34, Paolo Castagna <ca...@googlemail.com> wrote:
>> Hi Damian
>>
>> Damian Steer wrote:
>>> On 11 Oct 2011, at 11:32, nat lu wrote:
>>>
>>>> HI,
>>>>
>>>> Had a quick look - the patch seems to want to delete (in entirety) a couple of existing SDB classes which I had made minimal modifications to, so I've re-checked out SDB 1.3.4 and created a new patch which I can upload later. So - the first attachment in Jira shouldnt be used.
>>>
>>> Thanks for looking at this. I just tried applying this and it went a bit wrong.
>>
>> It's strange, I think it's really important we understand what goes wrong when we receive a patch which do not apply cleanly.
>> If the patch is small, it's not a big deal to apply the changes manually. But it's time consuming.
>> If the patch is big, applying it manually is not an option.
>
> """
> Configuring the Subversion client
>
> Committers will need to properly configure their svn client. One
> particular issue is OS-specific line-endings for text files. [...] Add
> the contents of the file http://www.apache.org/dev/svn-eol-style.txt
> to the bottom of your ~/.subversion/config file.
> [...]
> Tip: If you use TortiseSVN, a popular Windows GUI client that
> integrates with Windows Explorer, you can simply right click in
> Explorer and select TortiseSVN - Settings, and then press the "Edit"
> button to update your "Subversion configuration file:". Simply copy
> the above svn-eol-style.txt file's contents into the end of the config
> editor (usually Notepad) that appears, and save the file.
> """
> -- http://www.apache.org/dev/version-control.html#https-svn-config
>
> Maybe is this what happened: all the lines were changed because of the
> line-endings.
> I am sending this email so that when this happens again we all know
> where to look for a fix.
>
> Cheers,
> Paolo
>
RE: Patch Generation and svn:eol-style
Posted by "Dennis E. Hamilton" <or...@apache.org>.
The recommended http://www.apache.org/dev/svn-eol-style.txt settings in the SVN client are important. (Tortoise SVN just gives you another way to find and set them, this is all SVN-level behavior.)
I found it annoying to do that for XML and HTML, so I modified the change to leave those alone - those specifications do not care about whitespace the same way as it matters for a text file.
I also adjusted mine to always set the charset to UTF8 for text files and a few others. The result is like this:
*.html = svn:mime-type=text/html;;charset=UTF-8
*.htm = svn:mime-type=text/html;;charset=UTF-8
*.txt = svn:eol-style=native;;charset=UTF-8
Of course, the HMTL files with no extension in the Jena SVN serve up as text, which is somewhat annoying.
I also notice that there are a set of commented-out auto-props settings in the default SVN config file. Most of these are defined by the Apache svn-eol-style.txt addition anyhow.
My understanding is that these take effect only as new files are added to the SVN, although that might not be true for the eol-native situation. With existing files, you get what you get.
- Dennis
-----Original Message-----
From: Robert Vesse [mailto:rvesse@cray.com]
Sent: Tuesday, November 15, 2011 15:19
To: jena-dev@incubator.apache.org
Subject: RE: Patch Generation and svn:eol-style
Yes I did use TortioiseSVN but I also tried using svn diff from the command line and still had the same result either way
Perhaps if I'd had svn:eol-style set appropriately this would have fixed things
Rob
-----Original Message-----
From: Paolo Castagna [mailto:castagna.lists@googlemail.com]
Sent: Tuesday, November 15, 2011 2:50 PM
To: jena-dev@incubator.apache.org
Subject: Re: Adding support for MonetDB
Hi Rob,
I don't remember, did you use TortoiseSVN on Windows to generate your patch?
I am still unsure if we should run svn propset svn:eol-style native
for all the text file (I usually do not do that).
Paolo
On 15 November 2011 23:45, Robert Vesse <rv...@cray.com> wrote:
> Thanks for figuring this out Paolo, sounds like the same issue we had with my RDF/JSON parsing patch
>
> Rob
>
> -----Original Message-----
> From: Paolo Castagna [mailto:castagna.lists@googlemail.com]
> Sent: Tuesday, November 15, 2011 2:42 PM
> To: jena-dev@incubator.apache.org
> Subject: Re: Adding support for MonetDB
>
> Hi,
> I think I might have identified what can go wrong and cause problems
> when users submit patches.
>
> On 11 October 2011 13:34, Paolo Castagna <ca...@googlemail.com> wrote:
>> Hi Damian
>>
>> Damian Steer wrote:
>>> On 11 Oct 2011, at 11:32, nat lu wrote:
>>>
>>>> HI,
>>>>
>>>> Had a quick look - the patch seems to want to delete (in entirety) a couple of existing SDB classes which I had made minimal modifications to, so I've re-checked out SDB 1.3.4 and created a new patch which I can upload later. So - the first attachment in Jira shouldnt be used.
>>>
>>> Thanks for looking at this. I just tried applying this and it went a bit wrong.
>>
>> It's strange, I think it's really important we understand what goes wrong when we receive a patch which do not apply cleanly.
>> If the patch is small, it's not a big deal to apply the changes manually. But it's time consuming.
>> If the patch is big, applying it manually is not an option.
>
> """
> Configuring the Subversion client
>
> Committers will need to properly configure their svn client. One
> particular issue is OS-specific line-endings for text files. [...] Add
> the contents of the file http://www.apache.org/dev/svn-eol-style.txt
> to the bottom of your ~/.subversion/config file.
> [...]
> Tip: If you use TortiseSVN, a popular Windows GUI client that
> integrates with Windows Explorer, you can simply right click in
> Explorer and select TortiseSVN - Settings, and then press the "Edit"
> button to update your "Subversion configuration file:". Simply copy
> the above svn-eol-style.txt file's contents into the end of the config
> editor (usually Notepad) that appears, and save the file.
> """
> -- http://www.apache.org/dev/version-control.html#https-svn-config
>
> Maybe is this what happened: all the lines were changed because of the
> line-endings.
> I am sending this email so that when this happens again we all know
> where to look for a fix.
>
> Cheers,
> Paolo
>