Today we had two incidents with subversion…

The first was that I was all of a sudden getting conflicts on non-changed files when I did a merge – solved with upgrade of svn and patching the branch to where I merged with missing files and crap… I just don’t trust the “svnmerge”-tool that much, since now we don’t really know what is in what repository… Files that had changed over 3 months ago still had the old settings in them…

The other was that merges wasn’t appearing when a merge had been made.. This was caused by DOI or something… the changes hadn’t been committed in the original place…

so, to blame or not blame svn is the question… we don’t really have the time to change it to some other system, and I don’t really like git that the rest of the guys at work do… it just feels a little.. weird.. but, maybe it’s just that I don’t know so much about it…

/K