Re: Ada: ^M in ada source files

2012-12-07 Thread Mike Stump
On Dec 7, 2012, at 12:08 PM, Robert Dewar wrote: > I would convert to LF, I think it causes less confusion Done. 2012-12-07 Mike Stump * gnat.dg/discr38.adb: Don't use ^M line endings. gnat.dg/loop_optimization13.adb: Likewise. gnat.dg/loop_optimization13.ads: Likewis

Re: Ada: ^M in ada source files

2012-12-07 Thread Robert Dewar
On 12/7/2012 2:50 PM, Arnaud Charlet wrote: Anyway, I'll let Robert have the final word on this one. I'm fine with either solution (converting to LF, or marking files binary, or a mix of both). Arno I would convert to LF, I think it causes less confusion

Re: Ada: ^M in ada source files

2012-12-07 Thread Arnaud Charlet
> >>Probably good to have some tests with standard CR/LF terminators, since > >>this is what a lot of the world uses. > > > >Then, to preserve them, the files must be tagged as binary in svn and git. > >Doing so will probably make the normal file merging that git/svn would do, > >inoperative. > >

Re: Ada: ^M in ada source files

2012-12-07 Thread Marc Glisse
On Fri, 7 Dec 2012, Mike Stump wrote: On Dec 7, 2012, at 10:57 AM, Robert Dewar wrote: Probably good to have some tests with standard CR/LF terminators, since this is what a lot of the world uses. Then, to preserve them, the files must be tagged as binary in svn and git. Assuming they co

Re: Ada: ^M in ada source files

2012-12-07 Thread Robert Dewar
On 12/7/2012 2:16 PM, Mike Stump wrote: Yes, you can strip them, no problem. Since emails likely crossed paths…. I'm going to give you and Robert a change to figure out what you'd like to do… I _only_ care about consistency between contents as seen from svn and git. Stripping ^M can do th

Re: Ada: ^M in ada source files

2012-12-07 Thread Robert Dewar
On 12/7/2012 2:09 PM, Mike Stump wrote: On Dec 7, 2012, at 10:57 AM, Robert Dewar wrote: On 12/7/2012 1:56 PM, Mike Stump wrote: I've noticed that: $ grep -l '^M' gcc/testsuite/gnat.dg/* discr36.ads discr36_pkg.adb discr36_pkg.ads discr38.adb loop_optimization11.adb loop_optimization11_pkg.ad

Re: Ada: ^M in ada source files

2012-12-07 Thread Mike Stump
On Dec 7, 2012, at 10:59 AM, Arnaud Charlet wrote: >> I've noticed that: >> >> $ grep -l '^M' gcc/testsuite/gnat.dg/* >> discr36.ads >> discr36_pkg.adb >> discr36_pkg.ads >> discr38.adb >> loop_optimization11.adb >> loop_optimization11_pkg.ads >> loop_optimization13.adb >> loop_optimization13.ads

Re: Ada: ^M in ada source files

2012-12-07 Thread Mike Stump
On Dec 7, 2012, at 10:57 AM, Robert Dewar wrote: > On 12/7/2012 1:56 PM, Mike Stump wrote: >> I've noticed that: >> >> $ grep -l '^M' gcc/testsuite/gnat.dg/* >> discr36.ads >> discr36_pkg.adb >> discr36_pkg.ads >> discr38.adb >> loop_optimization11.adb >> loop_optimization11_pkg.ads >> loop_optim

Re: Ada: ^M in ada source files

2012-12-07 Thread Arnaud Charlet
> I've noticed that: > > $ grep -l '^M' gcc/testsuite/gnat.dg/* > discr36.ads > discr36_pkg.adb > discr36_pkg.ads > discr38.adb > loop_optimization11.adb > loop_optimization11_pkg.ads > loop_optimization13.adb > loop_optimization13.ads > > :-( Surely these are just normal text files, right? Can

Re: Ada: ^M in ada source files

2012-12-07 Thread Robert Dewar
On 12/7/2012 1:56 PM, Mike Stump wrote: I've noticed that: $ grep -l '^M' gcc/testsuite/gnat.dg/* discr36.ads discr36_pkg.adb discr36_pkg.ads discr38.adb loop_optimization11.adb loop_optimization11_pkg.ads loop_optimization13.adb loop_optimization13.ads :-( Surely these are just normal text fi

Ada: ^M in ada source files

2012-12-07 Thread Mike Stump
I've noticed that: $ grep -l '^M' gcc/testsuite/gnat.dg/* discr36.ads discr36_pkg.adb discr36_pkg.ads discr38.adb loop_optimization11.adb loop_optimization11_pkg.ads loop_optimization13.adb loop_optimization13.ads :-( Surely these are just normal text files, right? Can I strip the ^M from them