After going through this thread, I realize there is another possibility to encounter the problem even you are working on single platform, 1.the file you are working on does not have eol-style property and the latest commit is performed on Unix system. 2.you create a patch. 3.when applying the patch, your patch-apply tool consider it is on win32 system and convert all the LF to CRLF. 4.your local copy is dos style and the remote copy is unix style so you get totally different files when compare the bytes.
I have no idea wyh some of the .java files have the property but others doesnt in the meanwhile. hope it will do some help. On 9/13/06, Ilya Okomin <[EMAIL PROTECTED]> wrote:
On 8/17/06, Tim Ellison <[EMAIL PROTECTED]> wrote: > Sure -- just blat them all in one go. > > Regards, > Tim > > > Nathan Beyer wrote: > > Does anyone have objections to setting the svn:eol-style to native for > > *.java, *.c, *.h, *.cpp, *.xml as we move forward with updates and > changes? > > I believe this is the suggested setting for committers [1][2]. The only > file > > types that I know of that must have a specific line ending are *.dsp and > > > *.dsw, which must be CRLF. > > > > > > > > Some files are already set this way and others are not, but if we go > about > > updating these as we move forward, this should normalize checkouts for > > everyone. Hi to all! Is anything done on this issue? I found some classes in [security] module has different eol style even within one package. When I make a patch for these classes, apply it (on Windows) - I find, that classes, that were in svn reporitory with 'unix' eol now have 'dos' eol. Thus if I make diff again - it shows me, that some files are to be fully rewrited with 'dos' eol, and I can't see the differences I've made. Probably I've missed something with svn settings or smth else? Thanks, Ilya. > > > > > > > > -Nathan Beyer > > > > > > > > [1] http://www.apache.org/dev/version-control.html#https-svn > > > > [2] http://www.apache.org/dev/svn-eol-style.txt > > > > > > -- > > Tim Ellison ([EMAIL PROTECTED] ) > IBM Java technology centre, UK. > > --------------------------------------------------------------------- > Terms of use : http://incubator.apache.org/harmony/mailing.html > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > -- -- Ilya Okomin Intel Middleware Products Division
-- Tony Wu China Software Development Lab, IBM
