On Sat, Oct 30, 2010 at 7:54 AM, Darren Dale wrote:
> On Thu, Oct 28, 2010 at 12:11 PM, Charles R Harris
> wrote:
> >
> >
> > On Thu, Oct 28, 2010 at 9:23 AM, Darren Dale wrote:
> >>
> >> Hi Chuck,
> >>
> >> On Wed, Oct 27, 2010 at 1:30 PM, Charles R Harris
> >> wrote:
> >> >
> >> > I'd like t
On Thu, Oct 28, 2010 at 12:11 PM, Charles R Harris
wrote:
>
>
> On Thu, Oct 28, 2010 at 9:23 AM, Darren Dale wrote:
>>
>> Hi Chuck,
>>
>> On Wed, Oct 27, 2010 at 1:30 PM, Charles R Harris
>> wrote:
>> >
>> > I'd like to do something here, but I'm waiting for a consensus and for
>> > someone to t
On 10/28/10 1:25 PM, Darren Dale wrote:
>>> No, I did not. You are right, this shows \r\n. Why is it necessary to
>>> open them as binary? IIUC (OIDUC), one should use 'rU' to unify line
>>> endings.
> Although, on a mac:
>
> In [1]:
> open('tools/win32build/nsis_scripts/numpy-superinstaller.nsi
On Thu, Oct 28, 2010 at 3:23 PM, wrote:
> On Thu, Oct 28, 2010 at 2:40 PM, Darren Dale wrote:
>> On Thu, Oct 28, 2010 at 12:23 PM, wrote:
>>> On Thu, Oct 28, 2010 at 12:11 PM, Charles R Harris
On Thu, Oct 28, 2010 at 9:23 AM, Darren Dale wrote:
> And now the bad news: I have not been
On Thu, Oct 28, 2010 at 2:40 PM, Darren Dale wrote:
> On Thu, Oct 28, 2010 at 12:23 PM, wrote:
>> On Thu, Oct 28, 2010 at 12:11 PM, Charles R Harris
>>> On Thu, Oct 28, 2010 at 9:23 AM, Darren Dale wrote:
And now the bad news: I have not been able to verify that Git respects
the autoc
On Thu, Oct 28, 2010 at 12:23 PM, wrote:
> On Thu, Oct 28, 2010 at 12:11 PM, Charles R Harris
>> On Thu, Oct 28, 2010 at 9:23 AM, Darren Dale wrote:
>>> And now the bad news: I have not been able to verify that Git respects
>>> the autocrlf setting or the eol setting in .gitattributes on my
>>>
On Thu, Oct 28, 2010 at 12:11 PM, Charles R Harris
wrote:
>
>
> On Thu, Oct 28, 2010 at 9:23 AM, Darren Dale wrote:
>>
>> Hi Chuck,
>>
>> On Wed, Oct 27, 2010 at 1:30 PM, Charles R Harris
>> wrote:
>> >
>> > I'd like to do something here, but I'm waiting for a consensus and for
>> > someone to t
On Thu, Oct 28, 2010 at 9:23 AM, Darren Dale wrote:
> Hi Chuck,
>
> On Wed, Oct 27, 2010 at 1:30 PM, Charles R Harris
> wrote:
> >
> > I'd like to do something here, but I'm waiting for a consensus and for
> > someone to test things out, maybe with a test repo, to make sure things
> > operate co
Hi Chuck,
On Wed, Oct 27, 2010 at 1:30 PM, Charles R Harris
wrote:
>
> I'd like to do something here, but I'm waiting for a consensus and for
> someone to test things out, maybe with a test repo, to make sure things
> operate correctly. The documentation isn't that clear...
I am getting ready to
attribute: 'true', 'false', '', ''
attributes: text, eol, core.autocrlf
filters: left alone.
core.safecrlf: left alone.
results.
normalise: True, False
workingdir_fmt: 'lf', 'crlf'
# Apply text.
# Can be skipped on check-out.
if text == 'true':
normalise = True
elif text == 'false':
nor
2010/10/27 Darren Dale :
> I'm losing interest myself. I don't think the issue is so complicated,
> there just seems to be a lot of confusing misinformation being posted
> here.
I apologise for all misinformation I posted. I always double-check
before sending. Believe me or not.
I think the sub
On Wed, Oct 27, 2010 at 11:31 AM, Friedrich Romstedt
wrote:
> Hi Darren,
>
> 2010/10/27 Darren Dale :
>>> So the svg changes must come from the 'fix' value for the whitespace action.
>>>
>>> I don't think it is a good idea to let whitespace be fixed by git and
>>> not by your editor :-) Or do you
2010/10/27 Charles R Harris :
> I'd like to do something here, but I'm waiting for a consensus and for
> someone to test things out, maybe with a test repo, to make sure things
> operate correctly. The documentation isn't that clear...
Okay, I'll do that tomorrow (in ~13 hr). I feel responsible.
On Wed, Oct 27, 2010 at 8:36 AM, Friedrich Romstedt
wrote:
> Hi Darren,
>
> 2010/10/19 Darren Dale :
>> I have the following set in my ~/.gitconfig file:
>>
>> [apply]
>> whitespace = fix
>>
>> [core]
>> autocrlf = input
>>
>> which is attempting to correct some changes in:
>>
Hi Darren,
2010/10/19 Darren Dale :
> I have the following set in my ~/.gitconfig file:
>
> [apply]
> whitespace = fix
>
> [core]
> autocrlf = input
>
> which is attempting to correct some changes in:
>
> branding/icons/numpylogo.svg
> branding/icons/numpylogoicon.svg
> tools/w
On Thu, Oct 21, 2010 at 4:48 PM, Friedrich Romstedt
wrote:
> 2010/10/21 Darren Dale :
>> I filed a new pull request, http://github.com/numpy/numpy/pull/7 .
>> This should enforce LF on all text files, with the current exception
>> of the nsi.in file, which is CRLF. The svgs have been converted to
2010/10/21 Darren Dale :
> I filed a new pull request, http://github.com/numpy/numpy/pull/7 .
> This should enforce LF on all text files, with the current exception
> of the nsi.in file, which is CRLF. The svgs have been converted to LF.
> Additional, confusing reading can be found at
> http://help
On Thu, Oct 21, 2010 at 9:26 AM, David Cournapeau wrote:
> On Thu, Oct 21, 2010 at 8:47 PM, Friedrich Romstedt
> wrote:
>> 2010/10/21 David Cournapeau :
>>> On Thu, Oct 21, 2010 at 12:56 AM, Friedrich Romstedt
>>> wrote:
2010/10/20 Darren Dale :
> On Wed, Oct 20, 2010 at 6:12 AM, Friedr
On Thu, Oct 21, 2010 at 8:47 PM, Friedrich Romstedt
wrote:
> 2010/10/21 David Cournapeau :
>> On Thu, Oct 21, 2010 at 12:56 AM, Friedrich Romstedt
>> wrote:
>>> 2010/10/20 Darren Dale :
On Wed, Oct 20, 2010 at 6:12 AM, Friedrich Romstedt
wrote:
> Due to Darren's config file the .ns
2010/10/21 David Cournapeau :
> On Thu, Oct 21, 2010 at 12:56 AM, Friedrich Romstedt
> wrote:
>> 2010/10/20 Darren Dale :
>>> On Wed, Oct 20, 2010 at 6:12 AM, Friedrich Romstedt
>>> wrote:
Due to Darren's config file the .nsi.in file made it with CRLF into the
repo.
>>>
>>> Uh, no.
>>
On Thu, Oct 21, 2010 at 12:56 AM, Friedrich Romstedt
wrote:
> 2010/10/20 Darren Dale :
>> On Wed, Oct 20, 2010 at 6:12 AM, Friedrich Romstedt
>> wrote:
>>> Due to Darren's config file the .nsi.in file made it with CRLF into the
>>> repo.
>>
>> Uh, no.
>
> You mean I'm wrong?
Yes, the file has a
.nsi.in has '$\n\r' Is this now LFCR or CRLF?
doall.py and py3tool.py have '$\n' precisely. I'm on Mac. \n is the
at least vim-default on Mac.
So yes, confirming that it's already in the repo.
What about the svg eols?
Do we need my branch now, or do we want to leave it alone? When
others ch
On Wed, Oct 20, 2010 at 11:56 AM, Friedrich Romstedt
wrote:
> 2010/10/20 Darren Dale :
>> On Wed, Oct 20, 2010 at 6:12 AM, Friedrich Romstedt
>> wrote:
>>> Due to Darren's config file the .nsi.in file made it with CRLF into the
>>> repo.
>>
>> Uh, no.
>
> You mean I'm wrong?
Due to my config fi
On Wed, Oct 20, 2010 at 9:56 AM, Friedrich Romstedt <
friedrichromst...@gmail.com> wrote:
> 2010/10/20 Darren Dale :
> > On Wed, Oct 20, 2010 at 6:12 AM, Friedrich Romstedt
> > wrote:
> >> Due to Darren's config file the .nsi.in file made it with CRLF into the
> repo.
> >
> > Uh, no.
>
> You mean
2010/10/20 Darren Dale :
> On Wed, Oct 20, 2010 at 6:12 AM, Friedrich Romstedt
> wrote:
>> Due to Darren's config file the .nsi.in file made it with CRLF into the repo.
>
> Uh, no.
You mean I'm wrong? Wait, I'll check, but ...Hmm, how do I check the
line endings? `file` told it for the .nsi.in
On Wed, Oct 20, 2010 at 6:12 AM, Friedrich Romstedt
wrote:
> Due to Darren's config file the .nsi.in file made it with CRLF into the repo.
Uh, no.
___
NumPy-Discussion mailing list
NumPy-Discussion@scipy.org
http://mail.scipy.org/mailman/listinfo/numpy-
2010/10/20 Charles R Harris :
> [...] I think we do need a
> .gitconfig file [...]
.gitattributes
> so why don't you go ahead and make one and
> deal with the nsi.in file in the process.
http://github.com/friedrichromstedt/numpy/tree/friedrich-gitattributes-nsis
> The .svg files can have their
On Tue, Oct 19, 2010 at 11:17 AM, Friedrich Romstedt <
friedrichromst...@gmail.com> wrote:
> 2010/10/19 Darren Dale :
> > We have been discussing whitespace and line endings at the following
> > pull request: http://github.com/numpy/numpy/pull/4 . Chuck suggested
> > we discuss it here on the list
2010/10/19 Darren Dale :
> We have been discussing whitespace and line endings at the following
> pull request: http://github.com/numpy/numpy/pull/4 . Chuck suggested
> we discuss it here on the list.
>
> I have the following set in my ~/.gitconfig file:
>
> [apply]
> whitespace = fix
>
>
We have been discussing whitespace and line endings at the following
pull request: http://github.com/numpy/numpy/pull/4 . Chuck suggested
we discuss it here on the list.
I have the following set in my ~/.gitconfig file:
[apply]
whitespace = fix
[core]
autocrlf = input
wh
30 matches
Mail list logo
