Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Many of the sql files in infrastructure and some xml files in samples have inconsistent newlines [BATCH-426] #3149

Closed
spring-issuemaster opened this issue Mar 5, 2008 · 5 comments

Comments

@spring-issuemaster
Copy link
Collaborator

@spring-issuemaster spring-issuemaster commented Mar 5, 2008

Anthony Falabella opened BATCH-426 and commented

Many of the sql files in infrastructure and some xml files in samples have inconsistent newlines. For example "spring-batch-samples\src\main\resources\jobs\restartSample.xml". This causes this error when attempting to check-in the source to an SVN repository "xxxx has inconsistent newlines", "Inconsistent line ending style".


Affects: 1.0.0.m5

@spring-issuemaster

This comment has been minimized.

Copy link
Collaborator Author

@spring-issuemaster spring-issuemaster commented Mar 5, 2008

Dave Syer commented

I recommend we set svn:eol-style=LF. Assigning to Ben because he probably knows a) how to do it, b) what the norm is with other projects.

Your workaround is to remove the svn:eol from the repo that you are committing to.

@spring-issuemaster

This comment has been minimized.

Copy link
Collaborator Author

@spring-issuemaster spring-issuemaster commented Mar 6, 2008

Anthony Falabella commented

In case it helps, in the Subversion config file,
on Unix here: /etc/subversion/config
on Windows here: C:\Documents and Settings<<your user id>>\Application Data\Subversion\config
(not sure where it's located on Mac)

we've added these:
*.xml = svn:eol-style=native
*.sql = svn:eol-style=native

So for me to check in the specific files causing trouble (it's not all sql or xml files, only some), I ran them through a UNIX to DOS eol converter. I could also do as you mentioned though. Probably best for you to use one of the other for your team, as you've mentioned, since end-users won't be "pulling" from the SVN repos directly, and will thus not get the "eol-style=native" translation applied to the file for them at the time of checkout.

@spring-issuemaster

This comment has been minimized.

Copy link
Collaborator Author

@spring-issuemaster spring-issuemaster commented Mar 6, 2008

Dave Syer commented

I did a recursive propset (using Tortoise, so admittedly I'm not sure quite what it does) to svn:eol-style=LF. I don't like native and Eclipse is fine with LF, so that should suit everyone. We don't have any .bat scripts or Windoze specific files (another good reason not to have them), so hopefully if anyone on Windoze use this (see below) in the future it will be OK:

*.xml = svn:eol-style=LF
*.sql = svn:eol-style=LF
*.txt = svn:eol-style=LF
*.java = svn:eol-style=LF
*.apt = svn:eol-style=LF
*.properties = svn:eol-style=LF

@spring-issuemaster

This comment has been minimized.

Copy link
Collaborator Author

@spring-issuemaster spring-issuemaster commented Mar 7, 2008

Anthony Falabella commented

That's great. Thanks.

@spring-issuemaster

This comment has been minimized.

Copy link
Collaborator Author

@spring-issuemaster spring-issuemaster commented Aug 7, 2008

Dave Syer commented

Assume closed as resolved and released

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant
You can’t perform that action at this time.