Can you try pulling the latest changes down from wix39 and/or wix40 branches.
Then do:
git rm --cached -r .
git reset -hard
The idea is that is supposed to reset your local files to match the stuff in
the repo. Hopefully, you end up with no files modified as I do now. Basically,
it's the first steps of the "re-normalization" described here:
https://help.github.com/articles/dealing-with-line-endings
I feel like my git-fu just isn't quite strong enough for this problem and about
to go tilt and just pick up and move to a fresh new repo without any history
(which I *really* *really* do not want to do). Grrr....
From: Sean [mailto:rhal...@hotmail.com]
Sent: Sunday, February 2, 2014 1:50 PM
To: wix-devs@lists.sourceforge.net
Subject: Re: [WiX-devs] More whitespace fixes plus props.
Ok, I'll just ignore the wall of red and green like I tried to do last week
when I encounter those files.
________________________________
From: r...@robmensching.com<mailto:r...@robmensching.com>
To: rhal...@hotmail.com<mailto:rhal...@hotmail.com>
Subject: RE: More whitespace fixes plus props.
Date: Sun, 2 Feb 2014 21:30:56 +0000
Unclear. I think we're better off but I've had a very hard time determining
which files still need to be updated everywhere. On my machine those files are
all CRLF now. I'm hoping there are very few files left...
From: Sean [mailto:rhal...@hotmail.com]
Sent: Sunday, February 2, 2014 1:28 PM
To: Rob Mensching
Subject: RE: More whitespace fixes plus props.
Are we supposed to be LF free right now? I'm still seeing some LF files in
wix40, namely src/burn/engine/msiengine.cpp and
src/tools/wix/ChainPackageInfo.cs.
Thanks for all the kind words,
Sean
________________________________
From: r...@robmensching.com<mailto:r...@robmensching.com>
To: wix-devs@lists.sourceforge.net<mailto:wix-devs@lists.sourceforge.net>
CC: rhal...@hotmail.com<mailto:rhal...@hotmail.com>
Subject: More whitespace fixes plus props.
Date: Sun, 2 Feb 2014 19:55:20 +0000
First, thanks to Sean's persistence I think we've addressed the majority (if
not all) of our whitespace issues in the WiX repo. Thus, there are a lot of
commits waiting for you in your next commit. Fortunately, most of the
whitespace changes seem to be in test code (which most of which is ancient and
really needs some deep cleaning/deleting).
Second, I want to commend Sean for pushing through on the issue. I've seen
similar persistence from Jacob and Bruce as well. This persistence is
incredibly useful when getting started in a project with as much depth/history
as the WiX toolset. There are others here like Mike, Blair and Heath that have
been with the WiX toolset via their work at Microsoft and had an easier ramp up
since we could all be in the same room learning together.
Anyway, I do hope you all stick with it and I wanted you guys to know how much
I appreciate the effort you've put in lately.
Finally, I know there are others out there that have contributed (Neil and
Robert JvdB) and others that are just getting started (like another Rob who I
need to start the assignment agreement for). I'm very excited about what is
being contributed and I'm really encouraged.
Again, thank you for all your efforts of late. As always, if there are things
we can improve, let's start the discussion here and see what can get done.
virtually,
Rob Mensching
------------------------------------------------------------------------------
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
