Somehow this setting was set for Git command line but was not stored in any of the 3 config files that Eclipse would read. However, I think the better solution is to run "git config -global tocrlf true" to explicitly set it to true in the global configuration file which Eclipse will then read. The first way is to manually add the "tocrlf" setting to "true" in the Eclipse preferences which will solve the problem for Eclipse. But when I open Eclipse Preferences / Team / Git / Configuration, that setting is not listed in any of the tabs. When I run "git config -list" from the command line I can see that "tocrlf" is set to "true".
#Diffmerge ignore whitespace windows#
The problem for me was due to being on Windows and EGit not respecting the "tocrlf" configuration setting. This became very frustrating when working with other developers on different operating systems.Ĭredit for the solution goes to this Stack Overflow question: I did not like the recommendation to simply tell Eclipse to ignore whitespace changes during the text diff because when I performed the commit using Eclipse, it would create a commit where the entire file was changed. Just in case anyone does a Google search for this issue and finds this forum post, I've had the same problem and was finally able to fix it. I'd expect zero differences to be reported and if I run git-diff from the command line I do indeed get zero differences, but EGit is showing all of these whitespace differences. This screen is comparing a file to HEAD immediately after committing the file to my repo. These whitespace diffs make it almost impossible to view file diffs as needed before committing. So it appears the diff being done by EGit is causing the issue. the tonnes of whitespace diffs aren't present). diff has some options that can be useful to you: -E, -ignore-tab-expansion ignore changes due to tab expansion -Z, -ignore-trailing-space ignore white space at line end -b, -ignore-space-change ignore changes in the amount of white space -w, -ignore-all-space ignore all white space -B, -ignore-blank-lines ignore changes whose lines are all blank. Yet, if I go to the command line and do a git-diff of my working copy against my repo then the diffs look as I'd expect (i.e. It does not know about C# (or any other language), so language elements like 'whitespace inside string literals' look the same as any other whitespace.Running EGit 2.06130900-r/Eclipse 4.2 on Win7.Īnytime I diff a file within Eclipse against any version from my Git repository, the comparison always shows whitespace changes, even if I compare a freshly committed file against HEAD (which shouldn't show any differences). Sorry, I doubt that diffmerge.exe will add this feature. So is this something that is going to get fixed in diffmerge What if you really DO want to ignore whitespace but not within literal strings When in reality the developer was preventing the checkin because diffmerge was not detecting the whitespace he/she had added to the literal string. I misunderstood our developer and thought that it was preventing the checkin because it didn't detect a difference. Can you verify that the files are actually different using a binary-mode comparison
It's very unlikely two files would have the same hash even if the only difference is whitespace. Team Foundation does not use the diff/merge engine when determining if the file has changed. Thanks for the pointer, but isn't it a bug if it is discarding or ignoring whitespace between quotatioins or within literal strings You can remove that param by configuring your diff tool.
How do we work around it Do all of our developers need to change their individual setupsĭiffmerge tool has /ignorespace parameter. Are you aware of this problem Is there a fix on the way
Posted: Team Foundation Server - Version Control, diffmerge and whitespaceĭiffmerge is incorrectly ignoring whitespace in literal strings causing the checkin of these changes to abort because it detects no change. Index ‹ Visual Studio Team System ‹ Team Foundation Server - Version Control
0 kommentar(er)
