Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [cross-project-issues-dev] EGit / line ending problems with simrel repo


I think it's a question of how is EGit doing the compare? I'm sure that by "compare tool" Eike means the compare editor that comes up. I doubt EGit is using parts of that tool under the cover to determine whether there are changes. I'm sure you're right that it looks at contents, not timestamps. In any case, it should not detect changes unless a tool actually changes the line endings. I expect the problem Eike is seeing is because someone has committed Window's line endings to the actual repo because they're following David's type of advice to avoid autocrlf conversion. I know EMF's repo is full of such problems (which I need to fix in the coming weeks) because of earlier bugs in EGit that are now fixed..


On 16/08/2012 11:25 AM, Ed Willink wrote:
Hi Eike


My suspicion is that the problem is in the comparison tooling.

The files in the repo seem to be normalized to LF line endings, but some Windows tooling creates CR-LF; some tools can
be fixed via Bugzillas but it's a losing battle.

I totally disagree. All these tools have been working fine with all other version control systems.
We agree. I was just elaborating the bad alternative.

And the false positives in the staging view appear with no comparison tool being involved. And it's impossible to get rid of them by means of the tool (EGit) that has created them.
There is a comparison. EGIT must do a file compare to determine whether the file is changed. If you edit a file and edit it back again, the file disappears from the staging view, so EGIT must be using content rather than timestamp to detect changes.


        Ed Willink
cross-project-issues-dev mailing list

Back to the top