Comment 20 for bug 542994

OK, I see now what went wrong. In my branch I moved a number of files. E.g. maemo specific desktop files went into a separate folder so they only got installed on maemo, not on other platforms. But in the diff I attached these file renames drop out.

What is the easiest way for me to rebase the fixes and post them in a way you can commit them to your tree - it there a svn command for that ?