Problems like this is why SVN will lose to git any day...