On Oct 2, 2014, at 9:20 AM, Dave Goodell (dgoodell) <dgood...@cisco.com> wrote:

> On Oct 2, 2014, at 11:17 AM, Ralph Castain <r...@open-mpi.org>
> wrote:
> 
>> 
>> On Oct 2, 2014, at 9:13 AM, Dave Goodell (dgoodell) <dgood...@cisco.com> 
>> wrote:
>> 
>>> On Oct 2, 2014, at 10:38 AM, git...@crest.iu.edu wrote:
>>> 
>>>> This is an automated email from the git hooks/post-receive script. It was
>>>> generated because a ref change was pushed to the repository containing
>>>> the project "open-mpi/ompi".
>>>> 
>>>> The branch, master has been updated
>>>>     via  3263f721b6a21966a1c1eea0fdac2a558a15db06 (commit)
>>>>    from  f21c349bcb3f7c322805d505484951642d1c7965 (commit)
>>>> 
>>>> Those revisions listed above that are new to this repository have
>>>> not appeared on any other notification email; so we list those
>>>> revisions in full, below.
>>>> 
>>>> - Log -----------------------------------------------------------------
>>>> https://github.com/open-mpi/ompi/commit/3263f721b6a21966a1c1eea0fdac2a558a15db06
>>>> 
>>>> commit 3263f721b6a21966a1c1eea0fdac2a558a15db06
>>>> Author: Ralph Castain <r...@open-mpi.org>
>>>> Date:   Thu Oct 2 08:37:18 2014 -0700
>>>> 
>>>>  Strip crlf line endings
>>>> 
>>>> diff --git a/ompi/contrib/vt/vt/extlib/otf/otf_vc08.sln 
>>>> b/ompi/contrib/vt/vt/extlib/otf/otf_vc08.sln
>>>> index 38498d6..7e887fc 100644
>>>> --- a/ompi/contrib/vt/vt/extlib/otf/otf_vc08.sln
>>>> +++ b/ompi/contrib/vt/vt/extlib/otf/otf_vc08.sln
>>> 
>>> Isn't this file a Windows-specific file that probably should still have 
>>> CRLF line endings?
>> 
>> No idea, but we don't support Windows any more, so who cares?
> 
> Right, but when the VT folks slurp in a new update from their upstream, won't 
> this just get clobbered back to CRLF?  Or worse, cause some sort of merge 
> conflict for them?

Yes - and it'll get reset again on the next git checkin/out so we keep crlf's 
out

> 
> I don't especially care, just thought it was odd to remove the CRLFs from a 
> Windows-only file.
> 
> -Dave
> 
> _______________________________________________
> devel mailing list
> de...@open-mpi.org
> Subscription: http://www.open-mpi.org/mailman/listinfo.cgi/devel
> Link to this post: 
> http://www.open-mpi.org/community/lists/devel/2014/10/15976.php

Reply via email to