having a little subclipe problem.  i have an eclipse project connected to an svn repo.  there are some files i don't want to commit, namely the .setting folder, .classpath file, .project file, etc.  all the eclipse/specific files.

normally i can't see these files in the project explorer, so i take them out of the filters, and there they are.  since they haven't been added to svn, i can select and add them to svn:ignore, which works great

after doing this, however, my project's root folder thinks it has changes to commit, yet there are no files marked with the "*" in the project explorer (other than the root folder).  ok fine, i right click the project -> team -> commit, and the one item is the root folder itself

upon committing, i get Merge conflict during commit.  svn: Your file or directory '.' is probably out-of-date.  The version resource does not correspond to the resource within the transaction.  Either the requested version resource is out of date (needs to be updated), or the requested version resource is newer than the transaction root (restart the commit).

i tried updating and then commiting.  updating properly yields "at revision X"