RE: [Subclipse-users] Subclipse states there is a conflict when there is not
From: Brandon Mayes <bdmayes_at_gmail.com>
Date: Thu, 11 Aug 2011 09:58:59 -0700 (PDT)
For anyone interested I think that I have resolved this issue while a co-worker of mine was fixing a different issue with his Subclipse setup. The underlying cause appears to be the properties file itself (where SVN is storing the ignore list). Subclipse is displaying a conflict because the .svn/dir-prop-base file has been modified (entries were added to the ignore list). This doesn't seem to show up as a conflict on the command line so I think this is actually a bug with Subclipse (i.e. there is not a one-to-one mapping between the behavior of command line SVN and Subclipse). I don't think Subclipse should be reporting differences on the properties files but I have found a workaround.
To resolve this issue I simply committed the directory to SVN after ignoring files which (under the covers) is actually committing the new properties file. So the steps would be something like:
1. checkout the project
I'm actually not sure if you need to have zero changes between the source files or not, but I did that just in case. When the directory gets committed back to SVN it is actually just committing the properties on that directory, so it's really committing the new .svn/dir-prop-base. Now Subclipse no longer reports a conflict because the two files are the same. If you update the ignore list at any point I think you're going to run into this issue again though.
The problem with this "solution" is that it means you have created a global ignore list. Anyone checking out your project will have the same ignore list, and maybe some people want to ignore different files? If so I suppose they can always modify the ignore list themselves. I did this in Linux by changing the default editor (I would prefer vim over nano) and running the propedit command like this:
$ export SVN_EDITOR=vim
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
This is an archived mail posted to the Subclipse Users mailing list.