Question

I have an eclipse project with which I’m using subversion and subclipse. Currently the top level folder of the project is showing the dirty decorator even though when I do a “Compare With->Latest from Repository” the response is “There are no differences between the selected inputs.” Furthermore, an “svn diff ” from the command line shows no differences.

Here’s a transcript:

[ollie@devdataload workspace]$ svn diff DataLoadEagleOliver

Property changes on: DataLoadEagleOliver
___________________________________________________________________
Added: svn:mergeinfo
   Merged /FinancialReport/trunk/Java/DataLoadEagle:r1178-1186

[ollie@devdataload workspace]$ 

Is this expected behavior and I’m missing something or is this a know issue with subclipse?

I’m using subclipse 1.6.18 and Eclipse Indigo. The next thing I’m going to try is upgrading subclipse to the latest version.

Answer 1

The svn diff does show a difference: the svn:mergeinfo property. This might not show up when you do Compare With, but it is a difference, and you should probably commit it.

That property is automatically changed whenever you merge from another branch. It keeps track of which revisions have already been merged, so it can skip them the next time you merge from the same branch.