Re: svn help
Jacek Laskowski wrote: 2006/3/9, John Sisson <[EMAIL PROTECTED]>: I looked at the svn properties on the pom.xml file for directory and hot-deploy (others probably have the same issue) and the eol-style property for *.xml files isn't set to native. This indicates that your svn client isn't set up properly. See the "Subversion Client Config" topic at: http://wiki.apache.org/geronimo/GettingSourceCode#head-4cfe1f3516da2bace5dcb5ed105eaed7c7478afb and compare your settings with those listed on the wiki page. I had them the same, but what I did was to copy it over again (I also edited the page to reflect that we're using 'Rev' rather than 'Revision' and no other properties are). FYI, the "Revision" SVN keyword can also be specified in alternate forms such as "LastChangedRevision" or "Rev" (according to the http://svnbook.red-bean.com/en/1.1/ch07s02.html ), so the previous Wiki instructions would have worked. I have updated the wiki page with more information on svn keywords and how to test that the auto-props are working. If the eol-style isn't set to native for text based files it will cause problems for developers working on different platforms. How can I check out whether or not I'm inline with the configuration? I'm using cygwin on WinXP and Eclipse/NetBeans. See the updated wiki page for info on how to test that the auto props are working. Do you only use subversion under Cygwin? If you also use it from Windows or Eclipse/Netbeans you may need to check that the "Windows" version of Subversion isn't reading a different config file to the Cygwin version (I don't use Cygwin, so I am not sure). If any IDE implements Subversion support themselves without using the subversion command line client then the method of configuring the auto-props may be different. Regards, John
Re: svn help
2006/3/9, John Sisson <[EMAIL PROTECTED]>: > I looked at the svn properties on the pom.xml file for directory and > hot-deploy (others probably have the same issue) and the eol-style > property for *.xml files isn't set to native. > > This indicates that your svn client isn't set up properly. See the > "Subversion Client Config" topic at: > http://wiki.apache.org/geronimo/GettingSourceCode#head-4cfe1f3516da2bace5dcb5ed105eaed7c7478afb > > and compare your settings with those listed on the wiki page. I had them the same, but what I did was to copy it over again (I also edited the page to reflect that we're using 'Rev' rather than 'Revision' and no other properties are). > If the eol-style isn't set to native for text based files it will cause > problems for developers working on different platforms. How can I check out whether or not I'm inline with the configuration? I'm using cygwin on WinXP and Eclipse/NetBeans. > John Jacek -- Jacek Laskowski http://www.laskowski.org.pl
Re: svn help
Jacek, I looked at the svn properties on the pom.xml file for directory and hot-deploy (others probably have the same issue) and the eol-style property for *.xml files isn't set to native. This indicates that your svn client isn't set up properly. See the "Subversion Client Config" topic at: http://wiki.apache.org/geronimo/GettingSourceCode#head-4cfe1f3516da2bace5dcb5ed105eaed7c7478afb and compare your settings with those listed on the wiki page. If the eol-style isn't set to native for text based files it will cause problems for developers working on different platforms. John anita kulshreshtha wrote: I have looked at *-builder, deploy-*, axis-*, and derby modules. Here are the pom.xmls that have LF endings. directory hot-deploy interceptor tomcat activemq-embedded-rar Thnaks Anita --- Jacek Laskowski <[EMAIL PROTECTED]> wrote: 2006/3/9, anita kulshreshtha <[EMAIL PROTECTED]>: John, I have a similar problem. Some files that I checked out from SVN have LF endings on my windows box. When I create a patch all the LF lines are shown as '-' and the same line are added with CRLFs. The patch becomes very hard to read. How can I fix this? It might be that it's something with my configuration, I guess. I can't understand why Eclipse formatting changes some of XML files with the different line endings that the file currently has. So, when I commit such modified sources, svn complains it can't do that due to the mixture of line endings in a file. The simple '%s,^M,,g' does the job very well. Could you list the files you have line ending issues with? Is there a command in Maven to fix these line endings problems or ensure that it doesn't pop up again? Anita Jacek -- Jacek Laskowski http://www.laskowski.org.pl __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com
Re: svn help
I would like to resubmit the patch (remove reference to 'target' and 'm2' repo) for tomcat as soon as this is fixed. After that tomcat migration issue can be closed. Thanks Anita --- anita kulshreshtha <[EMAIL PROTECTED]> wrote: > I have looked at *-builder, deploy-*, axis-*, and > derby modules. Here are the pom.xmls that have LF > endings. > directory > hot-deploy > interceptor > tomcat > activemq-embedded-rar > > Thnaks > Anita > > --- Jacek Laskowski <[EMAIL PROTECTED]> wrote: > > > 2006/3/9, anita kulshreshtha > <[EMAIL PROTECTED]>: > > > John, > > >I have a similar problem. Some files that I > > checked > > > out from SVN have LF endings on my windows box. > > When I > > > create a patch all the LF lines are shown as '-' > > and > > > the same line are added with CRLFs. The patch > > becomes > > > very hard to read. How can I fix this? > > > > It might be that it's something with my > > configuration, I guess. I > > can't understand why Eclipse formatting changes > some > > of XML files with > > the different line endings that the file currently > > has. So, when I > > commit such modified sources, svn complains it > can't > > do that due to > > the mixture of line endings in a file. The simple > > '%s,^M,,g' does the > > job very well. > > > > Could you list the files you have line ending > issues > > with? > > > > Is there a command in Maven to fix these line > > endings problems or > > ensure that it doesn't pop up again? > > > > > Anita > > > > Jacek > > > > -- > > Jacek Laskowski > > http://www.laskowski.org.pl > > > > > __ > Do You Yahoo!? > Tired of spam? Yahoo! Mail has the best spam > protection around > http://mail.yahoo.com > __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com
Re: svn help
I have looked at *-builder, deploy-*, axis-*, and derby modules. Here are the pom.xmls that have LF endings. directory hot-deploy interceptor tomcat activemq-embedded-rar Thnaks Anita --- Jacek Laskowski <[EMAIL PROTECTED]> wrote: > 2006/3/9, anita kulshreshtha <[EMAIL PROTECTED]>: > > John, > >I have a similar problem. Some files that I > checked > > out from SVN have LF endings on my windows box. > When I > > create a patch all the LF lines are shown as '-' > and > > the same line are added with CRLFs. The patch > becomes > > very hard to read. How can I fix this? > > It might be that it's something with my > configuration, I guess. I > can't understand why Eclipse formatting changes some > of XML files with > the different line endings that the file currently > has. So, when I > commit such modified sources, svn complains it can't > do that due to > the mixture of line endings in a file. The simple > '%s,^M,,g' does the > job very well. > > Could you list the files you have line ending issues > with? > > Is there a command in Maven to fix these line > endings problems or > ensure that it doesn't pop up again? > > > Anita > > Jacek > > -- > Jacek Laskowski > http://www.laskowski.org.pl > __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com
Re: svn help
2006/3/9, anita kulshreshtha <[EMAIL PROTECTED]>: > John, >I have a similar problem. Some files that I checked > out from SVN have LF endings on my windows box. When I > create a patch all the LF lines are shown as '-' and > the same line are added with CRLFs. The patch becomes > very hard to read. How can I fix this? It might be that it's something with my configuration, I guess. I can't understand why Eclipse formatting changes some of XML files with the different line endings that the file currently has. So, when I commit such modified sources, svn complains it can't do that due to the mixture of line endings in a file. The simple '%s,^M,,g' does the job very well. Could you list the files you have line ending issues with? Is there a command in Maven to fix these line endings problems or ensure that it doesn't pop up again? > Anita Jacek -- Jacek Laskowski http://www.laskowski.org.pl
Re: svn help
John, I have a similar problem. Some files that I checked out from SVN have LF endings on my windows box. When I create a patch all the LF lines are shown as '-' and the same line are added with CRLFs. The patch becomes very hard to read. How can I fix this? Thnaks Anita --- John Sisson <[EMAIL PROTECTED]> wrote: > Sachin Patel wrote: > > Every time I run svn add as of recent I get... > This never happened > > before I have no idea what changed on my > system to start causing > > this. How can I prevent this? > > > > subversion/libsvn_wc/props.c:980: (apr_err=29) > > svn: File 'pom.xml' has inconsistent newlines > > subversion/libsvn_subr/subst.c:506: > (apr_err=135000) > > svn: Inconsistent line ending style > > > > - sachin > > > > > > > > > Did you set defaults for subversion as documented in > > http://wiki.apache.org/geronimo/GettingSourceCode#head-4cfe1f3516da2bace5dcb5ed105eaed7c7478afb > > ? > > If so, maybe it is trying to add the pom.xml file > with the default > eol-style for xml files and it has found that your > pom.xml file contains > a combination of LF and CRLF line endings, therefore > saying it is > inconsistent. Maybe you need to get hold of a text > editor that can > clean these up, or a file hex editor. Did you use > different tools when > creating and editing the pom.xml file? If so, are > the line endings > configured differently? > > If you are on Windows all line endings should be > CRLF and if you are on > *NIX then you should have LF line endings in the > file. > > The settings in the wiki page above ensure that when > you get a file from > subversion that the line endings for text based > files are in the correct > style for your system. I am guessing that the > eol-style settings are > also used when adding a file to convert from an end > user's native > eol-style to a normalized style (not sure what style > it is stored on the > server, maybe the server's native style) and maybe > that is where it is > having problems?? > > John > > > __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com
Re: svn help
Sachin Patel wrote: Every time I run svn add as of recent I get... This never happened before I have no idea what changed on my system to start causing this. How can I prevent this? subversion/libsvn_wc/props.c:980: (apr_err=29) svn: File 'pom.xml' has inconsistent newlines subversion/libsvn_subr/subst.c:506: (apr_err=135000) svn: Inconsistent line ending style - sachin Did you set defaults for subversion as documented in http://wiki.apache.org/geronimo/GettingSourceCode#head-4cfe1f3516da2bace5dcb5ed105eaed7c7478afb ? If so, maybe it is trying to add the pom.xml file with the default eol-style for xml files and it has found that your pom.xml file contains a combination of LF and CRLF line endings, therefore saying it is inconsistent. Maybe you need to get hold of a text editor that can clean these up, or a file hex editor. Did you use different tools when creating and editing the pom.xml file? If so, are the line endings configured differently? If you are on Windows all line endings should be CRLF and if you are on *NIX then you should have LF line endings in the file. The settings in the wiki page above ensure that when you get a file from subversion that the line endings for text based files are in the correct style for your system. I am guessing that the eol-style settings are also used when adding a file to convert from an end user's native eol-style to a normalized style (not sure what style it is stored on the server, maybe the server's native style) and maybe that is where it is having problems?? John
Re: svn help
Hi Sachin, This might get things working for you; http://www.apache.org/dev/version-control.html#https-svn I don't have to configure my line ending settings per file. Perhaps there is a global setting for svn that makes everything by default 'native' in its EOL settings? My client is command line versioin 1.3.0 $ svn --version svn, version 1.3.0 (r17949) compiled Jan 2 2006, 08:56:49 HTH, Bill Dudney MyFaces - myfaces.apache.org Wadi - incubator.apache.org/wadi On Mar 8, 2006, at 8:20 AM, Sachin Patel wrote: Every time I run svn add as of recent I get... This never happened before I have no idea what changed on my system to start causing this. How can I prevent this? subversion/libsvn_wc/props.c:980: (apr_err=29) svn: File 'pom.xml' has inconsistent newlines subversion/libsvn_subr/subst.c:506: (apr_err=135000) svn: Inconsistent line ending style - sachin
