The scenario: I m merging a series of cherry-picked revisions from an SVN branch into trunk. I m using the Subclipse CollabNet client to do the merge. Everything works great, except that in addition to the files I picked to merge, my working directory shows a series of changes that SVN thinks have changed but that I haven t chosen to merge.
If I do a diff on the files in question, it tells me there are no differences. If I do a commit, I get the screenshot below, with the mystery icon I haven t been able to find documentation of anywhere.
Screenshot:
