Open MPI logo

Hardware Locality Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Hardware Locality Development mailing list

Subject: [hwloc-devel] svn up -- doh
From: Jeff Squyres (jsquyres_at_[hidden])
Date: 2009-09-16 08:41:16

Gah; sorry, I did it again. When you "svn up", you'll get this:

svn: Failed to add file 'doc/': an unversioned
file of the same name already exists

Just rm doc/ and "svn up" again, and it'll be fine.


If you care why:

The issue is that I used to have generated by, so there was a file named, and
the .cfg version was svn:ignore'd. I changed the build system (for
various uninteresting reasons) to *not* generate the .cfg file -- so I
svn rm'ed the file and svn add'ed the .cfg file. Hence, when
you "svn up", the old, generated .cfg file is there that svn now has
now knowledge of (because it's no longer svn:ignore'd). Being
conservative, svn says "hmm, I need to put in a .cfg file, but there's
already a file there -- I won't overwrite it and will let a human
figure it out."

Jeff Squyres