So here I am at work, merging svn trees for a milestone release of a project…

When suddenly, a

svn merge --dry-run

fails with tree conflicts, but

svn merge

without –dry-run succeeds, followed by a failing commit. Ack!

I’m on Ubuntu 9.10, Karmic Koala… the latest stable release. Surely it’s not the packaged subversion release?

$ svn --version
svn, version 1.6.5 (r38866)
compiled Aug 31 2009, 18:42:02

Hrm… Wonder what the 1.6.6 change log looks like… Oh gee, there it is.

· handle tree conflicts involving replacements (issue #3486)

So now I’m in the process of setting up “prevu” so I can backport the updated subversion package from the “lucid” ubuntu development branch and actually have a tool that works.

Why have they not pushed 1.6.6 out as an update? They push every other minuscule package update out…

This entry was posted on Monday, March 1st, 2010 at 5:15 pm and is filed under Rants. You can follow any responses to this entry through the RSS 2.0 feed. You can skip to the end and leave a response. Pinging is currently not allowed.