I created a brand new fork, and then cloned from that when checking the line
endings. I set up my git default to download without touching the line
endings. Since some files have LF and some have CRLF, I know that my
configuration is applying.
Also, I know that my History.md files in my pull requests last week had CRLF.
Since they conflicted, that means that the repo had LF.
From: r...@robmensching.com
To: wix-devs@lists.sourceforge.net
Date: Thu, 30 Jan 2014 16:56:48 +0000
Subject: Re: [WiX-devs] WiX line endings - LF or CRLF?
As Blair noted, CRLF.
Note: I’ve been informed by people that can see deeper into these things that
the WiX Git repo is a mess. Hypothesis is that somewhere in translation from hg
to git plus who knows what mistakes I made originally while still getting the
hang of everything created a bunch of CRLF files in the Git database. That’s
unusual in the Git world. So the text=CRLF is apparently a magical way to make
the whole Git world CRLF
and was the best option for the WiX repo.
If you have non-CRLF files, it’s possible they came down before the big
cleanup. They should all be CRLF. If you have questions, ask around and see
what others
have. For the files you listed, I have CRLF now.
From: Blair Murri [mailto:os...@live.com]
Sent: Tuesday, January 28, 2014 10:05 PM
To: WiX toolset developer mailing list
Subject: Re: [WiX-devs] WiX line endings - LF or CRLF?
CRLF
Sean <rhal...@hotmail.com> wrote:
I'm having trouble understanding what the line endings are supposed to be. In
the wix39 branch, History.md has only LF but tools\wix\Binder.cs has only CRLF.
In the wix40 branch, both of those files only have LF. In the .gitattributes
for both branches, it has this entry:
# Auto detect text files and perform LF normalization
* text=CRLF
It looks like this is trying to set everything to be CRLF, but this doesn't
look like a valid option for the text attribute
(https://help.github.com/articles/dealing-with-line-endings).
I think it's supposed to be
* text eol=crlf
What's it supposed to be?
Thanks,
Sean
------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable
security intelligence. It gives you real-time visual feedback on key
security issues and trends. Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wix-devs
------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable
security intelligence. It gives you real-time visual feedback on key
security issues and trends. Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
WiX-devs mailing list
WiX-devs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wix-devs
