Integrate project marks unchanged files

Hi

We are using IntelliJ 9.0.4. We have a production branch for hotfixes. Furthermore we have a trunk for the main development. Regularly we want to merge the hot fixes from the production branch into the trunk.

For some reason some unchanged files, among these buildserver generated files, are marked as changed. These will then be committed in the next commit. When we then look at the before and after revision, Sventon tells the files are identical.

Why are these files marked as changed? Is it a time stamp issue? Is there something we can do to avoid this?

Best regards,

Morten Knudsen

4 comments
Comment actions Permalink

Hi Morten,

Is it the case that local and repo versions differ in line separators?

Can you provide couple of such files (local and remote) that are shown as different?

Regards, Denis

0
Comment actions Permalink

Hi

I have tried to compare them with a Hex File Viewer. There is no difference.

I have attached two revisions of an example.

Best regards,

Morten



Attachment(s):
TextRowTag - Kopi.java.zip
TextRowTag.java.zip
0
Comment actions Permalink

Is it reproduced all the time?

Is it possible to create minimal but complete standalone IJ project with single file and local svn repo, perform the commit and get the situation when IJ shows the file as changed? It would be possible to provide that example to us for further investigation then.

Denis

0

Please sign in to leave a comment.