Question concerning svn -> git migration, merging

Hello,

I was happy with svn for a while, but recently I started a new branch
where I moved/renamed a few files, and merging became a less pleasant
experience: I have to manually generate diffs from the trunk and patch
the moved files on the branch (apart from remembering which revisions
were already merged).

I cloned the svn repo, checked out the branch, but when I try to merge
from master, I got a lot of conflicts. I guess this is because I did a
few merges already in svn (before the repo cloning), but git is not
aware of that. How could I merge the changes on trunk starting from a
specified revision number, so that only new stuff gets merged? If that
could be done, I would be happy with git-svn (future merges should be
easy), and never look back.

Please CC me in your reply, I'm not subscribed to the list.

Thanks, Peter