harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Alexey Petrenko" <alexey.a.petre...@gmail.com>
Subject Re: [general] svn:eol-style = native (LF vs CRLF)
Date Fri, 29 Sep 2006 05:31:41 GMT
I've used the following script:

find modules -name \*.def -exec dos2unix {} \;
patch -p0 < patch.diff

It's much faster then starting Eclipse :)

SY, Alexey

2006/9/29, Tony Wu <wuyuehao@gmail.com>:
> you need more powerful patch tool, try apply the patch in Eclipse
> until getting some help from commiters ;-)
>
> On 9/28/06, Alexey Petrenko <alexey.a.petrenko@gmail.com> wrote:
> > I've just faced the same problem with the *.def files. All these files
> > has CRLF endings even on Linux.
> > It results in rejecting the patch which applies OK on Windows...
> >
> > SY, Alexey
> >
> > 2006/9/14, Geir Magnusson Jr. <geir@pobox.com>:
> > > I thought we did this a while ago...?
> > >
> > > geir
> > >
> > >
> > > Tony Wu wrote:
> > > > +1 to set *svn:eol-style native* to all text files
> > > >
> > > > On 9/14/06, Ilya Okomin <ilya.okomin@gmail.com> wrote:
> > > >>
> > > >> On 9/13/06, Tony Wu <wuyuehao@gmail.com> wrote:
> > > >>
> > > >> > 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.
> > > >>
> > > >>
> > > >> Tony, thanks, it is exactly the case I've described in my post.
> > > >> I also thought that the reason was the svn:eol-style property for
> > > >> certain files or my local svn settings.
> > > >> Also I was wondering if the idea suggested in this thread was already
> > > >> applied for all modules (and security module was just missed), or
it
> > > >> is in
> > > >> progress now. I think it is a good idea to set this property for all
> > > >> .java
> > > >> files in modules at once.
> > > >>
> > > >> Regards,
> > > >> Ilya.
> > > >>
> > > >>
> > > >>
> > > >> > 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 <ilya.okomin@gmail.com> wrote:
> > > >> > >
> > > >> > > On 8/17/06, Tim Ellison <t.p.ellison@gmail.com> 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 (t.p.ellison@gmail.com )
> > > >> > > > IBM Java technology centre, UK.
> > > >> > > >
> > > >> > > >
> > > >> ---------------------------------------------------------------------
> > > >> > > > Terms of use : http://incubator.apache.org/harmony/mailing.html
> > > >> > > > To unsubscribe, e-mail:
> > > >> harmony-dev-unsubscribe@incubator.apache.org
> > > >> > > > For additional commands, e-mail:
> > > >> harmony-dev-help@incubator.apache.org
> > > >> > > >
> > > >> > > >
> > > >> > >
> > > >> > >
> > > >> > > --
> > > >> > > --
> > > >> > > Ilya Okomin
> > > >> > > Intel Middleware Products Division
> > > >> > >
> > > >> > >
> > > >> >
> > > >> >
> > > >> > --
> > > >> > Tony Wu
> > > >> > China Software Development Lab, IBM
> > > >> >
> > > >> >
> > > >>
> > > >>
> > > >> --
> > > >> --
> > > >> Ilya Okomin
> > > >> Intel Middleware Products Division
> > > >>
> > > >>
> > > >
> > > >
> > >
> > > ---------------------------------------------------------------------
> > > Terms of use : http://incubator.apache.org/harmony/mailing.html
> > > To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> > > For additional commands, e-mail: harmony-dev-help@incubator.apache.org
> > >
> > >
> >
> >
> > --
> > Alexey A. Petrenko
> > Intel Middleware Products Division
> >
> > ---------------------------------------------------------------------
> > Terms of use : http://incubator.apache.org/harmony/mailing.html
> > To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> > For additional commands, e-mail: harmony-dev-help@incubator.apache.org
> >
> >
>
>
> --
> Tony Wu
> China Software Development Lab, IBM
>
> ---------------------------------------------------------------------
> Terms of use : http://incubator.apache.org/harmony/mailing.html
> To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> For additional commands, e-mail: harmony-dev-help@incubator.apache.org
>
>


-- 
Alexey A. Petrenko
Intel Middleware Products Division

---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org


Mime
View raw message