[Tilesathome] SVN merging help required

[spaetz]

Bahh, I  know again why I didn't do branches.
I would like to move what we have in the _unstable branch to the stable branch.

svn merge http://svn.openstreetmap.org/applications/rendering/tilesAtHome_unstable http://svn.openstreetmap.org/applications/rendering/tilesAtHome

will show only a few diffs but not all differences.

Could some SVN wizard please move whatever we have in stable into the stable branch?

If not I will just kill the stable branch and "svn mv" _unstable to its location.

I don't want to risk losing half of the changes and end up with a broken client because of that.

/me hating cvs tools. All of them
spaetz