EGit treating unchanged files as changed

42 views Asked by At

I'm having a problem with the EGit integration in Eclipse. Specifically, this is in Renesas E2Studio. Frequently, if we do a merge or branch switch, EGit will report unstaged changes in files, but they haven't actually changed, only the create date changed. For example, if I make changes in one branch, commit those files, then switch to a different branch, those same files that I touched in the first branch correctly reverted to the version in the second branch, but now EGit says the files have changed. The content is 100% identical, and EGit shows zero differences. The EGit filemode is set to false. There are no whitespace changes (all files are using CR-LF line terminators). I'm suspecting since the file dates changed to when the branches were switched, EGit is keying off the file date and sees that it's newer than what was committed.

Is there a way to tell it to ignore the date changes? It seems to be going off the create date, which does change when I switch branches. It'a bit of a headache when a merge may cause hundreds of files to have "changed", but only a handful actually have changes to merge in.

0

There are 0 answers