Just for posterity, it turns out *I* was the one who added these output
files (jdk16 output files) and my .config did *not* have ".out" as a
prefix for svn:eol-style=native. The template I cut-and-pasted from did
not have it. Others of you out there may want to fix this.
David
David W. Van Couvering wrote:
Thanks, Andrew. I have this property set by default for new files I
create, but it looks like it was never set for this existing output file.
I'll try the fix you suggest and see if it works.
David
Andrew McIntyre wrote:
On 3/31/06, David W. Van Couvering <[EMAIL PROTECTED]> wrote:
When I look at the diffs I have on some test output based on message
text changes, I get only the lines that have changed. But in svn diff
it shows the old contents completely removed and new contents put in its
place, all with ^M characters at the end of each line.
Any advice on how to address this? I would like reviewers to see the
actual changes made versus a global replace.
Sounds like it's missing the svn:eol-style native property in svn. I
think it might work to just set the property on a Windows machine,
remove the file and then svn up to restore it with the property added.
If that doesn't work, you'll need to commit the property change from a
Unix machine and then update your Windows checkout to get the correct
line-endings.
Also, its been mentioned before, but I'll mention it again in case
anyone missed it the first time. If you add the following to your
local ~/subversion/.config:
http://www.apache.org/dev/svn-eol-style.txt
then svn will automatically add the right property when new files are
added. You'll need to add *.out to this list as well.
andrew