[webkit-dev] sln files with wrong line endings

[Vivek Galatage]

Hello Eric, Christophe,

I had the same problem and was able to trace the reason for this.

http://stackoverflow.com/questions/1889559/git-diff-to-ignore-m

Its the ^M characters at the EOL. git diff --ignore-space-at-eol ignores
the change from the diff.

Something similar was happening with
http://trac.webkit.org/browser/trunk/Source/WTF/WTF.vcproj/WTF.sln and its
changelog says it.

Hopefully this helps!

Thank you,
Vivek




On Thu, Feb 14, 2013 at 12:40 PM, Christophe Dumez - SISA <
ch.dumez at sisa.samsung.com> wrote:

> Hi,
>
> The same thing has just happened to me. I managed to get rid of the
> changes to this file by doing:
> git reset --hard
>
> Kr,
> Christope Dumez.
> ________________________________________
> From: webkit-dev-bounces at lists.webkit.org [
> webkit-dev-bounces at lists.webkit.org] on behalf of Eric Seidel [
> eric at webkit.org]
> Sent: Thursday, February 14, 2013 08:23
> To: WebKit Development
> Subject: [webkit-dev] sln files with wrong line endings
>
> We've had this come up before, but I figure I should ask on webkit-dev
> to see if we have a solution. :)
>
> Right now the
> Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree.sln
> file is in some sort of bad state such that my Git checkout can't seem
> to not-modify the file.
>
> I'm not sure if it's a Git bug, or a repository config bug.
>
> But it means I can't seem to produce patches w/o modifying this file. :(
>
> https://bugs.webkit.org/attachment.cgi?id=188263&action=review
>
> Thoughts?
> _______________________________________________
> webkit-dev mailing list
> webkit-dev at lists.webkit.org
> https://lists.webkit.org/mailman/listinfo/webkit-dev
> _______________________________________________
> webkit-dev mailing list
> webkit-dev at lists.webkit.org
> https://lists.webkit.org/mailman/listinfo/webkit-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-dev/attachments/20130214/8e9b72e1/attachment.html>