CODEWITHSUNDEEP
eclipsemergecommit
Kennethvr
Kennethvr

Reputation: 2680

eclipse shows unchanged files on synchronise

When i do a synchronisation of files or try to commit, there are also files shown that are not changed. This is only when i did a merge from an other workspace to the one i get those files in.

When i take a look at those files, they have no difference from the files on svn.

anyone any idea?

Upvotes: 3

Views: 748

Answers (2)

Kennethvr
Kennethvr

Reputation: 2680

seems that a newer version of Eclipse solves this problem!

when merging you get a 4 step wizard and in the latest step there is an option 'ignore ancestry'

if this is clicked, there wont be taken other files into this merge and the problem isn't there.

hip hip hooray

Upvotes: 1

Volker Stolz
Volker Stolz

Reputation: 7402

Did you check if the SVN properties on the files changed? SVN records the semantic information (merged revision range) in a property svn:mergeinfo when using the svn merge command.

It doesn't matter whether you use svn merge on the command line or Eclipse Team. Please read the documentation on mergeinfo to see what is going on. The property will track your merge history in the repository (a significant improvement over e.g. CVS).

(Edited after comment)

Upvotes: 0

Related Questions