svnmerge and svn 1.6 don't play nice?

1.6 subversion svn svnmerge

Bah. I’ve used svnmerge for ages to meet my Subversion merging needs, but a change around property management in Subversion 1.6 makes it no longer work anymore. Yes, I know Subversion has had its own merging features since 1.5, but I still use svnmerge because it works well, it generates me detailed merge commit messages, and it doesn’t require me to upgrade all my repositories to use it. Sourceforge was on Subversion 1.

Read more →


1.6 ogre release shoggoth

Today has been totally bonkers, but I finally got at least a large part of the Ogre 1.6.0 RC1 release done. I finished all the straggling documentation updates, the source releases are up and the prebuilt SDK for VC8 is there too. I have to do the VC7.1 SDK, the Mac OS X SDK and perhaps the VC9 SDK too (since I have a build of that locally now) yet. Florian was having a few odd linker problems with MinGW which didn’t occur on Linux or OS X so that one might take a while longer to resolve, perhaps until RC2.

Read more →